archive/jdk
1
0
Fork 0
mirror of https://github.com/openjdk/jdk.git synced 2025-09-18 01:54:47 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

8205878: pthread_getcpuclockid is expected to return 0 code

Browse source 
Reviewed-by: cjplummer, amenkov, coleenp
This commit is contained in:
David Holmes 2018-07-09 20:17:32 -04:00
parent 155ec2ab81
commit 5fcb3ecb4e
6 changed files with 259 additions and 20 deletions
Download patch file Download diff file Expand all files Collapse all files

24
src/hotspot/os/linux/os_linux.cpp
View file

@ -5572,14 +5572,18 @@ bool os::pd_unmap_memory(char* addr, size_t bytes) {
static jlong slow_thread_cpu_time(Thread *thread, bool user_sys_cpu_time);
static clockid_t thread_cpu_clockid(Thread* thread) {
pthread_t tid = thread->osthread()->pthread_id();
clockid_t clockid;
// Get thread clockid
int rc = os::Linux::pthread_getcpuclockid(tid, &clockid);
assert(rc == 0, "pthread_getcpuclockid is expected to return 0 code");
return clockid;
static jlong fast_cpu_time(Thread *thread) {
clockid_t clockid;
int rc = os::Linux::pthread_getcpuclockid(thread->osthread()->pthread_id(),
&clockid);
if (rc == 0) {
return os::Linux::fast_thread_cpu_time(clockid);
} else {
// It's possible to encounter a terminated native thread that failed
// to detach itself from the VM - which should result in ESRCH.
assert_status(rc == ESRCH, rc, "pthread_getcpuclockid failed");
return -1;
}
}
// current_thread_cpu_time(bool) and thread_cpu_time(Thread*, bool)
@ -5601,7 +5605,7 @@ jlong os::current_thread_cpu_time() {
jlong os::thread_cpu_time(Thread* thread) {
// consistent with what current_thread_cpu_time() returns
if (os::Linux::supports_fast_thread_cpu_time()) {
return os::Linux::fast_thread_cpu_time(thread_cpu_clockid(thread));
return fast_cpu_time(thread);
} else {
return slow_thread_cpu_time(thread, true /* user + sys */);
}
@ -5617,7 +5621,7 @@ jlong os::current_thread_cpu_time(bool user_sys_cpu_time) {
jlong os::thread_cpu_time(Thread *thread, bool user_sys_cpu_time) {
if (user_sys_cpu_time && os::Linux::supports_fast_thread_cpu_time()) {
return os::Linux::fast_thread_cpu_time(thread_cpu_clockid(thread));
return fast_cpu_time(thread);
} else {
return slow_thread_cpu_time(thread, user_sys_cpu_time);
}