6402201: ProcessAttachTest.sh needs better synchronization

Reviewed-by: alanb
This commit is contained in:
Erik Gahlin 2013-11-21 13:46:35 +01:00
parent aae4ea0fe1
commit c3a4fe847a
3 changed files with 22 additions and 10 deletions

View File

@ -304,9 +304,6 @@ com/sun/jdi/SuspendThreadTest.java generic-all
# Filed 6653793
com/sun/jdi/RedefineCrossEvent.java generic-all
# Filed 6402201
com/sun/jdi/ProcessAttachTest.sh generic-all
############################################################################
# jdk_util

View File

@ -1,5 +1,5 @@
/*
* Copyright (c) 2005, Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 2005, 2013, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@ -29,6 +29,9 @@
*/
import java.net.Socket;
import java.net.ServerSocket;
import java.nio.file.CopyOption;
import java.nio.file.Files;
import java.nio.file.StandardCopyOption;
import java.io.File;
import java.io.FileOutputStream;
@ -39,10 +42,12 @@ public class ProcessAttachDebuggee {
int port = ss.getLocalPort();
// Write the port number to the given file
File f = new File(args[0]);
FileOutputStream fos = new FileOutputStream(f);
fos.write( Integer.toString(port).getBytes("UTF-8") );
fos.close();
File partial = new File(args[0] + ".partial");
File portFile = new File(args[0]);
try (FileOutputStream fos = new FileOutputStream(partial)) {
fos.write( Integer.toString(port).getBytes("UTF-8") );
}
Files.move(partial.toPath(), portFile.toPath(), StandardCopyOption.ATOMIC_MOVE);
System.out.println("Debuggee bound to port: " + port);
System.out.flush();

View File

@ -1,7 +1,7 @@
#!/bin/sh
#
# Copyright (c) 2005, 2010, Oracle and/or its affiliates. All rights reserved.
# Copyright (c) 2005, 2013, Oracle and/or its affiliates. All rights reserved.
# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
#
# This code is free software; you can redistribute it and/or modify it
@ -158,7 +158,17 @@ $JAVA -classpath "${TESTCLASSES}${PS}${TESTJAVA}/lib/tools.jar" \
# The debuggee is suspended and doesn't run until the debugger
# disconnects. We have to give it time to write the port number
# to ${PORTFILE}
sleep 10
echo "Waiting for port file to be written..."
attempts=0
while true; do
sleep 1
attempts=`expr $attempts + 1`
if [ -f ${PORTFILE} ]; then
break
fi
echo "Waiting $attempts second(s) ..."
done
if [ $? != 0 ]; then failures=`expr $failures + 1`; fi
stopDebuggee "${PORTFILE}"