You are viewing a plain text version of this content. The canonical link for it is here.
Posted to java-dev@axis.apache.org by he...@apache.org on 2005/02/14 13:49:01 UTC
svn commit: r153781 - in webservices/axis/trunk/java/dev/scratch/perf-suite:
axis/AxisTest.java axis2/Axis2Test.java common/Collecter.java
common/LoadTest.java common/TestSuite.java common/Waiter.java
Author: hemapani
Date: Mon Feb 14 04:48:52 2005
New Revision: 153781
URL: http://svn.apache.org/viewcvs?view=rev&rev=153781
Log:
add a waiter
Added:
webservices/axis/trunk/java/dev/scratch/perf-suite/common/Waiter.java
Modified:
webservices/axis/trunk/java/dev/scratch/perf-suite/axis/AxisTest.java
webservices/axis/trunk/java/dev/scratch/perf-suite/axis2/Axis2Test.java
webservices/axis/trunk/java/dev/scratch/perf-suite/common/Collecter.java
webservices/axis/trunk/java/dev/scratch/perf-suite/common/LoadTest.java
webservices/axis/trunk/java/dev/scratch/perf-suite/common/TestSuite.java
Modified: webservices/axis/trunk/java/dev/scratch/perf-suite/axis/AxisTest.java
URL: http://svn.apache.org/viewcvs/webservices/axis/trunk/java/dev/scratch/perf-suite/axis/AxisTest.java?view=diff&r1=153780&r2=153781
==============================================================================
--- webservices/axis/trunk/java/dev/scratch/perf-suite/axis/AxisTest.java (original)
+++ webservices/axis/trunk/java/dev/scratch/perf-suite/axis/AxisTest.java Mon Feb 14 04:48:52 2005
@@ -20,7 +20,7 @@
public class AxisTest {
public static void main(String[] args) throws IOException {
- Writer writer = new FileWriter("results.txt",true);
+ Writer writer = new FileWriter("result/results.txt",true);
PrintWriter pw = new PrintWriter(writer);
StructArraySampler sampler = new StructArraySampler(new URL(Constants.AXIS2_URL));
TestSuite suite = new TestSuite(sampler,pw,"[Client=\"Axis1.2-RC3\" Server=\"Axis2\"] EchoStruct test");
Modified: webservices/axis/trunk/java/dev/scratch/perf-suite/axis2/Axis2Test.java
URL: http://svn.apache.org/viewcvs/webservices/axis/trunk/java/dev/scratch/perf-suite/axis2/Axis2Test.java?view=diff&r1=153780&r2=153781
==============================================================================
--- webservices/axis/trunk/java/dev/scratch/perf-suite/axis2/Axis2Test.java (original)
+++ webservices/axis/trunk/java/dev/scratch/perf-suite/axis2/Axis2Test.java Mon Feb 14 04:48:52 2005
@@ -20,7 +20,7 @@
public class Axis2Test {
public static void main(String[] args) throws IOException {
- Writer writer = new FileWriter("results.txt",true);
+ Writer writer = new FileWriter("result/results.txt",true);
PrintWriter pw = new PrintWriter(writer);
StructArraySampler sampler = new StructArraySampler(new URL(Constants.AXIS2_URL));
TestSuite suite = new TestSuite(sampler,pw,"[Client=\"Axis2\" Server=\"Axis2\"]EchoStruct test");
Modified: webservices/axis/trunk/java/dev/scratch/perf-suite/common/Collecter.java
URL: http://svn.apache.org/viewcvs/webservices/axis/trunk/java/dev/scratch/perf-suite/common/Collecter.java?view=diff&r1=153780&r2=153781
==============================================================================
--- webservices/axis/trunk/java/dev/scratch/perf-suite/common/Collecter.java (original)
+++ webservices/axis/trunk/java/dev/scratch/perf-suite/common/Collecter.java Mon Feb 14 04:48:52 2005
@@ -1,3 +1,4 @@
+import java.io.FileWriter;
import java.io.IOException;
import java.io.Writer;
@@ -8,7 +9,7 @@
* Window>Preferences>Java>Code Generation>Code and Comments
*/
public class Collecter {
- private int waitingCount = 0;
+
private int sucsess = 0;
private static Writer writer = null;
@@ -28,14 +29,8 @@
index++;
}
- public synchronized void waitForMe() {
- waitingCount++;
- }
public synchronized void printResult() throws IOException {
- if (waitingCount > 1) {
- waitingCount--;
- } else {
int failed = 0;
long totel = 0;
@@ -56,7 +51,14 @@
System.out.println(result);
writer.write(result);
writer.flush();
- }
+ String file = "result/"+System.currentTimeMillis()+".txt";
+ Writer w = new FileWriter(file);
+
+ w.write(result+"\n");
+ for (int i = 0; i < results.length; i++) {
+ w.write(results[i]+"\n");
+ }
+ w.close();
}
}
Modified: webservices/axis/trunk/java/dev/scratch/perf-suite/common/LoadTest.java
URL: http://svn.apache.org/viewcvs/webservices/axis/trunk/java/dev/scratch/perf-suite/common/LoadTest.java?view=diff&r1=153780&r2=153781
==============================================================================
--- webservices/axis/trunk/java/dev/scratch/perf-suite/common/LoadTest.java (original)
+++ webservices/axis/trunk/java/dev/scratch/perf-suite/common/LoadTest.java Mon Feb 14 04:48:52 2005
@@ -40,7 +40,7 @@
* @see java.lang.Runnable#run()
*/
public void run() {
- c.waitForMe();
+ Waiter.waitForMe();
try {
for (int i = 0; i < numberOfRequests; i++) {
try {
@@ -62,11 +62,7 @@
}
} finally {
- try {
- c.printResult();
- } catch (Exception e) {
- e.printStackTrace();
- }
+ Waiter.release();
}
System.out.println("Thread " + no + " stop");
Modified: webservices/axis/trunk/java/dev/scratch/perf-suite/common/TestSuite.java
URL: http://svn.apache.org/viewcvs/webservices/axis/trunk/java/dev/scratch/perf-suite/common/TestSuite.java?view=diff&r1=153780&r2=153781
==============================================================================
--- webservices/axis/trunk/java/dev/scratch/perf-suite/common/TestSuite.java (original)
+++ webservices/axis/trunk/java/dev/scratch/perf-suite/common/TestSuite.java Mon Feb 14 04:48:52 2005
@@ -20,37 +20,49 @@
private Sampler sampler;
private PrintWriter writer;
private String message;
-
- public TestSuite(Sampler sampler,PrintWriter writer,String message){
+
+ public TestSuite(Sampler sampler, PrintWriter writer, String message) {
this.sampler = sampler;
this.writer = writer;
this.message = message;
-
+
}
-
- public void runSuite() throws IOException{
- writer.write("Starting the Suite at "+ new SimpleDateFormat("yyyy.MM.dd G 'at' HH:mm:ss z").format(new Date())+"\n");
+
+ public void runSuite() throws IOException {
+ writer.write(
+ "Starting the Suite at "
+ + new SimpleDateFormat("yyyy.MM.dd G 'at' HH:mm:ss z").format(
+ new Date())
+ + "\n");
String includes = System.getProperty("include");
- if(includes == null){
+ if (includes == null) {
endToEndTest();
- loadIncreaseTest();
+ ///loadIncreaseTest();
loadTest();
- }else{
- if("end2end".equals(includes)){
+ } else {
+ System.out.println("Pick the include = " + includes);
+ if ("end2end".equals(includes)) {
endToEndTest();
- }else if("load".equals(includes)){
+ } else if ("load".equals(includes)) {
loadTest();
- }else{
- loadIncreaseTest();
+ } else {
+ //loadIncreaseTest();
}
}
- writer.write("Starting the Suite at "+ new SimpleDateFormat("yyyy.MM.dd G 'at' HH:mm:ss z").format(new Date())+"\n");
+ writer.write(
+ "Starting the Suite at "
+ + new SimpleDateFormat("yyyy.MM.dd G 'at' HH:mm:ss z").format(
+ new Date())
+ + "\n");
}
-
- private void endToEndTest() throws IOException{
+
+ private void endToEndTest() throws IOException {
try {
EndToEndTest end2endtest =
- new EndToEndTest(writer, sampler.createCopy(), message + ",test=\"End to End Test\"");
+ new EndToEndTest(
+ writer,
+ sampler.createCopy(),
+ message + ",test=\"End to End Test\"");
end2endtest.invokeTest();
} catch (Exception e) {
e.printStackTrace();
@@ -58,44 +70,70 @@
e.printStackTrace(writer);
writer.flush();
}
-
+
}
-
- private void loadTest() throws IOException{
- int threads = 500;
- writer.write("Starting Load test with "+threads+"\n");
+
+ private void loadTest() throws IOException {
+ int threads = 100;
+ writer.write("Starting Load test with " + threads + "\n");
try {
-
+
int numberOfRequests = 10;
- Collecter c = new Collecter(threads * numberOfRequests,"test=\"Load increase test\"",writer);
+ Collecter c =
+ new Collecter(
+ threads * numberOfRequests,
+ "test=\"Load increase test\"",
+ writer);
for (int i = 0; i < threads; i++) {
- System.out.println("Thread "+i+ " started");
- Thread thread = new Thread(new LoadTest(i,writer,sampler.createCopy(),message + ",test=\"Load Test\"",c,numberOfRequests));
+ System.out.println("Thread " + i + " started");
+ Thread thread =
+ new Thread(
+ new LoadTest(
+ i,
+ writer,
+ sampler.createCopy(),
+ message + ",test=\"Load Test\"",
+ c,
+ numberOfRequests));
thread.start();
}
writer.flush();
+ while (Waiter.getValue() != 0) {
+ Thread.sleep(3000);
+ }
+ try {
+ c.printResult();
+ } catch (Exception e) {
+ e.printStackTrace();
+ }
+
} catch (Exception e) {
e.printStackTrace();
writer.write("Load test Failed\n");
e.printStackTrace(writer);
}
- writer.write("End Load test\n");
- writer.flush();
- }
-
- private void loadIncreaseTest() throws IOException{
- writer.write("Starting loadIncreaseTest\n");
- try {
- LoadIncreaseTest end2endtest =
- new LoadIncreaseTest(writer, sampler.createCopy(), message + "test=\"Load increase test\"");
- end2endtest.invokeTest();
- } catch (Exception e) {
- e.printStackTrace();
- writer.write("loadIncreaseTest Failed\n");
- e.printStackTrace(writer);
- writer.flush();
- }
- writer.write("End loadIncreaseTest\n");
+
+
+ writer.write("End Load test\n");
+ writer.flush();
+}
+
+private void loadIncreaseTest() throws IOException {
+ writer.write("Starting loadIncreaseTest\n");
+ try {
+ LoadIncreaseTest end2endtest =
+ new LoadIncreaseTest(
+ writer,
+ sampler.createCopy(),
+ message + "test=\"Load increase test\"");
+ end2endtest.invokeTest();
+ } catch (Exception e) {
+ e.printStackTrace();
+ writer.write("loadIncreaseTest Failed\n");
+ e.printStackTrace(writer);
writer.flush();
}
+ writer.write("End loadIncreaseTest\n");
+ writer.flush();
+}
}
Added: webservices/axis/trunk/java/dev/scratch/perf-suite/common/Waiter.java
URL: http://svn.apache.org/viewcvs/webservices/axis/trunk/java/dev/scratch/perf-suite/common/Waiter.java?view=auto&rev=153781
==============================================================================
--- webservices/axis/trunk/java/dev/scratch/perf-suite/common/Waiter.java (added)
+++ webservices/axis/trunk/java/dev/scratch/perf-suite/common/Waiter.java Mon Feb 14 04:48:52 2005
@@ -0,0 +1,31 @@
+import java.io.IOException;
+
+/*
+ * Created on Feb 14, 2005
+ *
+ * To change the template for this generated file go to
+ * Window>Preferences>Java>Code Generation>Code and Comments
+ */
+
+/**
+ * @author hemapani
+ *
+ * To change the template for this generated type comment go to
+ * Window>Preferences>Java>Code Generation>Code and Comments
+ */
+public class Waiter {
+
+ private static int waitingCount = 0;
+
+ public static synchronized void waitForMe() {
+ waitingCount++;
+
+ }
+ public static synchronized void release(){
+ waitingCount--;
+ }
+
+ public static synchronized int getValue() {
+ return waitingCount;
+ }
+}