From 7f2fab398bbbb3f02822d5692c1b6dc07039d036 Mon Sep 17 00:00:00 2001
From: Joe Crayne <joe@jerkface.net>
Date: Fri, 13 Dec 2019 12:05:37 -0500
Subject: Remove redundant thread label.

---
 kad/src/Network/Kademlia/Search.hs | 16 +++++++++++++---
 1 file changed, 13 insertions(+), 3 deletions(-)

(limited to 'kad')

diff --git a/kad/src/Network/Kademlia/Search.hs b/kad/src/Network/Kademlia/Search.hs
index 1be1afc1..16786d1c 100644
--- a/kad/src/Network/Kademlia/Search.hs
+++ b/kad/src/Network/Kademlia/Search.hs
@@ -4,7 +4,16 @@
 {-# LANGUAGE ScopedTypeVariables #-}
 {-# LANGUAGE FlexibleContexts #-}
 {-# LANGUAGE LambdaCase #-}
-module Network.Kademlia.Search where
+module Network.Kademlia.Search
+    ( Search(..)
+    , SearchState(..)
+    , searchCancel
+    , searchIsFinished
+    , search
+    , newSearch
+    , reset
+    , searchLoop
+    ) where
 
 import Control.Concurrent.Tasks
 import Control.Concurrent.STM
@@ -130,7 +139,8 @@ sendAsyncQuery Search{..} searchTarget searchResult sch@SearchState{..} (ni :->
     case searchQuery of
         Left blockingQuery ->
           forkTask g "searchQuery" $ do
-            myThreadId >>= flip labelThread ("searchQuery." ++ show searchTarget)
+            -- forkTask will label the thread.
+            -- -- myThreadId >>= flip labelThread ("searchQuery." ++ show searchTarget)
             reply <- blockingQuery searchTarget ni `catchIOError` const (return Nothing)
             atomically $ do
                 modifyTVar searchPendingCount pred
@@ -197,7 +207,7 @@ search ::
 search sch buckets target result = do
     let ns = R.kclosest (searchSpace sch) (searchK sch) target buckets
     st <- atomically $ newSearch sch target ns
-    forkIO $ searchLoop sch target result st
+    t <- forkIO $ searchLoop sch target result st
     return st
 
 searchLoop :: ( Ord addr, Ord nid, Ord ni, Show nid, Hashable nid, Hashable ni )
-- 
cgit v1.2.3