Mercurial > hg > truffle
diff src/os/solaris/vm/os_solaris.cpp @ 288:70c4fb9cf899
Merge
author | apangin |
---|---|
date | Tue, 19 Aug 2008 06:02:07 -0700 |
parents | b7f01ad69d30 |
children | 1ee8caae33af |
line wrap: on
line diff
--- a/src/os/solaris/vm/os_solaris.cpp Mon Aug 18 14:53:36 2008 -0700 +++ b/src/os/solaris/vm/os_solaris.cpp Tue Aug 19 06:02:07 2008 -0700 @@ -2679,6 +2679,12 @@ 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; } @@ -4602,7 +4608,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")));