Skip to content

D
dragonwell8_jdk

openanolis / dragonwell8_jdk

通知 4
Star 2
Fork 0
D
dragonwell8_jdk
提交 fcfa0249 编写于 作者: T tyan
浏览文件
操作

7190106: java/rmi/reliability/benchmark fails intermittently because of use of fixed port 

Reviewed-by: smarks, mduigou
上级 fbff9c3e
展开全部 显示空白变更内容
内联 并排
Showing with 361 addition and 344 deletion
test/ProblemList.txt
浏览文件 @ fcfa0249
......@@ -205,9 +205,6 @@ java/nio/file/WatchService/LotsOfEvents.java solaris-all
# 7146541
java/rmi/transport/rapidExportUnexport/RapidExportUnexport.java linux-all
# 7190106
java/rmi/reliability/benchmark/runRmiBench.sh generic-all
# 7191877
java/rmi/transport/checkLeaseInfoLeak/CheckLeaseLeak.java generic-all
......
test/java/rmi/reliability/benchmark/bench/serial/Main.java
浏览文件 @ fcfa0249
/*
* Copyright (c) 1999, 2008, Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 1999, 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
......@@ -22,7 +22,29 @@
*/
/*
*
* @test
* @summary The Serialization benchmark test. This java class is used to run the
* test under JTREG.
* @library ../../
* @build bench.BenchInfo bench.HtmlReporter bench.Util bench.Benchmark
* @build bench.Reporter bench.XmlReporter bench.ConfigFormatException
* @build bench.Harness bench.TextReporter
* @build bench.serial.BooleanArrays bench.serial.Booleans
* @build bench.serial.ByteArrays bench.serial.Bytes bench.serial.CharArrays
* @build bench.serial.Chars bench.serial.ClassDesc bench.serial.Cons
* @build bench.serial.CustomDefaultObjTrees bench.serial.CustomObjTrees
* @build bench.serial.DoubleArrays bench.serial.Doubles
* @build bench.serial.ExternObjTrees bench.serial.FloatArrays
* @build bench.serial.Floats bench.serial.GetPutFieldTrees
* @build bench.serial.IntArrays bench.serial.Ints bench.serial.LongArrays
* @build bench.serial.Longs bench.serial.Main bench.serial.ObjArrays
* @build bench.serial.ObjTrees bench.serial.ProxyArrays
* @build bench.serial.ProxyClassDesc bench.serial.RepeatObjs
* @build bench.serial.ReplaceTrees bench.serial.ShortArrays
* @build bench.serial.Shorts bench.serial.SmallObjTrees
* @build bench.serial.StreamBuffer bench.serial.Strings
* @run main/othervm/timeout=1800 bench.serial.Main -c jtreg-config
* @author Mike Warres, Nigel Daley
*/
package bench.serial;
......@@ -33,7 +55,9 @@ import bench.HtmlReporter;
import bench.Reporter;
import bench.TextReporter;
import bench.XmlReporter;
import java.io.File;
import java.io.FileInputStream;
import java.io.FileNotFoundException;
import java.io.FileOutputStream;
import java.io.InputStream;
import java.io.IOException;
......@@ -47,8 +71,9 @@ import java.util.TimerTask;
*/
public class Main {
static final String CONFFILE = "/bench/serial/config";
static final String CONFFILE = "config";
static final String VERSION = "1.3";
static final String TEST_SRC_PATH = System.getProperty("test.src") + File.separator;
static final int TEXT = 0;
static final int HTML = 1;
......@@ -84,15 +109,18 @@ public class Main {
}
/**
* Print error message and exit.
* Throw RuntimeException that wrap message.
*
* @param mesg a message will be wrapped in the RuntimeException.
*/
static void die(String mesg) {
System.err.println(mesg);
System.exit(1);
throw new RuntimeException(mesg);
}
/**
* Mainline parses command line, then hands off to benchmark harness.
*
* @param args
*/
public static void main(String[] args) {
parseArgs(args);
......@@ -104,15 +132,11 @@ public class Main {
setupReporter();
if (exitOnTimer) {
setupTimer(testDurationSeconds);
while (true) {
do {
runBenchmarks();
if (exitRequested) {
System.exit(0);
}
}
} while (!exitRequested);
} else {
runBenchmarks();
System.exit(0);
}
}
}
......@@ -122,50 +146,59 @@ public class Main {
*/
static void parseArgs(String[] args) {
for (int i = 0; i < args.length; i++) {
if (args[i].equals("-h")) {
switch (args[i]) {
case "-h":
usage();
System.exit(0);
} else if (args[i].equals("-v")) {
break;
case "-v":
verbose = true;
} else if (args[i].equals("-l")) {
break;
case "-l":
list = true;
} else if (args[i].equals("-t")) {
break;
case "-t":
if (++i >= args.length)
die("Error: no timeout value specified");
try {
exitOnTimer = true;
testDurationSeconds = Integer.parseInt(args[i]) * 3600;
} catch (Exception e) {
} catch (NumberFormatException e) {
die("Error: unable to determine timeout value");
}
} else if (args[i].equals("-o")) {
break;
case "-o":
if (++i >= args.length)
die("Error: no output file specified");
try {
repstr = new FileOutputStream(args[i]);
} catch (IOException e) {
} catch (FileNotFoundException e) {
die("Error: unable to open \"" + args[i] + "\"");
}
} else if (args[i].equals("-c")) {
break;
case "-c":
if (++i >= args.length)
die("Error: no config file specified");
String confFileName = TEST_SRC_PATH + args[i];
try {
confstr = new FileInputStream(args[i]);
} catch (IOException e) {
die("Error: unable to open \"" + args[i] + "\"");
confstr = new FileInputStream(confFileName);
} catch (FileNotFoundException e) {
die("Error: unable to open \"" + confFileName + "\"");
}
} else if (args[i].equals("-html")) {
break;
case "-html":
if (format != TEXT)
die("Error: conflicting formats");
format = HTML;
} else if (args[i].equals("-xml")) {
break;
case "-xml":
if (format != TEXT)
die("Error: conflicting formats");
format = XML;
} else {
System.err.println("Illegal option: \"" + args[i] + "\"");
break;
default:
usage();
System.exit(1);
die("Illegal option: \"" + args[i] + "\"");
}
}
}
......@@ -177,7 +210,7 @@ public class Main {
if (repstr == null)
repstr = System.out;
if (confstr == null)
confstr = (new Main()).getClass().getResourceAsStream(CONFFILE);
confstr = Main.class.getResourceAsStream(TEST_SRC_PATH + CONFFILE);
if (confstr == null)
die("Error: unable to find default config file");
}
......@@ -206,6 +239,7 @@ public class Main {
timer = new Timer(true);
timer.schedule(
new TimerTask() {
@Override
public void run() {
exitRequested = true;
}
......
test/java/rmi/reliability/benchmark/runRmiBench.sh 已删除 100644 → 0
浏览文件 @ fbff9c3e
#
# Copyright (c) 2005, 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.
#
# @test
#
# @summary The RMI benchmark test. This script is only
# used to run the test under JTREG.
#
# @build bench.BenchInfo bench.HtmlReporter bench.Util bench.Benchmark
# bench.Reporter bench.XmlReporter bench.ConfigFormatException
# bench.Harness bench.TextReporter bench.rmi.BenchServer
# bench.rmi.DoubleArrayCalls bench.rmi.LongCalls bench.rmi.ShortCalls
# bench.rmi.BenchServerImpl bench.rmi.DoubleCalls
# bench.rmi.Main bench.rmi.SmallObjTreeCalls
# bench.rmi.BooleanArrayCalls bench.rmi.ExceptionCalls
# bench.rmi.NullCalls bench.rmi.BooleanCalls bench.rmi.ExportObjs
# bench.rmi.ObjArrayCalls bench.rmi.ByteArrayCalls
# bench.rmi.FloatArrayCalls bench.rmi.ObjTreeCalls
# bench.rmi.ByteCalls bench.rmi.FloatCalls bench.rmi.ProxyArrayCalls
# bench.rmi.CharArrayCalls bench.rmi.IntArrayCalls
# bench.rmi.RemoteObjArrayCalls bench.rmi.CharCalls bench.rmi.IntCalls
# bench.rmi.ClassLoading bench.rmi.LongArrayCalls
# bench.rmi.ShortArrayCalls bench.rmi.altroot.Node
#
# @run shell/timeout=1800 runRmiBench.sh
#
# @author Mike Warres, Nigel Daley
echo "Starting RMI benchmark server "
$TESTJAVA/bin/java \
-server \
-cp $TESTCLASSES \
-Djava.security.policy=$TESTSRC/bench/rmi/policy.all \
bench.rmi.Main \
-server 2007 \
-c $TESTSRC/bench/rmi/config &
sleep 10
echo "Starting RMI benchmark client "
$TESTJAVA/bin/java \
-client \
-cp $TESTCLASSES \
-Djava.security.policy=$TESTSRC/bench/rmi/policy.all \
bench.rmi.Main \
-client localhost:2007 \
-c $TESTSRC/bench/rmi/config
test/java/rmi/reliability/benchmark/runSerialBench.sh 已删除 100644 → 0
浏览文件 @ fbff9c3e
#
# Copyright (c) 2005, 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.
#
# @test
#
# @summary The Serialization benchmark test. This script is only
# used to run the test under JTREG.
#
# @build bench.BenchInfo bench.HtmlReporter bench.Util bench.Benchmark
# @build bench.Reporter bench.XmlReporter bench.ConfigFormatException
# @build bench.Harness bench.TextReporter
# @build bench.serial.BooleanArrays bench.serial.Booleans
# @build bench.serial.ByteArrays bench.serial.Bytes bench.serial.CharArrays
# @build bench.serial.Chars bench.serial.ClassDesc bench.serial.Cons
# @build bench.serial.CustomDefaultObjTrees bench.serial.CustomObjTrees
# @build bench.serial.DoubleArrays bench.serial.Doubles
# @build bench.serial.ExternObjTrees bench.serial.FloatArrays
# @build bench.serial.Floats bench.serial.GetPutFieldTrees
# @build bench.serial.IntArrays bench.serial.Ints bench.serial.LongArrays
# @build bench.serial.Longs bench.serial.Main bench.serial.ObjArrays
# @build bench.serial.ObjTrees bench.serial.ProxyArrays
# @build bench.serial.ProxyClassDesc bench.serial.RepeatObjs
# @build bench.serial.ReplaceTrees bench.serial.ShortArrays
# @build bench.serial.Shorts bench.serial.SmallObjTrees
# @build bench.serial.StreamBuffer bench.serial.Strings
#
# @run shell/timeout=1800 runSerialBench.sh
#
# @author Mike Warres, Nigel Daley
echo "Starting serialization benchmark "
$TESTJAVA/bin/java \
${TESTVMOPTS} \
-cp $TESTCLASSES \
bench.serial.Main \
-c $TESTSRC/bench/serial/jtreg-config &
Markdown is supported
0% 或 .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑！
想要评论请 注册 或