You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@jmeter.apache.org by fs...@apache.org on 2019/08/24 20:35:02 UTC

[jmeter] branch master updated (1a38d99 -> 78204da)

This is an automated email from the ASF dual-hosted git repository.

fschumacher pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/jmeter.git.


    from 1a38d99  Remove Threadlocal XML_READER on thread exit
     new 65a8a17  Remove Threadlocal perThreadRandom on thread exit
     new 78204da  Remove Threadlocal perThreadNumber and ...LastIterationNumber on thread exit

The 2 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails.  The revisions
listed as "add" were already present in the repository and have only
been added to this reference.


Summary of changes:
 .../org/apache/jmeter/config/RandomVariableConfig.java   | 15 +++++++++++++--
 .../java/org/apache/jmeter/modifiers/CounterConfig.java  | 16 ++++++++++++++--
 2 files changed, 27 insertions(+), 4 deletions(-)


[jmeter] 01/02: Remove Threadlocal perThreadRandom on thread exit

Posted by fs...@apache.org.
This is an automated email from the ASF dual-hosted git repository.

fschumacher pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/jmeter.git

commit 65a8a17ec463d62ac88bf8bc0875be249d04298b
Author: Felix Schumacher <fe...@internetallee.de>
AuthorDate: Sat Aug 24 22:31:26 2019 +0200

    Remove Threadlocal perThreadRandom on thread exit
---
 .../org/apache/jmeter/config/RandomVariableConfig.java    | 15 +++++++++++++--
 1 file changed, 13 insertions(+), 2 deletions(-)

diff --git a/src/components/src/main/java/org/apache/jmeter/config/RandomVariableConfig.java b/src/components/src/main/java/org/apache/jmeter/config/RandomVariableConfig.java
index 922d8ad..c01d9a1 100644
--- a/src/components/src/main/java/org/apache/jmeter/config/RandomVariableConfig.java
+++ b/src/components/src/main/java/org/apache/jmeter/config/RandomVariableConfig.java
@@ -27,17 +27,18 @@ import org.apache.jmeter.engine.event.LoopIterationListener;
 import org.apache.jmeter.engine.util.NoConfigMerge;
 import org.apache.jmeter.engine.util.NoThreadClone;
 import org.apache.jmeter.testbeans.TestBean;
+import org.apache.jmeter.testelement.ThreadListener;
 import org.apache.jmeter.threads.JMeterContextService;
 import org.apache.jmeter.threads.JMeterVariables;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
 public class RandomVariableConfig extends ConfigTestElement
-    implements TestBean, LoopIterationListener, NoThreadClone, NoConfigMerge
+    implements TestBean, LoopIterationListener, NoThreadClone, NoConfigMerge, ThreadListener
 {
     private static final Logger log = LoggerFactory.getLogger(RandomVariableConfig.class);
 
-    private static final long serialVersionUID = 234L;
+    private static final long serialVersionUID = 235L;
 
     /*
      *  N.B. this class is shared between threads (NoThreadClone) so all access to variables
@@ -246,4 +247,14 @@ public class RandomVariableConfig extends ConfigTestElement
         this.outputFormat = outputFormat;
     }
 
+    @Override
+    public void threadStarted() {
+        // nothing to do on thread start
+    }
+
+    @Override
+    public void threadFinished() {
+        perThreadRandom.remove();
+    }
+
 }


[jmeter] 02/02: Remove Threadlocal perThreadNumber and ...LastIterationNumber on thread exit

Posted by fs...@apache.org.
This is an automated email from the ASF dual-hosted git repository.

fschumacher pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/jmeter.git

commit 78204da4aeef783b1ec013b6e5bd0e337d6f5c53
Author: Felix Schumacher <fe...@internetallee.de>
AuthorDate: Sat Aug 24 22:34:31 2019 +0200

    Remove Threadlocal perThreadNumber and ...LastIterationNumber on thread exit
---
 .../java/org/apache/jmeter/modifiers/CounterConfig.java  | 16 ++++++++++++++--
 1 file changed, 14 insertions(+), 2 deletions(-)

diff --git a/src/components/src/main/java/org/apache/jmeter/modifiers/CounterConfig.java b/src/components/src/main/java/org/apache/jmeter/modifiers/CounterConfig.java
index fb6d11b..2420525 100644
--- a/src/components/src/main/java/org/apache/jmeter/modifiers/CounterConfig.java
+++ b/src/components/src/main/java/org/apache/jmeter/modifiers/CounterConfig.java
@@ -25,6 +25,7 @@ import org.apache.jmeter.engine.event.LoopIterationEvent;
 import org.apache.jmeter.engine.event.LoopIterationListener;
 import org.apache.jmeter.engine.util.NoThreadClone;
 import org.apache.jmeter.testelement.AbstractTestElement;
+import org.apache.jmeter.testelement.ThreadListener;
 import org.apache.jmeter.testelement.property.BooleanProperty;
 import org.apache.jmeter.testelement.property.LongProperty;
 import org.apache.jmeter.threads.JMeterContextService;
@@ -36,9 +37,9 @@ import org.slf4j.LoggerFactory;
  * Provides a counter per-thread(user) or per-thread group.
  */
 public class CounterConfig extends AbstractTestElement
-    implements Serializable, LoopIterationListener, NoThreadClone {
+    implements Serializable, LoopIterationListener, NoThreadClone, ThreadListener {
 
-    private static final long serialVersionUID = 234L;
+    private static final long serialVersionUID = 235L;
 
     private static final String START = "CounterConfig.start"; // $NON-NLS-1$
 
@@ -227,4 +228,15 @@ public class CounterConfig extends AbstractTestElement
     public String getFormat() {
         return getPropertyAsString(FORMAT);
     }
+
+    @Override
+    public void threadStarted() {
+        // nothing to do on thread start
+    }
+
+    @Override
+    public void threadFinished() {
+        perTheadLastIterationNumber.remove();
+        perTheadNumber.remove();
+    }
 }