[vmkit-commits] [vmkit] r139119 - in /vmkit/trunk: include/mvm/System.h lib/J3/Classpath/ClasspathVMRuntime.inc

[Nicolas Geoffray]

Author: geoffray
Date: Mon Sep  5 12:53:25 2011
New Revision: 139119

URL: http://llvm.org/viewvc/llvm-project?rev=139119&view=rev
Log:
Detect the number of processors. Patch (derived) from Will Dietz!


Modified:
    vmkit/trunk/include/mvm/System.h
    vmkit/trunk/lib/J3/Classpath/ClasspathVMRuntime.inc

Modified: vmkit/trunk/include/mvm/System.h
URL: http://llvm.org/viewvc/llvm-project/vmkit/trunk/include/mvm/System.h?rev=139119&r1=139118&r2=139119&view=diff
==============================================================================
--- vmkit/trunk/include/mvm/System.h (original)
+++ vmkit/trunk/include/mvm/System.h Mon Sep  5 12:53:25 2011
@@ -14,6 +14,7 @@
 #include <cstring>
 #include <dlfcn.h>
 #include <stdint.h>
+#include <unistd.h>
 
 namespace mvm {
 
@@ -62,7 +63,7 @@
 const intptr_t kMvmThreadMask = 0xF0000000;
 #endif
 
-#if defined(MACOS_OS)
+#if MACOS_OS
   #define LONGJMP _longjmp
   #define SETJMP _setjmp
   #define DYLD_EXTENSION ".dylib"
@@ -198,6 +199,10 @@
   return ((uint8_t*)ptr) + mvm::kWordSize;
 #endif
   }
+
+  static int GetNumberOfProcessors() {
+    return sysconf(_SC_NPROCESSORS_ONLN);
+  }
 };
 
 }

Modified: vmkit/trunk/lib/J3/Classpath/ClasspathVMRuntime.inc
URL: http://llvm.org/viewvc/llvm-project/vmkit/trunk/lib/J3/Classpath/ClasspathVMRuntime.inc?rev=139119&r1=139118&r2=139119&view=diff
==============================================================================
--- vmkit/trunk/lib/J3/Classpath/ClasspathVMRuntime.inc (original)
+++ vmkit/trunk/lib/J3/Classpath/ClasspathVMRuntime.inc Mon Sep  5 12:53:25 2011
@@ -223,7 +223,7 @@
 JNIEnv *env,
 jclass clazz,
 #endif
-  return 1;
+  return mvm::System::GetNumberOfProcessors();
 }
 }