< prev index next >
src/share/vm/utilities/ticks.cpp
Print this page
rev 9030 : 8203287: Zero fails to build after JDK-8199712 (Flight Recorder)
Reviewed-by: shade, mdoerr
*** 24,34 ****
#include "precompiled.hpp"
#include "runtime/os.hpp"
#include "utilities/ticks.hpp"
! #ifdef X86
#include "rdtsc_x86.hpp"
#endif
template <typename TimeSource, const int unit>
inline double conversion(typename TimeSource::Type& value) {
--- 24,34 ----
#include "precompiled.hpp"
#include "runtime/os.hpp"
#include "utilities/ticks.hpp"
! #if defined(X86) && !defined(ZERO)
#include "rdtsc_x86.hpp"
#endif
template <typename TimeSource, const int unit>
inline double conversion(typename TimeSource::Type& value) {
*** 59,69 ****
uint64_t ElapsedCounterSource::nanoseconds(Type value) {
return (uint64_t)conversion<ElapsedCounterSource, NANOUNITS>(value);
}
uint64_t FastUnorderedElapsedCounterSource::frequency() {
! #ifdef X86
static bool valid_rdtsc = Rdtsc::initialize();
if (valid_rdtsc) {
static const uint64_t freq = (uint64_t)Rdtsc::frequency();
return freq;
}
--- 59,69 ----
uint64_t ElapsedCounterSource::nanoseconds(Type value) {
return (uint64_t)conversion<ElapsedCounterSource, NANOUNITS>(value);
}
uint64_t FastUnorderedElapsedCounterSource::frequency() {
! #if defined(X86) && !defined(ZERO)
static bool valid_rdtsc = Rdtsc::initialize();
if (valid_rdtsc) {
static const uint64_t freq = (uint64_t)Rdtsc::frequency();
return freq;
}
*** 71,81 ****
static const uint64_t freq = (uint64_t)os::elapsed_frequency();
return freq;
}
FastUnorderedElapsedCounterSource::Type FastUnorderedElapsedCounterSource::now() {
! #ifdef X86
static bool valid_rdtsc = Rdtsc::initialize();
if (valid_rdtsc) {
return Rdtsc::elapsed_counter();
}
#endif
--- 71,81 ----
static const uint64_t freq = (uint64_t)os::elapsed_frequency();
return freq;
}
FastUnorderedElapsedCounterSource::Type FastUnorderedElapsedCounterSource::now() {
! #if defined(X86) && !defined(ZERO)
static bool valid_rdtsc = Rdtsc::initialize();
if (valid_rdtsc) {
return Rdtsc::elapsed_counter();
}
#endif
*** 103,113 ****
}
CompositeElapsedCounterSource::Type CompositeElapsedCounterSource::now() {
CompositeTime ct;
ct.val1 = ElapsedCounterSource::now();
! #ifdef X86
static bool initialized = false;
static bool valid_rdtsc = false;
if (!initialized) {
valid_rdtsc = Rdtsc::initialize();
initialized = true;
--- 103,113 ----
}
CompositeElapsedCounterSource::Type CompositeElapsedCounterSource::now() {
CompositeTime ct;
ct.val1 = ElapsedCounterSource::now();
! #if defined(X86) && !defined(ZERO)
static bool initialized = false;
static bool valid_rdtsc = false;
if (!initialized) {
valid_rdtsc = Rdtsc::initialize();
initialized = true;
< prev index next >