use MVM_platform_cpu_count to implement cpucores op, but use uv impl

MoarVM · May 28, 2017 · 40bb532 · 40bb532
1 parent d7d48d6
commit 40bb532
Show file tree

Hide file tree

Showing 7 changed files with 17 additions and 91 deletions.
diff --git a/build/Makefile.in b/build/Makefile.in
@@ -52,12 +52,10 @@ ARFLAGS   = @arflags@
 
 PLATFORM_WIN32 = src/platform/win32/mmap@obj@ \
                  src/platform/win32/time@obj@ \
-                 src/platform/win32/io@obj@ \
-                 src/platform/win32/sys@obj@
+                 src/platform/win32/io@obj@
 
 PLATFORM_POSIX = src/platform/posix/mmap@obj@ \
-                 src/platform/posix/time@obj@ \
-                 src/platform/posix/sys@obj@
+                 src/platform/posix/time@obj@
 
 DASM_FLAGS_WIN32 = -D WIN32=1
 DASM_FLAGS_POSIX = -D POSIX=1
@@ -209,6 +207,7 @@ OBJECTS = src/core/callsite@obj@ \
           src/profiler/telemeh@obj@ \
           src/instrument/crossthreadwrite@obj@ \
           src/instrument/line_coverage@obj@ \
+          src/platform/sys@obj@ \
           src/moar@obj@ \
           @platform@ \
           @jit@

diff --git a/src/core/interp.c b/src/core/interp.c
@@ -1,6 +1,7 @@
 #include "moar.h"
 #include <math.h>
 #include "platform/time.h"
+#include "platform/sys.h"
 #include "strings/unicode_ops.h"
 
 /* Macros for getting things from the bytecode stream. */
@@ -5633,7 +5634,7 @@ void MVM_interp_run(MVMThreadContext *tc, void (*initial_invoke)(MVMThreadContex
                 goto NEXT;
             }
             OP(cpucores): {
-                GET_REG(cur_op, 0).i64 = MVM_cpucores();
+                GET_REG(cur_op, 0).i32 = MVM_platform_cpu_count();
                 cur_op += 2;
                 goto NEXT;
             }

diff --git a/src/core/threads.c b/src/core/threads.c
@@ -264,12 +264,3 @@ void MVM_thread_join_foreground(MVMThreadContext *tc) {
     }
 }
 
-MVMint64 MVM_cpucores() {
-    int count;
-    uv_cpu_info_t *info;
-
-    uv_cpu_info(&info, &count);
-    uv_free_cpu_info(info, count);
-
-    return count;
-}
diff --git a/src/core/threads.h b/src/core/threads.h
@@ -8,4 +8,3 @@ void MVM_thread_yield(MVMThreadContext *tc);
 MVMObject * MVM_thread_current(MVMThreadContext *tc);
 void MVM_thread_cleanup_threads_list(MVMThreadContext *tc, MVMThread **head);
 void MVM_thread_join_foreground(MVMThreadContext *tc);
-MVMint64 MVM_cpucores();
diff --git a/src/platform/posix/sys.c b/src/platform/posix/sys.c
diff --git a/src/platform/sys.c b/src/platform/sys.c
@@ -0,0 +1,12 @@
+#include "moar.h"
+#include "platform/sys.h"
+
+MVMuint32 MVM_platform_cpu_count(void) {
+    int count;
+    uv_cpu_info_t *info;
+
+    uv_cpu_info(&info, &count);
+    uv_free_cpu_info(info, count);
+
+    return count;
+}
diff --git a/src/platform/win32/sys.c b/src/platform/win32/sys.c