Attachment 36102 Details for Bug 62637 – Use endTime of JMeterThread for SyncTimer

[patch] Use endTime of JMeterThread for SyncTimer

0001-Use-endTime-of-JMeterThread-for-SyncTimer.patch (text/plain), 5.50 KB, created by Felix Schumacher on 2018-08-20 15:35:45 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Felix Schumacher

Created: 2018-08-20 15:35:45 UTC

Size: 5.50 KB

patch

obsolete

>From 96a751e2cf3997df025abefb14e95ef58d875180 Mon Sep 17 00:00:00 2001
>From: Felix Schumacher <felix.schumacher@internetallee.de>
>Date: Mon, 20 Aug 2018 16:16:34 +0200
>Subject: [PATCH 1/2] Use endTime of JMeterThread for SyncTimer
>
>---
> .../org/apache/jmeter/timers/SyncTimer.java   | 13 ++-
> .../apache/jmeter/timers/SyncTimerSpec.groovy | 95 +++++++++++++++++++
> 2 files changed, 103 insertions(+), 5 deletions(-)
> create mode 100644 test/src/org/apache/jmeter/timers/SyncTimerSpec.groovy
>
>diff --git a/src/components/org/apache/jmeter/timers/SyncTimer.java b/src/components/org/apache/jmeter/timers/SyncTimer.java
>index d80ba2f7a..861f770d3 100644
>--- a/src/components/org/apache/jmeter/timers/SyncTimer.java
>+++ b/src/components/org/apache/jmeter/timers/SyncTimer.java
>@@ -171,14 +171,17 @@ public class SyncTimer extends AbstractTestElement implements Timer, Serializabl
>         if(getGroupSize()>=0) {
>             int arrival = 0;
>             try {
>-                if(timeoutInMs==0) {
>-                    arrival = this.barrier.await();                    
>-                } else if(timeoutInMs > 0){
>-                    arrival = this.barrier.await(timeoutInMs, TimeUnit.MILLISECONDS);
>+                if (timeoutInMs <= 0) {
>+                    arrival = this.barrier.await(TimerService.getInstance().adjustDelay(Long.MAX_VALUE), TimeUnit.MILLISECONDS);
>+                } else if(timeoutInMs > 0) {
>+                    arrival = this.barrier.await(TimerService.getInstance().adjustDelay(timeoutInMs), TimeUnit.MILLISECONDS);
>                 } else {
>                     throw new IllegalArgumentException("Negative value for timeout:"+timeoutInMs+" in Synchronizing Timer "+getName());
>                 }
>-            } catch (InterruptedException | BrokenBarrierException e) {
>+            } catch (InterruptedException e) {
>+                Thread.currentThread().interrupt();
>+                return 0;
>+            } catch (BrokenBarrierException e) {
>                 return 0;
>             } catch (TimeoutException e) {
>                 if (log.isWarnEnabled()) {
>diff --git a/test/src/org/apache/jmeter/timers/SyncTimerSpec.groovy b/test/src/org/apache/jmeter/timers/SyncTimerSpec.groovy
>new file mode 100644
>index 000000000..e4731150b
>--- /dev/null
>+++ b/test/src/org/apache/jmeter/timers/SyncTimerSpec.groovy
>@@ -0,0 +1,95 @@
>+/*
>+ * Licensed to the Apache Software Foundation (ASF) under one or more
>+ * contributor license agreements.  See the NOTICE file distributed with
>+ * this work for additional information regarding copyright ownership.
>+ * The ASF licenses this file to You under the Apache License, Version 2.0
>+ * (the "License"); you may not use this file except in compliance with
>+ * the License.  You may obtain a copy of the License at
>+ *
>+ *   http://www.apache.org/licenses/LICENSE-2.0
>+ *
>+ * Unless required by applicable law or agreed to in writing, software
>+ * distributed under the License is distributed on an "AS IS" BASIS,
>+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
>+ * See the License for the specific language governing permissions and
>+ * limitations under the License.
>+ *
>+ */
>+
>+package org.apache.jmeter.timers
>+
>+import org.apache.jmeter.threads.JMeterContext
>+import org.apache.jmeter.threads.JMeterContextService
>+import org.apache.jmeter.threads.JMeterThread
>+
>+import spock.lang.Specification
>+
>+class SyncTimerSpec extends Specification {
>+    
>+    
>+    def "timer with scheduled end point"() {
>+        setup:
>+            def timer = new SyncTimer()
>+            def ctx = Stub(JMeterContext)
>+            def thread = Stub(JMeterThread)
>+
>+            thread.getEndTime() >> System.currentTimeMillis() + 100L
>+            ctx.getThread() >> thread
>+
>+            timer.threadContext = ctx
>+            timer.groupSize = 2
>+            timer.testStarted()
>+         when:
>+            def start = System.currentTimeMillis();
>+            def delay = timer.delay()
>+            def elapsed = System.currentTimeMillis() - start
>+         then:
>+            delay == 0
>+            elapsed < 10 * 100L
>+    }
>+
>+    def "timer with scheduled end point and shorter max timeout in ms"() {
>+        setup:
>+            def timer = new SyncTimer()
>+            timer.setTimeoutInMs(100L)
>+            def ctx = Stub(JMeterContext)
>+            def thread = Stub(JMeterThread)
>+
>+            thread.getEndTime() >> System.currentTimeMillis() + 2000L
>+            ctx.getThread() >> thread
>+
>+            timer.threadContext = ctx
>+            timer.groupSize = 2
>+            timer.testStarted()
>+         when:
>+            def start = System.currentTimeMillis();
>+            def delay = timer.delay()
>+            def elapsed = System.currentTimeMillis() - start
>+         then:
>+            delay == 0
>+            elapsed < 10 * 100L
>+    }
>+
>+    def "timer with scheduled end point and longer max timeout in ms"() {
>+        setup:
>+            def timer = new SyncTimer()
>+            timer.setTimeoutInMs(2000L)
>+            def ctx = Stub(JMeterContext)
>+            def thread = Stub(JMeterThread)
>+
>+            thread.getEndTime() >> System.currentTimeMillis() + 100L
>+            ctx.getThread() >> thread
>+
>+            timer.threadContext = ctx
>+            timer.groupSize = 2
>+            timer.testStarted()
>+         when:
>+            def start = System.currentTimeMillis();
>+            def delay = timer.delay()
>+            def elapsed = System.currentTimeMillis() - start
>+         then:
>+            delay == 0
>+            elapsed < 10 * 100L
>+    }
>+
>+}
>\ No newline at end of file
>-- 
>2.17.1
>

Actions: View | Diff

Attachments on bug 62637: 36099 | 36100 | 36101 | 36102 | 36103 | 36105 | 36106