stan/jdk-24
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

8320830: [AIX] Dont mix os::dll_load() with direct dlclose() calls

Browse Source 
Reviewed-by: stuefe, clanger
This commit is contained in:
Joachim Kern 2023-11-30 11:19:58 +00:00 committed by Martin Doerr
parent 8b102ed6b4
commit 61653a1ff1
2 changed files with 4 additions and 4 deletions

6
src/hotspot/os/aix/libodm_aix.cpp

@ -35,7 +35,7 @@
dynamicOdm::dynamicOdm() {
const char* libodmname = "/usr/lib/libodm.a(shr_64.o)";
char ebuf[512];
void* _libhandle = os::dll_load(libodmname, ebuf, sizeof(ebuf));
_libhandle = os::dll_load(libodmname, ebuf, sizeof(ebuf));
if (!_libhandle) {
trcVerbose("Cannot load %s (error %s)", libodmname, ebuf);
@ -48,14 +48,14 @@ dynamicOdm::dynamicOdm() {
_odm_terminate = (fun_odm_terminate )dlsym(_libhandle, "odm_terminate" );
if (!_odm_initialize || !_odm_set_path || !_odm_mount_class || !_odm_get_obj || !_odm_terminate) {
trcVerbose("Couldn't find all required odm symbols from %s", libodmname);
dlclose(_libhandle);
os::dll_unload(_libhandle);
_libhandle = nullptr;
return;
}
}
dynamicOdm::~dynamicOdm() {
if (_libhandle) { dlclose(_libhandle); }
if (_libhandle) { os::dll_unload(_libhandle); }
}

2
src/hotspot/os/aix/libperfstat_aix.cpp

@ -114,7 +114,7 @@ bool libperfstat::init() {
void libperfstat::cleanup() {
if (g_libhandle) {
dlclose(g_libhandle);
os::dll_unload(g_libhandle);
g_libhandle = nullptr;
}