src/os/bsd/vm/os_bsd.cpp

changeset 6026
e4f478e7781b
parent 5895
3e265ce4d2dd
child 6054
3b32d287da89
     1.1 --- a/src/os/bsd/vm/os_bsd.cpp	Thu Oct 24 22:19:48 2013 -0700
     1.2 +++ b/src/os/bsd/vm/os_bsd.cpp	Fri Oct 25 09:07:58 2013 +0200
     1.3 @@ -945,17 +945,15 @@
     1.4  // Used by VMSelfDestructTimer and the MemProfiler.
     1.5  double os::elapsedTime() {
     1.6  
     1.7 -  return (double)(os::elapsed_counter()) * 0.000001;
     1.8 +  return ((double)os::elapsed_counter()) / os::elapsed_frequency();
     1.9  }
    1.10  
    1.11  jlong os::elapsed_counter() {
    1.12 -  timeval time;
    1.13 -  int status = gettimeofday(&time, NULL);
    1.14 -  return jlong(time.tv_sec) * 1000 * 1000 + jlong(time.tv_usec) - initial_time_count;
    1.15 +  return javaTimeNanos() - initial_time_count;
    1.16  }
    1.17  
    1.18  jlong os::elapsed_frequency() {
    1.19 -  return (1000 * 1000);
    1.20 +  return NANOSECS_PER_SEC; // nanosecond resolution
    1.21  }
    1.22  
    1.23  bool os::supports_vtime() { return true; }
    1.24 @@ -3582,7 +3580,7 @@
    1.25    Bsd::_main_thread = pthread_self();
    1.26  
    1.27    Bsd::clock_init();
    1.28 -  initial_time_count = os::elapsed_counter();
    1.29 +  initial_time_count = javaTimeNanos();
    1.30  
    1.31  #ifdef __APPLE__
    1.32    // XXXDARWIN

mercurial