diff -r 4a5b7a2dd783 -r 1ba5728eda0d hotspot/src/os/linux/vm/os_linux.cpp --- a/hotspot/src/os/linux/vm/os_linux.cpp Thu Jun 01 02:21:18 2017 +0000 +++ b/hotspot/src/os/linux/vm/os_linux.cpp Wed May 31 13:17:00 2017 +0200 @@ -2815,6 +2815,18 @@ return (retval == -1) ? retval : cpu; } +void os::Linux::sched_getcpu_init() { + // sched_getcpu() should be in libc. + set_sched_getcpu(CAST_TO_FN_PTR(sched_getcpu_func_t, + dlsym(RTLD_DEFAULT, "sched_getcpu"))); + + // If it's not, try a direct syscall. + if (sched_getcpu() == -1) { + set_sched_getcpu(CAST_TO_FN_PTR(sched_getcpu_func_t, + (void*)&sched_getcpu_syscall)); + } +} + // Something to do with the numa-aware allocator needs these symbols extern "C" JNIEXPORT void numa_warn(int number, char *where, ...) { } extern "C" JNIEXPORT void numa_error(char *where) { } @@ -2836,17 +2848,7 @@ } bool os::Linux::libnuma_init() { - // sched_getcpu() should be in libc. - set_sched_getcpu(CAST_TO_FN_PTR(sched_getcpu_func_t, - dlsym(RTLD_DEFAULT, "sched_getcpu"))); - - // If it's not, try a direct syscall. - if (sched_getcpu() == -1) { - set_sched_getcpu(CAST_TO_FN_PTR(sched_getcpu_func_t, - (void*)&sched_getcpu_syscall)); - } - - if (sched_getcpu() != -1) { // Does it work? + if (sched_getcpu() != -1) { // Requires sched_getcpu() support void *handle = dlopen("libnuma.so.1", RTLD_LAZY); if (handle != NULL) { set_numa_node_to_cpus(CAST_TO_FN_PTR(numa_node_to_cpus_func_t, @@ -4875,6 +4877,7 @@ #endif Linux::libpthread_init(); + Linux::sched_getcpu_init(); log_info(os)("HotSpot is running with %s, %s", Linux::glibc_version(), Linux::libpthread_version());