Clean up a bit.

Author: TravisWhitaker

.gitignore

@@ -12,3 +12,4 @@ cabal.sandbox.config
 examples/Group
 *.sublime-*
 dist-newstyle/
+cabal.project.local

System/Metrics.hs

@@ -68,7 +68,6 @@ module System.Metrics
     , Value(..)
     ) where
 
-import Control.Applicative ((<$>))
 import Control.Monad (forM)
 import qualified Data.IntMap.Strict as IM
 import Data.IORef (IORef, atomicModifyIORef, newIORef, readIORef)
@@ -470,20 +469,16 @@ registerGcMetrics =
 #if MIN_VERSION_base(4,11,0)
      , ("rts.gc.par_balanced_bytes_copied", Gauge . fromIntegral . Stats.cumulative_par_balanced_copied_bytes)
 #if MIN_VERSION_base(4,15,0)
-     , ("rts.gc.nm.sync_cpu_ms"           , Counter . nsToMs . Stats.nonmoving_gc_sync_cpu_ns)
-     , ("rts.gc.nm.sync_elapsed_ms"       , Counter . nsToMs . Stats.nonmoving_gc_sync_elapsed_ns)
-     , ("rts.gc.nm.sync_max_elapsed_ms"   , Counter . nsToMs . Stats.nonmoving_gc_sync_max_elapsed_ns)
-     , ("rts.gc.nm.cpu_ms"                , Counter . nsToMs . Stats.nonmoving_gc_cpu_ns)
-     , ("rts.gc.nm.elapsed_ms"            , Counter . nsToMs . Stats.nonmoving_gc_elapsed_ns)
-     , ("rts.gc.nm.max_elapsed_ms"        , Counter . nsToMs . Stats.nonmoving_gc_max_elapsed_ns)
+     , ("rts.gc.nm.sync_cpu_ms"           , Counter . nsToMs . fromIntegral . Stats.nonmoving_gc_sync_cpu_ns)
+     , ("rts.gc.nm.sync_elapsed_ms"       , Counter . nsToMs . fromIntegral . Stats.nonmoving_gc_sync_elapsed_ns)
+     , ("rts.gc.nm.sync_max_elapsed_ms"   , Counter . nsToMs . fromIntegral . Stats.nonmoving_gc_sync_max_elapsed_ns)
+     , ("rts.gc.nm.cpu_ms"                , Counter . nsToMs . fromIntegral . Stats.nonmoving_gc_cpu_ns)
+     , ("rts.gc.nm.elapsed_ms"            , Counter . nsToMs . fromIntegral . Stats.nonmoving_gc_elapsed_ns)
+     , ("rts.gc.nm.max_elapsed_ms"        , Counter . nsToMs . fromIntegral . Stats.nonmoving_gc_max_elapsed_ns)
 # endif
 # endif
      ])
     getRTSStats
-    where
-    -- | Convert nanoseconds to milliseconds.
-    nsToMs :: Int64 -> Int64
-    nsToMs s = round (realToFrac s / (1000000.0 :: Double))
 #else
     (M.fromList
      [ ("rts.gc.bytes_allocated"          , Counter . Stats.bytesAllocated)

benchmarks/Counter.hs

@@ -5,18 +5,21 @@ module Main where
 
 import Control.Concurrent
 import Control.Monad
-import System.Metrics.Counter
+import qualified System.Metrics.Counter as C
 
 main :: IO ()
 main = do
-    counter <- new
+    counter <- C.new
     locks <- replicateM n newEmptyMVar
     mapM_ (forkIO . work counter iters) locks
     mapM_ takeMVar locks
+    fin <- C.read counter
+    when (fin /= (n * iters)) $
+        fail "Data.Atomic is broken!"
   where
     n = 100
     iters = 100000
 
-    work :: Counter -> Int -> MVar () -> IO ()
+    work :: C.Counter -> Int -> MVar () -> IO ()
     work !_ 0 !lock     = putMVar lock ()
-    work counter i lock = inc counter >> work counter (i - 1) lock
+    work counter i lock = C.inc counter >> work counter (i - 1) lock

cbits/atomic.c

@@ -11,6 +11,7 @@
 #endif
 
 struct distrib {
+  // 0 -> unlocked; 1 -> locked
   HSINTTYPE lock;
   HSINTTYPE count;
   double mean;

cbits/distrib.c

@@ -62,9 +62,6 @@ library
   includes:         distrib.h
   install-includes: distrib.h
   include-dirs:     cbits
-  c-sources:
-    cbits/atomic.c
-    cbits/distrib.c
 
 benchmark counter
   main-is:          Counter.hs