1 files changed, 13 insertions, 1 deletions

diff --git a/bittorrent.cabal b/bittorrent.cabal
index 2dee30ee..90053932 100644
--- a/bittorrent.cabal
+++ b/bittorrent.cabal
@@ -62,6 +62,10 @@ flag aeson
   description: Use aeson for pretty-printing bencoded data.
   default: True
 
+flag thread-debug
+  description: Add instrumentation to threads.
+  default: True
+
 library
   default-language:    Haskell2010
   default-extensions:  PatternGuards
@@ -122,7 +126,6 @@ library
                        Network.BitTorrent.Internal.Types
                        System.Torrent.FileMap
                        System.Torrent.Tree
-
   build-depends:       lifted-base
                      , convertible  >= 1.0
                      , pretty       >= 1.1
@@ -216,6 +219,11 @@ library
   if flag(aeson)
     build-depends: aeson, aeson-pretty, unordered-containers, vector
     cpp-options:   -DBENCODE_AESON
+  if flag(thread-debug)
+    exposed-modules: Control.Concurrent.Lifted.Instrument
+                     Control.Concurrent.Async.Lifted.Instrument
+    cpp-options:   -DTHREAD_DEBUG
+
   if flag(builder)
     build-depends: bytestring >= 0.9, bytestring-builder
   else
@@ -362,6 +370,10 @@ executable dhtd
                      , data-default
                      , monad-logger
                      , bittorrent
+                     , unix
+  if flag(thread-debug)
+    build-depends: time
+    cpp-options:   -DTHREAD_DEBUG
 
 -- Utility to work with torrent files.
 executable mktorrent