infernap12/jdk
1
0
Fork 0
mirror of https://github.com/openjdk/jdk.git synced 2026-02-23 16:55:09 +00:00
Code Issues Packages Projects Releases Wiki Activity

8180386: remove jdk.testlibrary.TimeLimitedRunner

Browse Source 
Reviewed-by: rriggs, mchung
This commit is contained in:
Igor Ignatyev 2017-06-07 08:58:19 -07:00
parent fe00fb8af6
commit 2efb1f9e9f
6 changed files with 6 additions and 92 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
jdk/test/TEST.ROOT
View File

@ -10,7 +10,7 @@
# randomness tests.
#
# A "headful" test requires a graphical environment to meaningfully
# run. Tests that are not headful are "headless."
# run. Tests that are not headful are "headless."
keys=2d dnd i18n intermittent randomness headful

2
jdk/test/java/lang/invoke/LFCaching/LFMultiThreadCachingTest.java
View File

@ -27,7 +27,7 @@
* @key randomness
* @summary Test verifies that lambda forms are cached when run with multiple threads
* @author kshefov
* @library /lib/testlibrary /java/lang/invoke/common
* @library /lib/testlibrary /java/lang/invoke/common /test/lib
* @modules java.base/java.lang.invoke:open
* java.base/java.lang.ref:open
* java.management

2
jdk/test/java/lang/invoke/LFCaching/LFSingleThreadCachingTest.java
View File

@ -27,7 +27,7 @@
* @key randomness
* @summary Test verifies that lambda forms are cached when run with single thread
* @author kshefov
* @library /lib/testlibrary /java/lang/invoke/common
* @library /lib/testlibrary /java/lang/invoke/common /test/lib
* @modules java.base/java.lang.ref:open
* java.base/java.lang.invoke:open
* java.management

2
jdk/test/java/lang/invoke/LFCaching/LambdaFormTestCase.java
View File

@ -21,7 +21,7 @@
* questions.
*/
import jdk.testlibrary.TimeLimitedRunner;
import jdk.test.lib.TimeLimitedRunner;
import jdk.testlibrary.Utils;
import test.java.lang.invoke.lib.CodeCacheOverflowProcessor;
import test.java.lang.invoke.lib.Helper;

4
jdk/test/java/lang/invoke/MethodHandles/CatchExceptionTest.java
View File

@ -23,8 +23,8 @@
package test.java.lang.invoke.MethodHandles;
import jdk.test.lib.TimeLimitedRunner;
import jdk.testlibrary.Asserts;
import jdk.testlibrary.TimeLimitedRunner;
import jdk.testlibrary.Utils;
import test.java.lang.invoke.lib.CodeCacheOverflowProcessor;
import test.java.lang.invoke.lib.Helper;
@ -43,7 +43,7 @@ import java.util.function.Function;
import java.util.function.Supplier;
/* @test
* @library /lib/testlibrary /java/lang/invoke/common
* @library /lib/testlibrary /java/lang/invoke/common /test/lib
* @compile CatchExceptionTest.java
* @run main/othervm -esa test.java.lang.invoke.MethodHandles.CatchExceptionTest
* @key intermittent randomness

86
jdk/test/lib/testlibrary/jdk/testlibrary/TimeLimitedRunner.java
View File

@ -1,86 +0,0 @@
/*
* Copyright (c) 2014, 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
* under the terms of the GNU General Public License version 2 only, as
* published by the Free Software Foundation.
*
* This code is distributed in the hope that it will be useful, but WITHOUT
* ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
* FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
* version 2 for more details (a copy is included in the LICENSE file that
* accompanied this code).
*
* You should have received a copy of the GNU General Public License version
* 2 along with this work; if not, write to the Free Software Foundation,
* Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
*
* Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
* or visit www.oracle.com if you need additional information or have any
* questions.
*/
package jdk.testlibrary;
import java.util.Objects;
import java.util.concurrent.Callable;
/**
* Auxiliary class to run target w/ given timeout.
*/
public class TimeLimitedRunner implements Callable<Void> {
private final long stoptime;
private final long timeout;
private final double factor;
private final Callable<Boolean> target;
/**
* @param timeout a timeout. zero means no time limitation
* @param factor a multiplier used to estimate next iteration time
* @param target a target to run
* @throws NullPointerException if target is null
* @throws IllegalArgumentException if timeout is negative or
factor isn't positive
*/
public TimeLimitedRunner(long timeout, double factor,
Callable<Boolean> target) {
Objects.requireNonNull(target, "target must not be null");
if (timeout < 0) {
throw new IllegalArgumentException("timeout[" + timeout + "] < 0");
}
if (factor <= 0d) {
throw new IllegalArgumentException("factor[" + factor + "] <= 0");
}
this.stoptime = System.currentTimeMillis() + timeout;
this.timeout = timeout;
this.factor = factor;
this.target = target;
}
/**
* Runs @{linkplan target} while it returns true and timeout isn't exceeded
*/
@Override
public Void call() throws Exception {
long maxDuration = 0L;
long iterStart = System.currentTimeMillis();
if (timeout != 0 && iterStart > stoptime) {
return null;
}
while (target.call()) {
if (timeout != 0) {
long iterDuration = System.currentTimeMillis() - iterStart;
maxDuration = Math.max(maxDuration, iterDuration);
iterStart = System.currentTimeMillis();
if (iterStart + (maxDuration * factor) > stoptime) {
System.out.println("Not enough time to continue execution. "
+ "Interrupted.");
break;
}
}
}
return null;
}
}