mirror of
https://github.com/openjdk/jdk.git
synced 2025-08-26 14:24:46 +02:00
Merge
This commit is contained in:
commit
b8633a3b01
46 changed files with 1401 additions and 256 deletions
|
@ -2658,6 +2658,12 @@ size_t os::numa_get_leaf_groups(int *ids, size_t size) {
|
|||
top += r;
|
||||
cur++;
|
||||
}
|
||||
if (bottom == 0) {
|
||||
// Handle a situation, when the OS reports no memory available.
|
||||
// Assume UMA architecture.
|
||||
ids[0] = 0;
|
||||
return 1;
|
||||
}
|
||||
return bottom;
|
||||
}
|
||||
|
||||
|
@ -4581,7 +4587,7 @@ void os::Solaris::synchronization_init() {
|
|||
}
|
||||
|
||||
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")));
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue