Skip to content

Commit

Permalink
Browse files Browse the repository at this point in the history
8257876: Avoid Reference.isEnqueued in tests 
Reviewed-by: mchung, tschatzl
  • Loading branch information
Kim Barrett committed Dec 10, 2020
1 parent 4a839e9 commit db5da96
Show file tree
Hide file tree
Showing 3 changed files with 65 additions and 81 deletions.
114 changes: 53 additions & 61 deletions test/hotspot/jtreg/vmTestbase/gc/gctests/ReferencesGC/ReferencesGC.java
View file
Expand Up @@ -53,6 +53,8 @@ public class ReferencesGC extends ThreadedGCTest {

static int RANGE = 256;
static float RATIO = (float) 1.0;
static int REMOVE; // Initialized in parseArgs.
static int RETAIN; // Initialized in parseArgs.

public static void main(String[] args) {
parseArgs(args);
Expand All @@ -67,6 +69,8 @@ public static void parseArgs(String[] args) {
RATIO = new Float(args[++i]).floatValue();
}
}
REMOVE = (int) (RANGE * RATIO);
RETAIN = RANGE - REMOVE;
}

private class Worker implements Runnable {
Expand All @@ -76,13 +80,13 @@ private class Worker implements Runnable {
static final int PHANTOM = 2;
private ExecutionController stresser;
int finalizationMaxTime = 1000 * 60 * runParams.getNumberOfThreads();
int[] alive = new int[3];
int[] enqued = new int[3];
ReferenceQueue refq = null; // Reinitialized each time through loop
int[] alive = null; // Reinitialized each time through loop
int[] wrong = null; // Reinitialized each time through loop
CircularLinkedList holder[] = new CircularLinkedList[RANGE];
WeakReference wr[] = new WeakReference[RANGE];
SoftReference sr[] = new SoftReference[RANGE];
PhantomReference phr[] = new PhantomReference[RANGE];
ReferenceQueue refq = new ReferenceQueue();
GarbageProducer gp = GarbageUtils.getArrayProducers().get(0);
int iter = 0;

Expand All @@ -93,11 +97,11 @@ public void run() {
}

while (stresser.continueExecution()) {
int totalQ = 0;
int totalLive = 0;
try {
refq = new ReferenceQueue();
alive = new int[3];
enqued = new int[3];
wrong = new int[3];
for (int j = 0; j < RANGE; j++) {
holder[j] = new CircularLinkedList();
holder[j].addNelements(300);
Expand All @@ -112,21 +116,21 @@ public void run() {
}

for (int i = 0; i < RANGE; i++) {
if (wr[i].isEnqueued()) {
++totalQ;
if (wr[i].refersTo(holder[i])) {
++totalLive;
}
if (sr[i].isEnqueued()) {
++totalQ;
if (sr[i].refersTo(holder[i])) {
++totalLive;
}
if (phr[i].isEnqueued()) {
++totalQ;
if (phr[i].refersTo(holder[i])) {
++totalLive;
}
}
if (totalQ != 0) {
throw new TestFailure("There are " + totalQ + " references in the queue instead 0 before null-assigment.");
if (totalLive != 3 * RANGE) {
throw new TestFailure("There are " + (3 * RANGE - totalLive) + " references cleared before null-assigment.");
}

for (int i = 0; i < (int) (RANGE * RATIO); i++) {
for (int i = 0; i < REMOVE; i++) {
holder[i] = null;
}

Expand All @@ -137,69 +141,57 @@ public void run() {
// At this point OOME was thrown and accordingly to spec
// all weak refs should be processed

alive = new int[3];
enqued = new int[3];
for (int i = 0; i < RANGE; i++) {
if (wr[i].get() != null) {
++alive[WEAK];
}
if (wr[i].isEnqueued()) {
++enqued[WEAK];
}
if (sr[i].get() != null) {
++alive[SOFT];
}
if (sr[i].isEnqueued()) {
++enqued[SOFT];
}
if (phr[i].isEnqueued()) {
++enqued[PHANTOM];
}
}

long waitTime = System.currentTimeMillis() + finalizationMaxTime;
while (totalQ < (RANGE * RATIO * 3 * 0.9) && (System.currentTimeMillis() < waitTime)) {
alive = new int[3];
enqued = new int[3];
int totalQ = 0;
while ((totalQ < (3 * REMOVE)) && (System.currentTimeMillis() < waitTime)) {
alive[WEAK] = alive[SOFT] = alive[PHANTOM] = 0;
wrong[WEAK] = wrong[SOFT] = wrong[PHANTOM] = 0;
for (int i = 0; i < RANGE; i++) {
if (wr[i].get() != null) {
if (!wr[i].refersTo(holder[i])) {
++wrong[WEAK];
} else if (holder[i] != null) {
++alive[WEAK];
}
if (wr[i].isEnqueued()) {
++enqued[WEAK];
}
if (sr[i].get() != null) {

if (!sr[i].refersTo(holder[i])) {
++wrong[SOFT];
} else if (holder[i] != null) {
++alive[SOFT];
}
if (sr[i].isEnqueued()) {
++enqued[SOFT];

if (!phr[i].refersTo(holder[i])) {
++wrong[PHANTOM];
} else if (holder[i] != null) {
++alive[PHANTOM];
}
if (phr[i].isEnqueued()) {
++enqued[PHANTOM];
}

try {
while (refq.remove(100) != null) {
++totalQ;
}
} catch (InterruptedException ie) {
}
totalQ = (enqued[WEAK] + enqued[SOFT] + enqued[PHANTOM]);
if (totalQ < (int) (3 * RANGE * RATIO * 0.9)) {
log.debug("After null-assignment to " + (int) (RANGE * RATIO) +
//" elements from " + lower + " to " + (upper - 1) +
" and provoking gc found:\n\t" +
enqued[WEAK] + " weak\n\t" +
enqued[SOFT] + " soft\n\t" +
enqued[PHANTOM] + " phantom " +
" queuened refs and \n\t" +
alive[WEAK] + " weak\n\t" +
alive[SOFT] + " soft\n\t" +
"alive refs.");
if (totalQ < (3 * REMOVE)) {
log.debug("After null-assignment to " + REMOVE +
" referent values and provoking gc found:\n\t" +
totalQ + " queued refs.");
try {
log.debug("sleeping to give gc one more chance ......");
log.debug("sleeping to give reference processing more time ...");
Thread.sleep(1000);
} catch (InterruptedException ie) {
}
}
}
log.debug("iteration.... " + iter++);
if (totalQ < (int) (3 * RANGE * RATIO * 0.9) || totalQ > (int) (3 * RANGE * RATIO)) {
throw new TestFailure("Test failed");
if (wrong[WEAK] != 0) {
throw new TestFailure("Expected " + RETAIN + " weak references still alive: " + alive[WEAK]);
} else if (wrong[SOFT] != 0) {
throw new TestFailure("Expected " + RETAIN + " soft references still alive: " + alive[SOFT]);
} else if (wrong[PHANTOM] != 0) {
throw new TestFailure("Expected " + RETAIN + " phantom references still alive: " + alive[PHANTOM]);
} else if (totalQ != (3 * REMOVE)) {
throw new TestFailure("Expected " + (3 * REMOVE) + " references enqueued: " + totalQ);
}
}
}
Expand Down
7 changes: 4 additions & 3 deletions test/hotspot/jtreg/vmTestbase/gc/gctests/WeakReferenceGC/WeakReferenceGC.java
View file
Expand Up @@ -201,11 +201,12 @@ private void persistentGC() {
if (GarbageUtils.eatMemory(getExecutionController()) == 0) {
return; // We were unable to provoke OOME before timeout is over
}
numEnqueued = 0; // We set counter to zero to avoid counting references twice
for (int i = 0; i < numLists; i++) {
if (wholder[i].isEnqueued()) {
try {
while ((numEnqueued < numLists) &&
(refQueue.remove(1000) != null)) {
numEnqueued++;
}
} catch (InterruptedException ie) {
}
}
results.addElement((new Statistic(iter, numEnqueued)));
Expand Down
25 changes: 8 additions & 17 deletions test/jdk/java/lang/ref/ReferenceEnqueue.java
View file
@@ -1,5 +1,5 @@
/*
* Copyright (c) 2011, 2017, Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 2011, 2020, 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
Expand Down Expand Up @@ -51,20 +51,17 @@ static class WeakRef {
}

void run() throws InterruptedException {
boolean enqueued = false;
System.gc();
for (int i = 0; i < iterations; i++) {
System.gc();
if (ref.isEnqueued()) {
break;
}

Thread.sleep(100);
enqueued = (queue.remove(100) == ref);
if (enqueued) break;
}

if (ref.isEnqueued() == false) {
if (!enqueued) {
// GC have not enqueued refWeak for the timeout period
System.out.println("Reference not enqueued yet");
return;
throw new RuntimeException("Error: reference not enqueued");
}

if (ref.enqueue() == true) {
Expand All @@ -73,12 +70,6 @@ void run() throws InterruptedException {
throw new RuntimeException("Error: enqueue() returned true;"
+ " expected false");
}

if (queue.poll() == null) {
// poll() should return ref enqueued by the GC
throw new RuntimeException("Error: poll() returned null;"
+ " expected ref object");
}
}
}

Expand All @@ -90,15 +81,15 @@ static class ExplicitEnqueue {
ExplicitEnqueue() {
this.refs.add(new SoftReference<>(new Object(), queue));
this.refs.add(new WeakReference<>(new Object(), queue));
// Can't test PhantomReference because get() always returns null.
this.refs.add(new PhantomReference<>(new Object(), queue));
}

void run() throws InterruptedException {
for (Reference<Object> ref : refs) {
if (ref.enqueue() == false) {
throw new RuntimeException("Error: enqueue failed");
}
if (ref.get() != null) {
if (!ref.refersTo(null)) {
throw new RuntimeException("Error: referent must be cleared");
}
}
Expand Down

1 comment on commit db5da96

@openjdk-notifier
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Review

Issues

Please sign in to comment.