You are viewing a plain text version of this content. The canonical link for it is here.
Posted to jmeter-dev@jakarta.apache.org by ms...@apache.org on 2003/05/02 22:58:11 UTC
cvs commit: jakarta-jmeter/src/core/org/apache/jmeter/gui/util JMeterMenuBar.java
mstover1 2003/05/02 13:58:11
Modified: bin jmeter.properties
src/core/org/apache/jmeter/engine ClientJMeterEngine.java
RemoteJMeterEngineImpl.java
src/core/org/apache/jmeter/gui/util JMeterMenuBar.java
Log:
Putting remote start in asynchronous mode so gui doesn't get locked up
Revision Changes Path
1.71 +1 -1 jakarta-jmeter/bin/jmeter.properties
Index: jmeter.properties
===================================================================
RCS file: /home/cvs/jakarta-jmeter/bin/jmeter.properties,v
retrieving revision 1.70
retrieving revision 1.71
diff -u -r1.70 -r1.71
--- jmeter.properties 1 May 2003 15:56:06 -0000 1.70
+++ jmeter.properties 2 May 2003 20:58:10 -0000 1.71
@@ -96,7 +96,7 @@
# The commented out values are the defaults.
# legitimate values: xml, csv, db. Only xml and csv are currently supported.
-jmeter.save.saveservice.output_format=xml
+jmeter.save.saveservice.output_format=csv
# true when field should be saved; false otherwise
1.7 +32 -17 jakarta-jmeter/src/core/org/apache/jmeter/engine/ClientJMeterEngine.java
Index: ClientJMeterEngine.java
===================================================================
RCS file: /home/cvs/jakarta-jmeter/src/core/org/apache/jmeter/engine/ClientJMeterEngine.java,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- ClientJMeterEngine.java 5 Feb 2003 05:12:06 -0000 1.6
+++ ClientJMeterEngine.java 2 May 2003 20:58:10 -0000 1.7
@@ -72,7 +72,7 @@
*@created $Date$
*@version $Revision$
***********************************************************/
-public class ClientJMeterEngine implements JMeterEngine
+public class ClientJMeterEngine implements JMeterEngine,Runnable
{
transient private static Logger log = Hierarchy.getDefaultHierarchy().getLoggerFor(
"jmeter.engine");
@@ -127,20 +127,9 @@
***********************************************************/
public void runTest()
{
- testListeners = new SearchByClass(TestListener.class);
- getTestTree().traverse(testListeners);
- sampleListeners = new ConvertListeners();
- getTestTree().traverse(sampleListeners);
- try
- {
- remote.setHost(host);
- remote.configure(test);
- remote.runTest();
- }
- catch(Exception ex)
- {
- log.error("",ex);
- }
+ log.warn("about to run remote test");
+ new Thread(this).start();
+ log.warn("done initiating run command");
}
/************************************************************
@@ -172,5 +161,31 @@
log.error("",ex);
}
}
+
+ /* (non-Javadoc)
+ * @see java.lang.Runnable#run()
+ */
+ public void run()
+ {
+ log.warn("running clientengine run method");
+ testListeners = new SearchByClass(TestListener.class);
+ getTestTree().traverse(testListeners);
+ sampleListeners = new ConvertListeners();
+ getTestTree().traverse(sampleListeners);
+ try
+ {
+ remote.setHost(host);
+ log.warn("sent host info");
+ remote.configure(test);
+ log.warn("sent test");
+ remote.runTest();
+ log.warn("sent run command");
+ }
+ catch(Exception ex)
+ {
+ log.error("",ex);
+ }
+
+ }
}
1.8 +3 -0 jakarta-jmeter/src/core/org/apache/jmeter/engine/RemoteJMeterEngineImpl.java
Index: RemoteJMeterEngineImpl.java
===================================================================
RCS file: /home/cvs/jakarta-jmeter/src/core/org/apache/jmeter/engine/RemoteJMeterEngineImpl.java,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- RemoteJMeterEngineImpl.java 5 Feb 2003 05:12:06 -0000 1.7
+++ RemoteJMeterEngineImpl.java 2 May 2003 20:58:10 -0000 1.8
@@ -96,6 +96,7 @@
public void setHost(String host)
{
+ log.warn("received host");
backingEngine.setHost(host);
}
@@ -109,6 +110,7 @@
***********************************************************/
public void configure(HashTree testTree) throws RemoteException
{
+ log.warn("received test tree");
backingEngine.configure(testTree);
}
@@ -119,6 +121,7 @@
***********************************************************/
public void runTest() throws RemoteException,JMeterEngineException
{
+ log.warn("running test");
backingEngine.runTest();
}
1.12 +2 -1 jakarta-jmeter/src/core/org/apache/jmeter/gui/util/JMeterMenuBar.java
Index: JMeterMenuBar.java
===================================================================
RCS file: /home/cvs/jakarta-jmeter/src/core/org/apache/jmeter/gui/util/JMeterMenuBar.java,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- JMeterMenuBar.java 25 Apr 2003 20:50:56 -0000 1.11
+++ JMeterMenuBar.java 2 May 2003 20:58:10 -0000 1.12
@@ -383,6 +383,7 @@
runMenu.add(remote_start);
}
remote_start_all = new JMenuItem(JMeterUtils.getResString("remote_start_all"), 'Z');
+ remote_start_all.setName("remote_start_all");
remote_start_all.setAccelerator(
KeyStroke.getKeyStroke(KeyEvent.VK_Z, KeyEvent.CTRL_MASK));
remote_start_all.addActionListener(ActionRouter.getInstance());
---------------------------------------------------------------------
To unsubscribe, e-mail: jmeter-dev-unsubscribe@jakarta.apache.org
For additional commands, e-mail: jmeter-dev-help@jakarta.apache.org