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/07/28 02:54:30 UTC
cvs commit: jakarta-jmeter/src/core/org/apache/jmeter/engine/util CompoundVariable.java FunctionParser.java
mstover1 2003/07/27 17:54:30
Modified: bin jmeter.properties
src/core/org/apache/jmeter/engine StandardJMeterEngine.java
src/core/org/apache/jmeter/engine/util CompoundVariable.java
FunctionParser.java
Log:
Fixing problem with thread names
Revision Changes Path
1.86 +1 -1 jakarta-jmeter/bin/jmeter.properties
Index: jmeter.properties
===================================================================
RCS file: /home/cvs/jakarta-jmeter/bin/jmeter.properties,v
retrieving revision 1.85
retrieving revision 1.86
diff -u -r1.85 -r1.86
--- jmeter.properties 23 Jul 2003 00:54:22 -0000 1.85
+++ jmeter.properties 28 Jul 2003 00:54:30 -0000 1.86
@@ -106,7 +106,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=csv
+jmeter.save.saveservice.output_format=xml
# true when field should be saved; false otherwise
1.28 +5 -4 jakarta-jmeter/src/core/org/apache/jmeter/engine/StandardJMeterEngine.java
Index: StandardJMeterEngine.java
===================================================================
RCS file: /home/cvs/jakarta-jmeter/src/core/org/apache/jmeter/engine/StandardJMeterEngine.java,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -r1.27 -r1.28
--- StandardJMeterEngine.java 25 Jun 2003 21:18:04 -0000 1.27
+++ StandardJMeterEngine.java 28 Jul 2003 00:54:30 -0000 1.28
@@ -289,6 +289,7 @@
notifier = new ListenerNotifier();
schcdule_run = true;
JMeterContextService.getContext().setSamplingStarted(true);
+ int groupCount = 1;
while (iter.hasNext())
{
ThreadGroup group = (ThreadGroup) iter.next();
@@ -310,12 +311,12 @@
(int) (((float) (group.getRampUp() * 1000)
/ (float) group.getNumThreads())
* (float) i));
- threads[i].setThreadName(group.getName() + "-" + (i + 1));
+ threads[i].setThreadName(group.getName() + (groupCount++) + "-" + (i + 1));
scheduleThread(threads[i], group);
Thread newThread = new Thread(threads[i]);
- newThread.setName(group.getName() + "-" + (i + 1));
+ newThread.setName(threads[i].getThreadName());
allThreads.put(threads[i], newThread);
if (serialized
&& !iter.hasNext()
1.18 +1 -2 jakarta-jmeter/src/core/org/apache/jmeter/engine/util/CompoundVariable.java
Index: CompoundVariable.java
===================================================================
RCS file: /home/cvs/jakarta-jmeter/src/core/org/apache/jmeter/engine/util/CompoundVariable.java,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- CompoundVariable.java 27 Jul 2003 20:59:57 -0000 1.17
+++ CompoundVariable.java 28 Jul 2003 00:54:30 -0000 1.18
@@ -188,7 +188,6 @@
while (iter.hasNext())
{
Object item = iter.next();
- log.debug("executing object: " + item);
if (item instanceof Function)
{
testDynamic = true;
1.2 +0 -5 jakarta-jmeter/src/core/org/apache/jmeter/engine/util/FunctionParser.java
Index: FunctionParser.java
===================================================================
RCS file: /home/cvs/jakarta-jmeter/src/core/org/apache/jmeter/engine/util/FunctionParser.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- FunctionParser.java 27 Jul 2003 20:59:57 -0000 1.1
+++ FunctionParser.java 28 Jul 2003 00:54:30 -0000 1.2
@@ -33,7 +33,6 @@
*/
LinkedList compileString(String value) throws InvalidVariableException
{
- log.debug("parsing string: " + value);
StringReader reader = new StringReader(value);
LinkedList result = new LinkedList();
StringBuffer buffer = new StringBuffer();
@@ -121,7 +120,6 @@
}
else if(current[0] == '(' && previous != ' ')
{
- log.debug("making function from: " + buffer.toString());
function = CompoundVariable.getNamedFunction(buffer.toString());
buffer.setLength(0);
if(function instanceof Function)
@@ -191,7 +189,6 @@
}
else if(current[0] == ',' && functionRecursion == 0)
{
- log.debug("Making new compoundvariable with a param of " + buffer.toString());
CompoundVariable param = new CompoundVariable();
param.setParameters(buffer.toString());
buffer.setLength(0);
@@ -199,12 +196,10 @@
}
else if(current[0] == ')' && functionRecursion == 0 && parenRecursion == 0)
{
- log.debug("Making new compoundvariable with a param of " + buffer.toString());
CompoundVariable param = new CompoundVariable();
param.setParameters(buffer.toString());
buffer.setLength(0);
result.add(param);
- log.debug("parsed params = " + result);
return result;
}
else if(current[0] == '{' && previous == '$')
---------------------------------------------------------------------
To unsubscribe, e-mail: jmeter-dev-unsubscribe@jakarta.apache.org
For additional commands, e-mail: jmeter-dev-help@jakarta.apache.org