mstover1 2003/08/02 08:30:34
Modified: src/components/org/apache/jmeter/modifiers
CounterConfig.java
src/components/org/apache/jmeter/modifiers/gui
CounterConfigGui.java
src/components/org/apache/jmeter/visualizers GraphModel.java
RunningSample.java
Log:
Fixed Counter config related to use of functions
Fixed accuracy of throughput calculations in visualizers
Revision Changes Path
1.15 +5 -5
jakarta-jmeter/src/components/org/apache/jmeter/modifiers/CounterConfig.java
Index: CounterConfig.java
===================================================================
RCS file:
/home/cvs/jakarta-jmeter/src/components/org/apache/jmeter/modifiers/CounterConfig.java,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- CounterConfig.java 20 May 2003 14:26:33 -0000 1.14
+++ CounterConfig.java 2 Aug 2003 15:30:34 -0000 1.15
@@ -23,11 +23,11 @@
implements Serializable, LoopIterationListener,NoThreadClone
{
private static Logger log = LoggingManager.getLoggerFor(JMeterUtils.ELEMENTS);
- private final static String START = "CounterConfig.start";
- private final static String END = "CounterConfig.end";
- private final static String INCREMENT = "CounterConfig.incr";
- private final static String PER_USER = "CounterConfig.per_user";
- private final static String VAR_NAME = "CounterConfig.name";
+ public final static String START = "CounterConfig.start";
+ public final static String END = "CounterConfig.end";
+ public final static String INCREMENT = "CounterConfig.incr";
+ public final static String PER_USER = "CounterConfig.per_user";
+ public final static String VAR_NAME = "CounterConfig.name";
private boolean perUser = false;
private int globalCounter = -1;
1.7 +3 -3
jakarta-jmeter/src/components/org/apache/jmeter/modifiers/gui/CounterConfigGui.java
Index: CounterConfigGui.java
===================================================================
RCS file:
/home/cvs/jakarta-jmeter/src/components/org/apache/jmeter/modifiers/gui/CounterConfigGui.java,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- CounterConfigGui.java 12 May 2003 15:20:17 -0000 1.6
+++ CounterConfigGui.java 2 Aug 2003 15:30:34 -0000 1.7
@@ -61,9 +61,9 @@
{
super.configure(element);
CounterConfig config = (CounterConfig) element;
- startField.setText(Integer.toString(config.getStart()));
- endField.setText(Integer.toString(config.getEnd()));
- incrField.setText(Integer.toString(config.getIncrement()));
+ startField.setText(config.getPropertyAsString(CounterConfig.START));
+ endField.setText(config.getPropertyAsString(CounterConfig.END));
+ incrField.setText(config.getPropertyAsString(CounterConfig.INCREMENT));
varNameField.setText(config.getVarName());
perUserField.setSelected(config.isPerUser());
}
1.8 +12 -7
jakarta-jmeter/src/components/org/apache/jmeter/visualizers/GraphModel.java
Index: GraphModel.java
===================================================================
RCS file:
/home/cvs/jakarta-jmeter/src/components/org/apache/jmeter/visualizers/GraphModel.java,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- GraphModel.java 20 Jun 2003 14:15:34 -0000 1.7
+++ GraphModel.java 2 Aug 2003 15:30:34 -0000 1.8
@@ -82,7 +82,8 @@
private long previous = 0;
private boolean bigChange = false;
private Sample current = new Sample(0, 0, 0, 0, 0,false);
- private long startTime = 0;
+ private long startTime = Long.MAX_VALUE;
+ private long endTime = Long.MIN_VALUE;
private int throughputMax = 20;
private long graphMax = 20;
private StatCalculator statCalc = new StatCalculator();
@@ -309,16 +310,20 @@
average = (float) statCalc.getMean();
deviation = (long) statCalc.getStandardDeviation();
median = statCalc.getMedian().longValue();
- }
-
- if (samples.size() == 0)
- {
- startTime = timeStamp - sample;
+ long start = timeStamp - sample;
+ if (startTime > start)
+ {
+ startTime = start;
+ }
+ if(endTime < timeStamp)
+ {
+ endTime = timeStamp;
+ }
}
float throughput = 0;
- if (timeStamp - startTime > 0)
+ if (endTime - startTime > 0)
{
throughput = (float) (((float) (samples.size() + 1)) / ((float)
(timeStamp - startTime)) * 60000);
}
1.9 +8 -4
jakarta-jmeter/src/components/org/apache/jmeter/visualizers/RunningSample.java
Index: RunningSample.java
===================================================================
RCS file:
/home/cvs/jakarta-jmeter/src/components/org/apache/jmeter/visualizers/RunningSample.java,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- RunningSample.java 5 Feb 2003 05:12:04 -0000 1.8
+++ RunningSample.java 2 Aug 2003 15:30:34 -0000 1.9
@@ -101,7 +101,7 @@
max = Long.MIN_VALUE;
min = Long.MAX_VALUE;
errorCount = 0L;
- firstTime = 0L;
+ firstTime = Long.MAX_VALUE;
lastTime = 0L;
}
@@ -190,12 +190,16 @@
long aTimeInMillis = res.getTime();
boolean aSuccessFlag = res.isSuccessful();
- lastTime = res.getTimeStamp();
counter++;
- if (firstTime == 0L)
+ long startTime = res.getTimeStamp() - aTimeInMillis;
+ if (firstTime > startTime)
{
// this is our first sample, set the start time to current timestamp
- firstTime = lastTime;
+ firstTime = startTime;
+ }
+ if(lastTime < res.getTimeStamp())
+ {
+ lastTime = res.getTimeStamp();
}
runningSum += aTimeInMillis;
if (aTimeInMillis > max) max = aTimeInMillis;
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
