Mercurial > hg > truffle
diff src/os/bsd/vm/os_bsd.cpp @ 8696:bdb602473679
Merge
author | morris |
---|---|
date | Thu, 07 Mar 2013 14:46:20 -0800 |
parents | 63e54c37ac64 bf06968a8a00 |
children | 252ad8d5f22b |
line wrap: on
line diff
--- a/src/os/bsd/vm/os_bsd.cpp Thu Mar 07 14:29:02 2013 +0100 +++ b/src/os/bsd/vm/os_bsd.cpp Thu Mar 07 14:46:20 2013 -0800 @@ -3903,15 +3903,27 @@ jlong os::current_thread_cpu_time() { #ifdef __APPLE__ return os::thread_cpu_time(Thread::current(), true /* user + sys */); +#else + Unimplemented(); + return 0; #endif } jlong os::thread_cpu_time(Thread* thread) { +#ifdef __APPLE__ + return os::thread_cpu_time(thread, true /* user + sys */); +#else + Unimplemented(); + return 0; +#endif } jlong os::current_thread_cpu_time(bool user_sys_cpu_time) { #ifdef __APPLE__ return os::thread_cpu_time(Thread::current(), user_sys_cpu_time); +#else + Unimplemented(); + return 0; #endif } @@ -3935,6 +3947,9 @@ } else { return ((jlong)tinfo.user_time.seconds * 1000000000) + ((jlong)tinfo.user_time.microseconds * (jlong)1000); } +#else + Unimplemented(); + return 0; #endif }