stan/jdk-24
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

8184042: several serviceability/sa tests timed out on MacOS X

Browse Source 
Restore the ptrace attach argument to PT_ATTACH from PT_ATTACHEXC

Reviewed-by: dholmes, sspitsyn, dcubed, poonam, dsamersoff
This commit is contained in:
Jini George 2017-10-16 23:23:27 -07:00 committed by Jini George
parent 39b068db11
commit e8fe842a41
2 changed files with 9 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
src/jdk.hotspot.agent/macosx/native/libsaproc/MacosxDebuggerLocal.m
View File

@ -689,8 +689,15 @@ static bool ptrace_waitpid(pid_t pid) {
// attach to a process/thread specified by "pid" // attach to a process/thread specified by "pid"
static bool ptrace_attach(pid_t pid) { static bool ptrace_attach(pid_t pid) {
int res; int res;
if ((res = ptrace(PT_ATTACHEXC, pid, 0, 0)) < 0) { #ifdef __clang__
print_error("ptrace(PT_ATTACHEXC, %d) failed with %d\n", pid, res); #pragma clang diagnostic push
#pragma clang diagnostic ignored "-Wdeprecated-declarations"
#endif
if ((res = ptrace(PT_ATTACH, pid, 0, 0)) < 0) {
print_error("ptrace(PT_ATTACH, %d) failed with %d\n", pid, res);
#ifdef __clang__
#pragma clang diagnostic pop
#endif
return false; return false;
} else { } else {
return ptrace_waitpid(pid); return ptrace_waitpid(pid);

8
test/jdk/ProblemList.txt
View File

@ -301,14 +301,6 @@ sun/jvmstat/monitor/MonitoredVm/MonitorVmStartTerminate.java 8057732 generic-
com/sun/tools/attach/StartManagementAgent.java 8179700 generic-all com/sun/tools/attach/StartManagementAgent.java 8179700 generic-all
sun/tools/jhsdb/AlternateHashingTest.java 8184042 macosx-all
sun/tools/jhsdb/BasicLauncherTest.java 8184042 macosx-all
sun/tools/jhsdb/HeapDumpTest.java 8184042 macosx-all
sun/tools/jhsdb/heapconfig/JMapHeapConfigTest.java 8184042 macosx-all
############################################################################ ############################################################################
# jdk_other # jdk_other