# HG changeset patch # User iveresov # Date 1216033967 25200 # Node ID 9d6a3a6891f88a82a84a176746405f8e5686c394 # Parent 2214b226b7f052d8881eed749e079c1f66f8ef6e 6720130: NUMA allocator: The linux version should search for libnuma.so.1 Summary: Search for libnuma.so.1 on Linux and liblgrp.so.1 on Solaris. Reviewed-by: jmasa diff -r 2214b226b7f0 -r 9d6a3a6891f8 src/os/linux/vm/os_linux.cpp --- a/src/os/linux/vm/os_linux.cpp Fri Jul 11 16:11:50 2008 -0700 +++ b/src/os/linux/vm/os_linux.cpp Mon Jul 14 04:12:47 2008 -0700 @@ -2278,7 +2278,7 @@ dlsym(RTLD_DEFAULT, "sched_getcpu"))); if (sched_getcpu() != -1) { // Does it work? - void *handle = dlopen("libnuma.so", RTLD_LAZY); + 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, dlsym(handle, "numa_node_to_cpus"))); diff -r 2214b226b7f0 -r 9d6a3a6891f8 src/os/solaris/vm/os_solaris.cpp --- a/src/os/solaris/vm/os_solaris.cpp Fri Jul 11 16:11:50 2008 -0700 +++ b/src/os/solaris/vm/os_solaris.cpp Mon Jul 14 04:12:47 2008 -0700 @@ -4570,7 +4570,7 @@ } void os::Solaris::liblgrp_init() { - void *handle = dlopen("liblgrp.so", RTLD_LAZY); + void *handle = dlopen("liblgrp.so.1", RTLD_LAZY); if (handle != NULL) { os::Solaris::set_lgrp_home(CAST_TO_FN_PTR(lgrp_home_func_t, dlsym(handle, "lgrp_home"))); os::Solaris::set_lgrp_init(CAST_TO_FN_PTR(lgrp_init_func_t, dlsym(handle, "lgrp_init")));