---

brson · brson · commit 9b8b8889dc48 · 2013-06-06T17:53:13.000-07:00
yaml --- r: 142600 b: refs/heads/try2 c: f9a5005 h: refs/heads/master v: v3
diff --git a/[refs] b/[refs]
@@ -5,7 +5,7 @@ refs/heads/snap-stage3: 78a7676898d9f80ab540c6df5d4c9ce35bb50463
 refs/heads/try: 519addf6277dbafccbb4159db4b710c37eaa2ec5
 refs/tags/release-0.1: 1f5c5126e96c79d22cb7862f75304136e204f105
 refs/heads/ndm: f3868061cd7988080c30d6d5bf352a5a5fe2460b
-refs/heads/try2: 80849e78a847f7834f71b36a66251ba0ea37a982
+refs/heads/try2: f9a5005f52d528797d6b98a3bee73ab2d71b9aa3
 refs/heads/dist-snap: ba4081a5a8573875fed17545846f6f6902c8ba8d
 refs/tags/release-0.2: c870d2dffb391e14efb05aa27898f1f6333a9596
 refs/tags/release-0.3: b5f0d0f648d9a6153664837026ba1be43d3e2503
diff --git a/branches/try2/src/rt/rust_builtin.cpp b/branches/try2/src/rt/rust_builtin.cpp
@@ -930,6 +930,13 @@ rust_begin_unwind(uintptr_t token) {
 #endif
 }
 
+extern int get_num_cpus();
+
+extern "C" CDECL uintptr_t
+rust_get_num_cpus() {
+    return get_num_cpus();
+}
+
 //
 // Local Variables:
 // mode: C++
diff --git a/branches/try2/src/rt/rust_env.cpp b/branches/try2/src/rt/rust_env.cpp
@@ -40,15 +40,15 @@ rust_drop_env_lock() {
 }
 
 #if defined(__WIN32__)
-static int
+int
 get_num_cpus() {
     SYSTEM_INFO sysinfo;
     GetSystemInfo(&sysinfo);
 
     return (int) sysinfo.dwNumberOfProcessors;
 }
 #elif defined(__BSD__)
-static int
+int
 get_num_cpus() {
     /* swiped from http://stackoverflow.com/questions/150355/
        programmatically-find-the-number-of-cores-on-a-machine */
@@ -75,7 +75,7 @@ get_num_cpus() {
     return numCPU;
 }
 #elif defined(__GNUC__)
-static int
+int
 get_num_cpus() {
     return sysconf(_SC_NPROCESSORS_ONLN);
 }
diff --git a/branches/try2/src/rt/rustrt.def.in b/branches/try2/src/rt/rustrt.def.in
@@ -239,3 +239,4 @@ rust_valgrind_stack_deregister
 rust_take_env_lock
 rust_drop_env_lock
 rust_update_log_settings
+rust_get_num_cpus

Original file line number	Diff line number	Diff line change
`@@ -40,15 +40,15 @@ rust_drop_env_lock() {`
`40`	`40`	`}`
`41`	`41`
`42`	`42`	`#if defined(__WIN32__)`
`43`		`-static int`
	`43`	`+int`
`44`	`44`	`get_num_cpus() {`
`45`	`45`	`SYSTEM_INFO sysinfo;`
`46`	`46`	`GetSystemInfo(&sysinfo);`
`47`	`47`
`48`	`48`	`return (int) sysinfo.dwNumberOfProcessors;`
`49`	`49`	`}`
`50`	`50`	`#elif defined(__BSD__)`
`51`		`-static int`
	`51`	`+int`
`52`	`52`	`get_num_cpus() {`
`53`	`53`	`/* swiped from http://stackoverflow.com/questions/150355/`
`54`	`54`	`programmatically-find-the-number-of-cores-on-a-machine */`
`@@ -75,7 +75,7 @@ get_num_cpus() {`
`75`	`75`	`return numCPU;`
`76`	`76`	`}`
`77`	`77`	`#elif defined(__GNUC__)`
`78`		`-static int`
	`78`	`+int`
`79`	`79`	`get_num_cpus() {`
`80`	`80`	`return sysconf(_SC_NPROCESSORS_ONLN);`
`81`	`81`	`}`