Mercurial > hg > graal-compiler
comparison src/share/vm/runtime/thread.cpp @ 12225:cc5b40a76049
Merge
author | bdelsart |
---|---|
date | Wed, 18 Sep 2013 21:47:51 -0700 |
parents | b89a1a870965 8e94527f601e |
children | 179cd89fb279 |
comparison
equal
deleted
inserted
replaced
12219:41e6ae9f6dd7 | 12225:cc5b40a76049 |
---|---|
3714 char buffer[JVM_MAXPATHLEN]; | 3714 char buffer[JVM_MAXPATHLEN]; |
3715 char ebuf[1024]; | 3715 char ebuf[1024]; |
3716 const char *name = agent->name(); | 3716 const char *name = agent->name(); |
3717 const char *msg = "Could not find agent library "; | 3717 const char *msg = "Could not find agent library "; |
3718 | 3718 |
3719 // First check to see if agent is statcally linked into executable | 3719 // First check to see if agent is statically linked into executable |
3720 if (os::find_builtin_agent(agent, on_load_symbols, num_symbol_entries)) { | 3720 if (os::find_builtin_agent(agent, on_load_symbols, num_symbol_entries)) { |
3721 library = agent->os_lib(); | 3721 library = agent->os_lib(); |
3722 } else if (agent->is_absolute_path()) { | 3722 } else if (agent->is_absolute_path()) { |
3723 library = os::dll_load(name, ebuf, sizeof ebuf); | 3723 library = os::dll_load(name, ebuf, sizeof ebuf); |
3724 if (library == NULL) { | 3724 if (library == NULL) { |