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

Merge

Browse Source
This commit is contained in:
Alejandro Murillo 2015-12-11 17:45:50 -08:00
commit 0a269e99fc
10 changed files with 105 additions and 58 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

119
jdk/test/com/sun/jdi/SuspendThreadTest.java
View File

@ -42,6 +42,7 @@ import com.sun.jdi.request.*;
class SuspendThreadTarg {
public static long count;
public static boolean active = true;
public static void bkpt() {
count++;
@ -53,7 +54,7 @@ class SuspendThreadTarg {
// We need this to be running so the bkpt
// can be hit immediately when it is enabled
// in the back-end.
while(count >= 0) {
while(active) {
bkpt();
}
System.out.println("Goodbye from SuspendThreadTarg, count = " + count);
@ -82,9 +83,9 @@ public class SuspendThreadTest extends TestScaffold {
// to guard against spurious wakeups from bkptSignal.wait()
boolean signalSent;
// signal that a breakpoint has happened
Object bkptSignal = new Object() {};
final private Object bkptSignal = new Object() {};
BreakpointRequest bkptRequest;
Field debuggeeCountField;
Field debuggeeCountField, debuggeeActiveField;
// When we get a bkpt we want to disable the request,
// resume the debuggee, and then re-enable the request
@ -119,65 +120,71 @@ public class SuspendThreadTest extends TestScaffold {
/********** test core **********/
protected void runTests() throws Exception {
/*
* Get to the top of main()
* to determine targetClass and mainThread
*/
BreakpointEvent bpe = startToMain("SuspendThreadTarg");
targetClass = (ClassType)bpe.location().declaringType();
mainThread = bpe.thread();
EventRequestManager erm = vm().eventRequestManager();
Location loc1 = findMethod(targetClass, "bkpt", "()V").location();
bkptRequest = erm.createBreakpointRequest(loc1);
// Without this, it is a SUSPEND_ALL bkpt and the test will pass
bkptRequest.setSuspendPolicy(EventRequest.SUSPEND_EVENT_THREAD);
bkptRequest.enable();
debuggeeCountField = targetClass.fieldByName("count");
try {
addListener (this);
} catch (Exception ex){
ex.printStackTrace();
failure("failure: Could not add listener");
throw new Exception("SuspendThreadTest: failed", ex);
}
/*
* Get to the top of main()
* to determine targetClass and mainThread
*/
BreakpointEvent bpe = startToMain("SuspendThreadTarg");
targetClass = (ClassType)bpe.location().declaringType();
mainThread = bpe.thread();
EventRequestManager erm = vm().eventRequestManager();
int prevBkptCount;
vm().resume();
synchronized (bkptSignal) {
while (bkptCount < maxBkpts) {
prevBkptCount = bkptCount;
// If we don't get a bkpt within 5 secs,
// the test fails
signalSent = false;
do {
try {
bkptSignal.wait(5000);
} catch (InterruptedException ee) {
Location loc1 = findMethod(targetClass, "bkpt", "()V").location();
bkptRequest = erm.createBreakpointRequest(loc1);
// Without this, it is a SUSPEND_ALL bkpt and the test will pass
bkptRequest.setSuspendPolicy(EventRequest.SUSPEND_EVENT_THREAD);
bkptRequest.enable();
debuggeeCountField = targetClass.fieldByName("count");
debuggeeActiveField = targetClass.fieldByName("active");
try {
addListener (this);
} catch (Exception ex){
ex.printStackTrace();
failure("failure: Could not add listener");
throw new Exception("SuspendThreadTest: failed", ex);
}
int prevBkptCount;
vm().resume();
synchronized (bkptSignal) {
while (bkptCount < maxBkpts) {
prevBkptCount = bkptCount;
// If we don't get a bkpt within 5 secs,
// the test fails
signalSent = false;
do {
try {
bkptSignal.wait(5000);
} catch (InterruptedException ee) {
}
} while (signalSent == false);
if (prevBkptCount == bkptCount) {
failure("failure: test hung");
break;
}
} while (signalSent == false);
if (prevBkptCount == bkptCount) {
failure("failure: test hung");
break;
}
}
}
println("done with loop");
bkptRequest.disable();
removeListener(this);
println("done with loop");
bkptRequest.disable();
removeListener(this);
/*
* deal with results of test
* if anything has called failure("foo") testFailed will be true
*/
if (!testFailed) {
println("SuspendThreadTest: passed");
} else {
throw new Exception("SuspendThreadTest: failed");
/*
* deal with results of test
* if anything has called failure("foo") testFailed will be true
*/
if (!testFailed) {
println("SuspendThreadTest: passed");
} else {
throw new Exception("SuspendThreadTest: failed");
}
} finally {
if (targetClass != null && debuggeeActiveField != null) {
targetClass.setValue(debuggeeActiveField, vm().mirrorOf(false));
}
}
}
}

4
jdk/test/lib/testlibrary/jdk/testlibrary/Asserts.java
View File

@ -42,7 +42,11 @@ import java.util.Objects;
* multiple times, then the line number won't provide enough context to
* understand the failure.
* </pre>
*
* @deprecated This class is deprecated. Use the one from
* {@code <root>/test/lib/share/classes/jdk/test/lib}
*/
@Deprecated
public class Asserts {
/**

5
jdk/test/lib/testlibrary/jdk/testlibrary/JDKToolFinder.java
View File

@ -27,6 +27,11 @@ import java.io.FileNotFoundException;
import java.nio.file.Path;
import java.nio.file.Paths;
/**
* @deprecated This class is deprecated. Use the one from
* {@code <root>/test/lib/share/classes/jdk/test/lib}
*/
@Deprecated
public final class JDKToolFinder {
private JDKToolFinder() {

3
jdk/test/lib/testlibrary/jdk/testlibrary/JDKToolLauncher.java
View File

@ -46,7 +46,10 @@ import java.util.List;
* Process p = pb.start();
* }
* </pre>
* @deprecated This class is deprecated. Use the one from
* {@code <root>/test/lib/share/classes/jdk/test/lib}
*/
@Deprecated
public class JDKToolLauncher {
private final String executable;
private final List<String> vmArgs = new ArrayList<String>();

5
jdk/test/lib/testlibrary/jdk/testlibrary/OutputAnalyzer.java
View File

@ -33,7 +33,12 @@ import java.util.regex.Pattern;
/**
* Utility class for verifying output and exit value from a {@code Process}.
*
* @deprecated This class is deprecated. Use the one from
* {@code <root>/test/lib/share/classes/jdk/test/lib/process}
*
*/
@Deprecated
public final class OutputAnalyzer {
private final OutputBuffer output;
private final String stdout;

5
jdk/test/lib/testlibrary/jdk/testlibrary/OutputBuffer.java
View File

@ -28,6 +28,11 @@ import java.util.concurrent.CancellationException;
import java.util.concurrent.ExecutionException;
import java.util.concurrent.Future;
/**
* @deprecated This class is deprecated. Use the one from
* {@code <root>/test/lib/share/classes/jdk/test/lib/process}
*/
@Deprecated
class OutputBuffer {
private static class OutputBufferException extends RuntimeException {
private static final long serialVersionUID = 8528687792643129571L;

5
jdk/test/lib/testlibrary/jdk/testlibrary/Platform.java
View File

@ -27,6 +27,11 @@ import java.io.RandomAccessFile;
import java.io.FileNotFoundException;
import java.io.IOException;
/**
* @deprecated This class is deprecated. Use the one from
* {@code <root>/test/lib/share/classes/jdk/test/lib}
*/
@Deprecated
public class Platform {
private static final String osName = System.getProperty("os.name");
private static final String dataModel = System.getProperty("sun.arch.data.model");

8
jdk/test/lib/testlibrary/jdk/testlibrary/ProcessTools.java
View File

@ -27,8 +27,6 @@ import java.io.IOException;
import java.io.InputStream;
import java.io.OutputStream;
import java.io.PrintStream;
import java.lang.reflect.Field;
import java.lang.reflect.Method;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.Collections;
@ -42,6 +40,12 @@ import java.util.function.Predicate;
import java.util.function.Consumer;
import java.util.stream.Collectors;
/**
* @deprecated This class is deprecated. Use the one from
* {@code <root>/test/lib/share/classes/jdk/test/lib/process}
*/
@Deprecated
public final class ProcessTools {
private static final class LineForwarder extends StreamPumper.LinePump {
private final PrintStream ps;

5
jdk/test/lib/testlibrary/jdk/testlibrary/StreamPumper.java
View File

@ -34,6 +34,11 @@ import java.util.concurrent.Future;
import java.util.concurrent.FutureTask;
import java.util.concurrent.atomic.AtomicBoolean;
/**
* @deprecated This class is deprecated. Use the one from
* {@code <root>/test/lib/share/classes/jdk/test/lib/process}
*/
@Deprecated
public final class StreamPumper implements Runnable {
private static final int BUF_SIZE = 256;

4
jdk/test/lib/testlibrary/jdk/testlibrary/Utils.java
View File

@ -41,7 +41,11 @@ import java.util.function.Function;
/**
* Common library for various test helper functions.
*
* @deprecated This class is deprecated. Use the one from
* {@code <root>/test/lib/share/classes/jdk/test/lib}
*/
@Deprecated
public final class Utils {
/**