Thread report in test program.

1 files changed, 4 insertions, 24 deletions

diff --git a/examples/dhtd.hs b/examples/dhtd.hs
index e4b10b8d..3f2a6a63 100644
--- a/examples/dhtd.hs
+++ b/examples/dhtd.hs
@@ -69,6 +69,7 @@ import Announcer
 import Announcer.Tox
 import ToxManager
 import Crypto.Tox -- (zeros32,SecretKey,PublicKey, generateSecretKey, toPublic, encodeSecret, decodeSecret, userKeys)
+import DebugUtil
 import Network.UPNP as UPNP
 import Network.Address hiding (NodeId, NodeInfo(..))
 import Network.QueryResponse
@@ -124,17 +125,6 @@ import qualified Data.CyclicBuffer as CB
 import DPut
 
 
-showReport :: [(String,String)] -> String
-showReport kvs = showColumns $ map (\(x,y)->[x,y]) kvs
-
-showColumns :: [[String]] -> String
-showColumns rows = do
-    let cols = transpose rows
-        ws = map (maximum . map (succ . length)) cols
-    fs <- rows
-    _ <- take 1 fs -- Guard against empty rows so that 'last' is safe.
-    "  " ++ concat (zipWith (printf "%-*s") (init ws) (init fs)) ++ last fs ++ "\n"
-
 pshow :: Show a => a -> B.ByteString
 pshow = B.pack . show
 
@@ -471,19 +461,9 @@ clientSession s@Session{..} sock cnum h = do
                         >>= hPutClient h
 #ifdef THREAD_DEBUG
         ("threads", s) -> cmd0 $ do
-                    threads <- threadsInformation
-                    tm <- getCurrentTime
-                    let (ss,ts) = partition (("search" `isPrefixOf`) . lbl . snd)
-                                            threads
-                        want_ss = ["-v"] `isInfixOf` words s
-                    r <- forM (if want_ss then threads else ts) $ \(tid,PerThread{..}) -> do
-                        stat <- threadStatus tid
-                        let showStat (ThreadBlocked reason) = show reason
-                            showStat stat                   = show stat
-                        return [show lbl,show (diffUTCTime tm startTime),showStat stat]
-                    hPutClient h $ unlines [ showColumns r
-                                           , (if want_ss then "  There are " else "  and ")
-                                             ++ show (length ss) ++ " search threads." ]
+                    let want_ss = ["-v"] `isInfixOf` words s
+                    r <- threadReport want_ss
+                    hPutClient h r
 #endif
         ("mem", s) -> cmd0 $ do
                     case s of