Mercurial > jdk8-mips64-public > hotspot / file diff

     1.1 --- a/src/os/windows/vm/os_windows.cpp	Fri Dec 16 11:40:00 2011 -0800
     1.2 +++ b/src/os/windows/vm/os_windows.cpp	Mon Dec 19 10:02:05 2011 -0800
     1.3 @@ -821,17 +821,15 @@
     1.4    }
     1.5  }
     1.6  
     1.7 -#define NANOS_PER_SEC         CONST64(1000000000)
     1.8 -#define NANOS_PER_MILLISEC    1000000
     1.9  jlong os::javaTimeNanos() {
    1.10    if (!has_performance_count) {
    1.11 -    return javaTimeMillis() * NANOS_PER_MILLISEC; // the best we can do.
    1.12 +    return javaTimeMillis() * NANOSECS_PER_MILLISEC; // the best we can do.
    1.13    } else {
    1.14      LARGE_INTEGER current_count;
    1.15      QueryPerformanceCounter(&current_count);
    1.16      double current = as_long(current_count);
    1.17      double freq = performance_frequency;
    1.18 -    jlong time = (jlong)((current/freq) * NANOS_PER_SEC);
    1.19 +    jlong time = (jlong)((current/freq) * NANOSECS_PER_SEC);
    1.20      return time;
    1.21    }
    1.22  }
    1.23 @@ -847,15 +845,15 @@
    1.24      info_ptr->may_skip_forward = true;
    1.25    } else {
    1.26      jlong freq = performance_frequency;
    1.27 -    if (freq < NANOS_PER_SEC) {
    1.28 +    if (freq < NANOSECS_PER_SEC) {
    1.29        // the performance counter is 64 bits and we will
    1.30        // be multiplying it -- so no wrap in 64 bits
    1.31        info_ptr->max_value = ALL_64_BITS;
    1.32 -    } else if (freq > NANOS_PER_SEC) {
    1.33 +    } else if (freq > NANOSECS_PER_SEC) {
    1.34        // use the max value the counter can reach to
    1.35        // determine the max value which could be returned
    1.36        julong max_counter = (julong)ALL_64_BITS;
    1.37 -      info_ptr->max_value = (jlong)(max_counter / (freq / NANOS_PER_SEC));
    1.38 +      info_ptr->max_value = (jlong)(max_counter / (freq / NANOSECS_PER_SEC));
    1.39      } else {
    1.40        // the performance counter is 64 bits and we will
    1.41        // be using it directly -- so no wrap in 64 bits