1 files changed, 6 insertions, 3 deletions

diff --git a/kad/src/Network/Kademlia/Search.hs b/kad/src/Network/Kademlia/Search.hs
index 5b60c303..856a7cfc 100644
--- a/kad/src/Network/Kademlia/Search.hs
+++ b/kad/src/Network/Kademlia/Search.hs
@@ -194,12 +194,15 @@ search ::
     , PSQKey nid
     , PSQKey ni
     , Show nid
-    ) => Search nid addr tok ni r -> R.BucketList ni -> nid -> (r -> STM Bool) -> IO (SearchState nid addr tok ni r)
+    ) => Search nid addr tok ni r -> R.BucketList ni -> nid -> (r -> STM Bool) -> IO (SearchState nid addr tok ni r, ThreadId)
 search sch buckets target result = do
     let ns = R.kclosest (searchSpace sch) (searchK sch) target buckets
     st <- atomically $ newSearch sch target ns
-    t <- forkIO $ searchLoop sch target result st
-    return st
+    v <- newTVarIO False
+    t <- forkIO $ atomically (check =<< readTVar v) >> searchLoop sch target result st
+    labelThread t ("search.pending." ++ show target)
+    atomically $ writeTVar v True
+    return (st,t)
 
 searchLoop :: ( Ord addr, Ord nid, Ord ni, Show nid, Hashable nid, Hashable ni )
            => Search nid addr tok ni r      -- ^ Query and distance methods.