Mercurial > hg > graal-jvmci-8
diff src/os/linux/vm/os_linux.cpp @ 62:cd0742ba123c
Merge
author | kamg |
---|---|
date | Thu, 20 Mar 2008 09:17:30 -0500 |
parents | e195fe4c40c7 5a76ab815e34 |
children | 82db0859acbe |
line wrap: on
line diff
--- a/src/os/linux/vm/os_linux.cpp Thu Mar 13 14:17:48 2008 -0700 +++ b/src/os/linux/vm/os_linux.cpp Thu Mar 20 09:17:30 2008 -0500 @@ -1261,19 +1261,13 @@ return (1000 * 1000); } -jlong os::timeofday() { +jlong os::javaTimeMillis() { timeval time; int status = gettimeofday(&time, NULL); assert(status != -1, "linux error"); return jlong(time.tv_sec) * 1000 + jlong(time.tv_usec / 1000); } -// Must return millis since Jan 1 1970 for JVM_CurrentTimeMillis -// _use_global_time is only set if CacheTimeMillis is true -jlong os::javaTimeMillis() { - return (_use_global_time ? read_global_time() : timeofday()); -} - #ifndef CLOCK_MONOTONIC #define CLOCK_MONOTONIC (1) #endif