You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@jmeter.apache.org by pm...@apache.org on 2013/07/21 14:36:53 UTC
svn commit: r1505366 - in /jmeter/trunk/src/core/org/apache/jmeter:
JMeter.java engine/StandardJMeterEngine.java samplers/SampleResult.java
threads/JMeterThread.java threads/ThreadGroup.java
Author: pmouawad
Date: Sun Jul 21 12:36:53 2013
New Revision: 1505366
URL: http://svn.apache.org/r1505366
Log:
Use TimeUnit for readability
Modified:
jmeter/trunk/src/core/org/apache/jmeter/JMeter.java
jmeter/trunk/src/core/org/apache/jmeter/engine/StandardJMeterEngine.java
jmeter/trunk/src/core/org/apache/jmeter/samplers/SampleResult.java
jmeter/trunk/src/core/org/apache/jmeter/threads/JMeterThread.java
jmeter/trunk/src/core/org/apache/jmeter/threads/ThreadGroup.java
Modified: jmeter/trunk/src/core/org/apache/jmeter/JMeter.java
URL: http://svn.apache.org/viewvc/jmeter/trunk/src/core/org/apache/jmeter/JMeter.java?rev=1505366&r1=1505365&r2=1505366&view=diff
==============================================================================
--- jmeter/trunk/src/core/org/apache/jmeter/JMeter.java (original)
+++ jmeter/trunk/src/core/org/apache/jmeter/JMeter.java Sun Jul 21 12:36:53 2013
@@ -41,6 +41,7 @@ import java.util.List;
import java.util.Locale;
import java.util.Properties;
import java.util.StringTokenizer;
+import java.util.concurrent.TimeUnit;
import java.util.concurrent.atomic.AtomicInteger;
import javax.swing.JTree;
@@ -985,7 +986,7 @@ public class JMeter implements JMeterPlu
}
}
try {
- Thread.sleep(5000); // Allow listeners to close files
+ TimeUnit.SECONDS.sleep(5); // Allow listeners to close files
} catch (InterruptedException ignored) {
}
ClientJMeterEngine.tidyRMI(log);
@@ -1008,7 +1009,7 @@ public class JMeter implements JMeterPlu
@Override
public void run(){
try {
- Thread.sleep(REMAIN_THREAD_PAUSE); // Allow enough time for JVM to exit
+ TimeUnit.MILLISECONDS.sleep(REMAIN_THREAD_PAUSE); // Allow enough time for JVM to exit
} catch (InterruptedException ignored) {
}
// This is a daemon thread, which should only reach here if there are other
Modified: jmeter/trunk/src/core/org/apache/jmeter/engine/StandardJMeterEngine.java
URL: http://svn.apache.org/viewvc/jmeter/trunk/src/core/org/apache/jmeter/engine/StandardJMeterEngine.java?rev=1505366&r1=1505365&r2=1505366&view=diff
==============================================================================
--- jmeter/trunk/src/core/org/apache/jmeter/engine/StandardJMeterEngine.java (original)
+++ jmeter/trunk/src/core/org/apache/jmeter/engine/StandardJMeterEngine.java Sun Jul 21 12:36:53 2013
@@ -25,6 +25,7 @@ import java.util.LinkedList;
import java.util.List;
import java.util.Properties;
import java.util.concurrent.CopyOnWriteArrayList;
+import java.util.concurrent.TimeUnit;
import org.apache.jmeter.JMeter;
import org.apache.jmeter.samplers.SampleEvent;
@@ -569,7 +570,7 @@ public class StandardJMeterEngine implem
private void pause(long ms){
try {
- Thread.sleep(ms);
+ TimeUnit.MILLISECONDS.sleep(ms);
} catch (InterruptedException e) {
}
}
Modified: jmeter/trunk/src/core/org/apache/jmeter/samplers/SampleResult.java
URL: http://svn.apache.org/viewvc/jmeter/trunk/src/core/org/apache/jmeter/samplers/SampleResult.java?rev=1505366&r1=1505365&r2=1505366&view=diff
==============================================================================
--- jmeter/trunk/src/core/org/apache/jmeter/samplers/SampleResult.java (original)
+++ jmeter/trunk/src/core/org/apache/jmeter/samplers/SampleResult.java Sun Jul 21 12:36:53 2013
@@ -27,6 +27,7 @@ import java.util.ArrayList;
import java.util.HashSet;
import java.util.List;
import java.util.Set;
+import java.util.concurrent.TimeUnit;
import org.apache.jmeter.assertions.AssertionResult;
import org.apache.jmeter.util.JMeterUtils;
@@ -1313,7 +1314,7 @@ public class SampleResult implements Ser
private void getOffset(long wait) {
try {
- Thread.sleep(wait);
+ TimeUnit.MILLISECONDS.sleep(wait);
long clock = System.currentTimeMillis();
long nano = SampleResult.sampleNsClockInMs();
nanoOffset = clock - nano;
Modified: jmeter/trunk/src/core/org/apache/jmeter/threads/JMeterThread.java
URL: http://svn.apache.org/viewvc/jmeter/trunk/src/core/org/apache/jmeter/threads/JMeterThread.java?rev=1505366&r1=1505365&r2=1505366&view=diff
==============================================================================
--- jmeter/trunk/src/core/org/apache/jmeter/threads/JMeterThread.java (original)
+++ jmeter/trunk/src/core/org/apache/jmeter/threads/JMeterThread.java Sun Jul 21 12:36:53 2013
@@ -23,6 +23,7 @@ import java.util.Collection;
import java.util.Iterator;
import java.util.List;
import java.util.ListIterator;
+import java.util.concurrent.TimeUnit;
import java.util.concurrent.locks.ReentrantLock;
import org.apache.jmeter.assertions.Assertion;
@@ -759,7 +760,7 @@ public class JMeterThread implements Run
}
if (sum > 0) {
try {
- Thread.sleep(sum);
+ TimeUnit.MILLISECONDS.sleep(sum);
} catch (InterruptedException e) {
log.warn("The delay timer was interrupted - probably did not wait as long as intended.");
}
@@ -816,7 +817,7 @@ public class JMeterThread implements Run
pause = togo;
}
try {
- Thread.sleep(pause); // delay between checks
+ TimeUnit.MILLISECONDS.sleep(pause); // delay between checks
} catch (InterruptedException e) {
if (running) { // Don't bother reporting stop test interruptions
log.warn(type+" delay for "+threadName+" was interrupted. Waited "+(now - start)+" milli-seconds out of "+delay);
Modified: jmeter/trunk/src/core/org/apache/jmeter/threads/ThreadGroup.java
URL: http://svn.apache.org/viewvc/jmeter/trunk/src/core/org/apache/jmeter/threads/ThreadGroup.java?rev=1505366&r1=1505365&r2=1505366&view=diff
==============================================================================
--- jmeter/trunk/src/core/org/apache/jmeter/threads/ThreadGroup.java (original)
+++ jmeter/trunk/src/core/org/apache/jmeter/threads/ThreadGroup.java Sun Jul 21 12:36:53 2013
@@ -21,6 +21,7 @@ package org.apache.jmeter.threads;
import java.util.Map;
import java.util.Map.Entry;
import java.util.concurrent.ConcurrentHashMap;
+import java.util.concurrent.TimeUnit;
import org.apache.jmeter.engine.StandardJMeterEngine;
import org.apache.jmeter.engine.TreeCloner;
@@ -499,7 +500,7 @@ public class ThreadGroup extends Abstrac
private void pause(long ms){
try {
- Thread.sleep(ms);
+ TimeUnit.MILLISECONDS.sleep(ms);
} catch (InterruptedException e) {
// TODO Is this silent exception intended
}