--- a/hotspot/src/os/linux/vm/os_linux.cpp Thu Mar 21 06:53:53 2013 -0700
+++ b/hotspot/src/os/linux/vm/os_linux.cpp Thu Mar 21 20:46:46 2013 -0700
@@ -1811,13 +1811,15 @@
class VM_LinuxDllLoad: public VM_Operation {
private:
const char *_filename;
+ char *_ebuf;
+ int _ebuflen;
void *_lib;
public:
- VM_LinuxDllLoad(const char *fn) :
- _filename(fn), _lib(NULL) {}
+ VM_LinuxDllLoad(const char *fn, char *ebuf, int ebuflen) :
+ _filename(fn), _ebuf(ebuf), _ebuflen(ebuflen), _lib(NULL) {}
VMOp_Type type() const { return VMOp_LinuxDllLoad; }
void doit() {
- _lib = os::Linux::dll_load_inner(_filename);
+ _lib = os::Linux::dll_load_in_vmthread(_filename, _ebuf, _ebuflen);
os::Linux::_stack_is_executable = true;
}
void* loaded_library() { return _lib; }
@@ -1865,13 +1867,13 @@
// This is for the case where the DLL has an static
// constructor function that executes JNI code. We cannot
// load such DLLs in the VMThread.
- result = ::dlopen(filename, RTLD_LAZY);
+ result = os::Linux::dlopen_helper(filename, ebuf, ebuflen);
}
ThreadInVMfromNative tiv(jt);
debug_only(VMNativeEntryWrapper vew;)
- VM_LinuxDllLoad op(filename);
+ VM_LinuxDllLoad op(filename, ebuf, ebuflen);
VMThread::execute(&op);
if (LoadExecStackDllInVMThread) {
result = op.loaded_library();
@@ -1883,7 +1885,7 @@
}
if (!load_attempted) {
- result = ::dlopen(filename, RTLD_LAZY);
+ result = os::Linux::dlopen_helper(filename, ebuf, ebuflen);
}
if (result != NULL) {
@@ -1892,11 +1894,6 @@
}
Elf32_Ehdr elf_head;
-
- // Read system error message into ebuf
- // It may or may not be overwritten below
- ::strncpy(ebuf, ::dlerror(), ebuflen-1);
- ebuf[ebuflen-1]='\0';
int diag_msg_max_length=ebuflen-strlen(ebuf);
char* diag_msg_buf=ebuf+strlen(ebuf);
@@ -2039,10 +2036,19 @@
return NULL;
}
-void * os::Linux::dll_load_inner(const char *filename) {
+void * os::Linux::dlopen_helper(const char *filename, char *ebuf, int ebuflen) {
+ void * result = ::dlopen(filename, RTLD_LAZY);
+ if (result == NULL) {
+ ::strncpy(ebuf, ::dlerror(), ebuflen - 1);
+ ebuf[ebuflen-1] = '\0';
+ }
+ return result;
+}
+
+void * os::Linux::dll_load_in_vmthread(const char *filename, char *ebuf, int ebuflen) {
void * result = NULL;
if (LoadExecStackDllInVMThread) {
- result = ::dlopen(filename, RTLD_LAZY);
+ result = dlopen_helper(filename, ebuf, ebuflen);
}
// Since 7019808, libjvm.so is linked with -noexecstack. If the VM loads a