More details in threads listing.

1 files changed, 6 insertions, 7 deletions

diff --git a/src/Control/Concurrent/Lifted/Instrument.hs b/src/Control/Concurrent/Lifted/Instrument.hs
index 957b67bb..7ee78c8b 100644
--- a/src/Control/Concurrent/Lifted/Instrument.hs
+++ b/src/Control/Concurrent/Lifted/Instrument.hs
@@ -45,26 +45,25 @@ fork action = do
     t <- Raw.fork $ do
         tid <- myThreadId
         tm <- liftBase getCurrentTime
-        bracket_ (modifyThreads $ Map.insert tid (PerThread "" tm))
-                 (modifyThreads $ Map.delete tid)
+        bracket_ (modifyThreads $! Map.insert tid (PerThread "" tm))
+                 (modifyThreads $! Map.delete tid)
                  action
     return t
 
 labelThread :: ThreadId -> String -> IO ()
 labelThread tid s = do
     GHC.labelThread tid s
-    modifyThreads $ Map.adjust (\pt -> pt { lbl = s }) tid
+    modifyThreads $! Map.adjust (\pt -> pt { lbl = s }) tid
 {-# INLINE labelThread #-}
 
-threadsInformation :: IO [PerThread]
+threadsInformation :: IO [(ThreadId,PerThread)]
 threadsInformation = do
     m <- threads <$> readMVar globals
-    return $ Map.elems m
+    return $ Map.toList m
 
 
 modifyThreads :: MonadBase IO m => (Map.Map ThreadId PerThread -> Map.Map ThreadId PerThread) -> m ()
 modifyThreads f = do
     g <- takeMVar globals
     let f' st = st { threads = f (threads st) }
-        r = f' g
-    putMVar globals r
+    putMVar globals $! f' g