archive/jdk
1
0
Fork 0
mirror of https://github.com/openjdk/jdk.git synced 2025-08-28 23:34:52 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge

Browse source
This commit is contained in:
Daniel D. Daugherty 2010-08-13 07:33:20 -07:00
commit ae38e974f0
1 changed files with 16 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

21
hotspot/src/share/vm/runtime/thread.cpp
View file

@ -3281,12 +3281,18 @@ static OnLoadEntry_t lookup_on_load(AgentLibrary* agent, const char *on_load_sym
char buffer[JVM_MAXPATHLEN]; char buffer[JVM_MAXPATHLEN];
char ebuf[1024]; char ebuf[1024];
const char *name = agent->name(); const char *name = agent->name();
const char *msg = "Could not find agent library ";
if (agent->is_absolute_path()) { if (agent->is_absolute_path()) {
library = hpi::dll_load(name, ebuf, sizeof ebuf); library = hpi::dll_load(name, ebuf, sizeof ebuf);
if (library == NULL) { if (library == NULL) {
const char *sub_msg = " in absolute path, with error: ";
size_t len = strlen(msg) + strlen(name) + strlen(sub_msg) + strlen(ebuf) + 1;
char *buf = NEW_C_HEAP_ARRAY(char, len);
jio_snprintf(buf, len, "%s%s%s%s", msg, name, sub_msg, ebuf);
// If we can't find the agent, exit. // If we can't find the agent, exit.
vm_exit_during_initialization("Could not find agent library in absolute path", name); vm_exit_during_initialization(buf, NULL);
FREE_C_HEAP_ARRAY(char, buf);
} }
} else { } else {
// Try to load the agent from the standard dll directory // Try to load the agent from the standard dll directory
@ -3299,17 +3305,17 @@ static OnLoadEntry_t lookup_on_load(AgentLibrary* agent, const char *on_load_sym
char *home = Arguments::get_java_home(); char *home = Arguments::get_java_home();
const char *fmt = "%s/bin/java %s -Dkernel.background.download=false" const char *fmt = "%s/bin/java %s -Dkernel.background.download=false"
" sun.jkernel.DownloadManager -download client_jvm"; " sun.jkernel.DownloadManager -download client_jvm";
int length = strlen(props) + strlen(home) + strlen(fmt) + 1; size_t length = strlen(props) + strlen(home) + strlen(fmt) + 1;
char *cmd = AllocateHeap(length); char *cmd = NEW_C_HEAP_ARRAY(char, length);
jio_snprintf(cmd, length, fmt, home, props); jio_snprintf(cmd, length, fmt, home, props);
int status = os::fork_and_exec(cmd); int status = os::fork_and_exec(cmd);
FreeHeap(props); FreeHeap(props);
FreeHeap(cmd);
if (status == -1) { if (status == -1) {
warning(cmd); warning(cmd);
vm_exit_during_initialization("fork_and_exec failed: %s", vm_exit_during_initialization("fork_and_exec failed: %s",
strerror(errno)); strerror(errno));
} }
FREE_C_HEAP_ARRAY(char, cmd);
// when this comes back the instrument.dll should be where it belongs. // when this comes back the instrument.dll should be where it belongs.
library = hpi::dll_load(buffer, ebuf, sizeof ebuf); library = hpi::dll_load(buffer, ebuf, sizeof ebuf);
} }
@ -3319,8 +3325,13 @@ static OnLoadEntry_t lookup_on_load(AgentLibrary* agent, const char *on_load_sym
hpi::dll_build_name(buffer, sizeof(buffer), ns, name); hpi::dll_build_name(buffer, sizeof(buffer), ns, name);
library = hpi::dll_load(buffer, ebuf, sizeof ebuf); library = hpi::dll_load(buffer, ebuf, sizeof ebuf);
if (library == NULL) { if (library == NULL) {
const char *sub_msg = " on the library path, with error: ";
size_t len = strlen(msg) + strlen(name) + strlen(sub_msg) + strlen(ebuf) + 1;
char *buf = NEW_C_HEAP_ARRAY(char, len);
jio_snprintf(buf, len, "%s%s%s%s", msg, name, sub_msg, ebuf);
// If we can't find the agent, exit. // If we can't find the agent, exit.
vm_exit_during_initialization("Could not find agent library on the library path or in the local directory", name); vm_exit_during_initialization(buf, NULL);
FREE_C_HEAP_ARRAY(char, buf);
} }
} }
} }