Mercurial > hg > truffle
comparison src/share/vm/runtime/thread.cpp @ 12253:179cd89fb279
Merge
author | tschatzl |
---|---|
date | Thu, 19 Sep 2013 09:34:20 +0200 |
parents | 06ae47d9d088 cc5b40a76049 |
children | 190899198332 |
comparison
equal
deleted
inserted
replaced
12252:06ae47d9d088 | 12253:179cd89fb279 |
---|---|
3719 char buffer[JVM_MAXPATHLEN]; | 3719 char buffer[JVM_MAXPATHLEN]; |
3720 char ebuf[1024]; | 3720 char ebuf[1024]; |
3721 const char *name = agent->name(); | 3721 const char *name = agent->name(); |
3722 const char *msg = "Could not find agent library "; | 3722 const char *msg = "Could not find agent library "; |
3723 | 3723 |
3724 // First check to see if agent is statcally linked into executable | 3724 // First check to see if agent is statically linked into executable |
3725 if (os::find_builtin_agent(agent, on_load_symbols, num_symbol_entries)) { | 3725 if (os::find_builtin_agent(agent, on_load_symbols, num_symbol_entries)) { |
3726 library = agent->os_lib(); | 3726 library = agent->os_lib(); |
3727 } else if (agent->is_absolute_path()) { | 3727 } else if (agent->is_absolute_path()) { |
3728 library = os::dll_load(name, ebuf, sizeof ebuf); | 3728 library = os::dll_load(name, ebuf, sizeof ebuf); |
3729 if (library == NULL) { | 3729 if (library == NULL) { |