Mercurial > hg > truffle
changeset 17684:d1621038becf
8031968: Mac OS X: VM starts the agent by calling both Agent_OnAttach and Agent_OnAttach_L functions if its agent library is dynamically linked.
Summary: Make sure we only look for statically linked agents in the main process image
Reviewed-by: dsamersoff, bpittore, dcubed
| author | sla |
|---|---|
| date | Thu, 23 Jan 2014 09:06:21 +0100 |
| parents | 031b06eac1a9 |
| children | fd07a7e4222b |
| files | src/os/bsd/vm/os_bsd.cpp src/os/linux/vm/os_linux.cpp src/os/posix/vm/os_posix.cpp src/os/solaris/vm/os_solaris.cpp |
| diffstat | 4 files changed, 18 insertions(+), 4 deletions(-) [+] |
line wrap: on
line diff
--- a/src/os/bsd/vm/os_bsd.cpp Tue Feb 11 08:49:37 2014 -0800 +++ b/src/os/bsd/vm/os_bsd.cpp Thu Jan 23 09:06:21 2014 +0100 @@ -1557,6 +1557,17 @@ } #endif /* !__APPLE__ */ +void* os::get_default_process_handle() { +#ifdef __APPLE__ + // MacOS X needs to use RTLD_FIRST instead of RTLD_LAZY + // to avoid finding unexpected symbols on second (or later) + // loads of a library. + return (void*)::dlopen(NULL, RTLD_FIRST); +#else + return (void*)::dlopen(NULL, RTLD_LAZY); +#endif +} + // XXX: Do we need a lock around this as per Linux? void* os::dll_lookup(void* handle, const char* name) { return dlsym(handle, name);
--- a/src/os/linux/vm/os_linux.cpp Tue Feb 11 08:49:37 2014 -0800 +++ b/src/os/linux/vm/os_linux.cpp Thu Jan 23 09:06:21 2014 +0100 @@ -2104,6 +2104,9 @@ return res; } +void* os::get_default_process_handle() { + return (void*)::dlopen(NULL, RTLD_LAZY); +} static bool _print_ascii_file(const char* filename, outputStream* st) { int fd = ::open(filename, O_RDONLY);
--- a/src/os/posix/vm/os_posix.cpp Tue Feb 11 08:49:37 2014 -0800 +++ b/src/os/posix/vm/os_posix.cpp Thu Jan 23 09:06:21 2014 +0100 @@ -262,10 +262,6 @@ return ::fdopen(fd, mode); } -void* os::get_default_process_handle() { - return (void*)::dlopen(NULL, RTLD_LAZY); -} - // Builds a platform dependent Agent_OnLoad_<lib_name> function name // which is used to find statically linked in agents. // Parameters:
--- a/src/os/solaris/vm/os_solaris.cpp Tue Feb 11 08:49:37 2014 -0800 +++ b/src/os/solaris/vm/os_solaris.cpp Thu Jan 23 09:06:21 2014 +0100 @@ -2146,6 +2146,10 @@ return dlsym(handle, name); } +void* os::get_default_process_handle() { + return (void*)::dlopen(NULL, RTLD_LAZY); +} + int os::stat(const char *path, struct stat *sbuf) { char pathbuf[MAX_PATH]; if (strlen(path) > MAX_PATH - 1) {