Merge 0826fae into e8daf02

iconnect · Apr 2, 2020 · f3fc7bb · f3fc7bb
2 parents e8daf02 + 0826fae
commit f3fc7bb
Show file tree

Hide file tree

Showing 5 changed files with 7 additions and 107 deletions.
diff --git a/.gitignore b/.gitignore
@@ -17,3 +17,5 @@ scott-test.*
 example/Main.hi
 example/Main.o
 ridley-extras/dist
+tags
+dist-newstyle
diff --git a/cabal.project b/cabal.project
@@ -0,0 +1,2 @@
+packages: ridley
+          ridley-extras
diff --git a/ridley/ridley.cabal b/ridley/ridley.cabal
@@ -58,8 +58,7 @@ library
   if flag(lib-Werror)
     ghc-options: -Wall -Werror
   if os(darwin)
-    c-sources:         src/System/Metrics/Prometheus/Ridley/Metrics/Network/Darwin.c
-                       src/System/Metrics/Prometheus/Ridley/Metrics/CPU/Darwin.c
+    c-sources:         src/System/Metrics/Prometheus/Ridley/Metrics/CPU/Darwin.c
     other-modules:     System.Metrics.Prometheus.Ridley.Metrics.Network.Darwin
                        System.Metrics.Prometheus.Ridley.Metrics.CPU.Darwin
   else

diff --git a/ridley/src/System/Metrics/Prometheus/Ridley/Metrics/CPU.hs b/ridley/src/System/Metrics/Prometheus/Ridley/Metrics/CPU.hs
@@ -1,6 +1,7 @@
 {-# LANGUAGE CPP #-}
 module System.Metrics.Prometheus.Ridley.Metrics.CPU
-  ( processCPULoad
+  ( getLoadAvg
+  , processCPULoad
   ) where
 
 #ifdef darwin_HOST_OS

diff --git a/ridley/src/System/Metrics/Prometheus/Ridley/Metrics/Network/Darwin.c b/ridley/src/System/Metrics/Prometheus/Ridley/Metrics/Network/Darwin.c