[jboss-svn-commits] JBL Code SVN: r30196 - in labs/jbosstm/trunk/qa/tests: src/org/jboss/jbossts/qa/ArjunaCore/AbstractRecord/client and 6 other directories.
jboss-svn-commits at lists.jboss.org
jboss-svn-commits at lists.jboss.org
Wed Nov 18 06:16:41 EST 2009
Author: jhalliday
Date: 2009-11-18 06:16:40 -0500 (Wed, 18 Nov 2009)
New Revision: 30196
Modified:
labs/jbosstm/trunk/qa/tests/build-core.xml
labs/jbosstm/trunk/qa/tests/src/org/jboss/jbossts/qa/ArjunaCore/AbstractRecord/client/MemoryClient001.java
labs/jbosstm/trunk/qa/tests/src/org/jboss/jbossts/qa/ArjunaCore/AbstractRecord/client/MemoryClient002.java
labs/jbosstm/trunk/qa/tests/src/org/jboss/jbossts/qa/ArjunaCore/LockManager/CrashRecovery/client/Client001a.java
labs/jbosstm/trunk/qa/tests/src/org/jboss/jbossts/qa/ArjunaCore/LockManager/CrashRecovery/client/Client002a.java
labs/jbosstm/trunk/qa/tests/src/org/jboss/jbossts/qa/ArjunaCore/LockManager/client/MemoryClient001.java
labs/jbosstm/trunk/qa/tests/src/org/jboss/jbossts/qa/ArjunaCore/LockManager/client/MemoryClient002.java
labs/jbosstm/trunk/qa/tests/src/org/jboss/jbossts/qa/ArjunaCore/LockManager/client/MemoryClient003.java
labs/jbosstm/trunk/qa/tests/src/org/jboss/jbossts/qa/ArjunaCore/LockManager/client/MemoryClient004.java
labs/jbosstm/trunk/qa/tests/src/org/jboss/jbossts/qa/ArjunaCore/StateManager/CrashRecovery/client/Client001a.java
labs/jbosstm/trunk/qa/tests/src/org/jboss/jbossts/qa/ArjunaCore/StateManager/CrashRecovery/client/Client002a.java
labs/jbosstm/trunk/qa/tests/src/org/jboss/jbossts/qa/ArjunaCore/StateManager/client/MemoryClient001.java
labs/jbosstm/trunk/qa/tests/src/org/jboss/jbossts/qa/ArjunaCore/StateManager/client/MemoryClient002.java
labs/jbosstm/trunk/qa/tests/src/org/jboss/jbossts/qa/ArjunaCore/StateManager/client/MemoryClient003.java
labs/jbosstm/trunk/qa/tests/src/org/jboss/jbossts/qa/ArjunaCore/StateManager/client/MemoryClient004.java
labs/jbosstm/trunk/qa/tests/src/org/jboss/jbossts/qa/ArjunaCore/Utils/qautil.java
labs/jbosstm/trunk/qa/tests/src/org/jboss/jbossts/qa/Utils/CrashRecoveryDelays.java
labs/jbosstm/trunk/qa/tests/src/org/jboss/jbossts/qa/Utils/JVMStats.java
Log:
Tidy up test delay functions. JBTM-390
Modified: labs/jbosstm/trunk/qa/tests/build-core.xml
===================================================================
--- labs/jbosstm/trunk/qa/tests/build-core.xml 2009-11-18 10:52:53 UTC (rev 30195)
+++ labs/jbosstm/trunk/qa/tests/build-core.xml 2009-11-18 11:16:40 UTC (rev 30196)
@@ -50,6 +50,7 @@
destdir="${org.jboss.jbossts.qa.build.classes}"
debug="on" deprecation="on">
+ <include name="**/org/jboss/jbossts/qa/Utils/CrashRecoveryDelays.java"/>
<include name="**/org/jboss/jbossts/qa/Utils/*Store*.java"/>
<exclude name="**/org/jboss/jbossts/qa/Utils/EmptyObjectStore.java"/>
<include name="**/org/jboss/jbossts/qa/Utils/BaseTestCase.java"/>
Modified: labs/jbosstm/trunk/qa/tests/src/org/jboss/jbossts/qa/ArjunaCore/AbstractRecord/client/MemoryClient001.java
===================================================================
--- labs/jbosstm/trunk/qa/tests/src/org/jboss/jbossts/qa/ArjunaCore/AbstractRecord/client/MemoryClient001.java 2009-11-18 10:52:53 UTC (rev 30195)
+++ labs/jbosstm/trunk/qa/tests/src/org/jboss/jbossts/qa/ArjunaCore/AbstractRecord/client/MemoryClient001.java 2009-11-18 11:16:40 UTC (rev 30196)
@@ -61,9 +61,6 @@
//comit transaction
commit();
- //lets go to sleep to see if this helps the vm clean itself up
- qautil.runGarbageCollection();
-
//get first memory reading.
getFirstReading();
@@ -76,9 +73,6 @@
//abort transaction
abort();
- //lets go to sleep to see if this helps the vm clean itself up
- qautil.runGarbageCollection();
-
getSecondReading();
qaMemoryAssert();
Modified: labs/jbosstm/trunk/qa/tests/src/org/jboss/jbossts/qa/ArjunaCore/AbstractRecord/client/MemoryClient002.java
===================================================================
--- labs/jbosstm/trunk/qa/tests/src/org/jboss/jbossts/qa/ArjunaCore/AbstractRecord/client/MemoryClient002.java 2009-11-18 10:52:53 UTC (rev 30195)
+++ labs/jbosstm/trunk/qa/tests/src/org/jboss/jbossts/qa/ArjunaCore/AbstractRecord/client/MemoryClient002.java 2009-11-18 11:16:40 UTC (rev 30196)
@@ -50,9 +50,6 @@
mService.doWork(mMaxIteration);
commit();
- //lets go to sleep to see if this helps the vm clean itself up
- qautil.runGarbageCollection();
-
//get first memory reading.
getFirstReading();
@@ -62,9 +59,6 @@
mService.doWork(mMaxIteration);
abort();
- //lets go to sleep to see if this helps the vm clean itself up
- qautil.runGarbageCollection();
-
getSecondReading();
qaMemoryAssert();
Modified: labs/jbosstm/trunk/qa/tests/src/org/jboss/jbossts/qa/ArjunaCore/LockManager/CrashRecovery/client/Client001a.java
===================================================================
--- labs/jbosstm/trunk/qa/tests/src/org/jboss/jbossts/qa/ArjunaCore/LockManager/CrashRecovery/client/Client001a.java 2009-11-18 10:52:53 UTC (rev 30195)
+++ labs/jbosstm/trunk/qa/tests/src/org/jboss/jbossts/qa/ArjunaCore/LockManager/CrashRecovery/client/Client001a.java 2009-11-18 11:16:40 UTC (rev 30196)
@@ -23,6 +23,7 @@
import org.jboss.jbossts.qa.ArjunaCore.LockManager.impl.BasicLockRecord;
import org.jboss.jbossts.qa.ArjunaCore.Utils.BaseTestClient;
import org.jboss.jbossts.qa.ArjunaCore.Utils.qautil;
+import org.jboss.jbossts.qa.Utils.CrashRecoveryDelays;
public class Client001a extends BaseTestClient
{
@@ -44,8 +45,7 @@
setNumberOfResources(2);
setUniquePrefix(1);
- //sleep
- qautil.sleep();
+ CrashRecoveryDelays.awaitRecoveryArjunaCore();
//restore objects from uid's
BasicLockRecord[] mLockRecordList = new BasicLockRecord[mNumberOfResources];
Modified: labs/jbosstm/trunk/qa/tests/src/org/jboss/jbossts/qa/ArjunaCore/LockManager/CrashRecovery/client/Client002a.java
===================================================================
--- labs/jbosstm/trunk/qa/tests/src/org/jboss/jbossts/qa/ArjunaCore/LockManager/CrashRecovery/client/Client002a.java 2009-11-18 10:52:53 UTC (rev 30195)
+++ labs/jbosstm/trunk/qa/tests/src/org/jboss/jbossts/qa/ArjunaCore/LockManager/CrashRecovery/client/Client002a.java 2009-11-18 11:16:40 UTC (rev 30196)
@@ -23,6 +23,7 @@
import org.jboss.jbossts.qa.ArjunaCore.LockManager.impl.BasicLockRecord;
import org.jboss.jbossts.qa.ArjunaCore.Utils.BaseTestClient;
import org.jboss.jbossts.qa.ArjunaCore.Utils.qautil;
+import org.jboss.jbossts.qa.Utils.CrashRecoveryDelays;
public class Client002a extends BaseTestClient
{
@@ -44,8 +45,7 @@
setNumberOfResources(2);
setUniquePrefix(1);
- //sleep
- qautil.sleep();
+ CrashRecoveryDelays.awaitRecoveryArjunaCore();
//restore objects from uid's
BasicLockRecord[] mLockRecordList = new BasicLockRecord[mNumberOfResources];
Modified: labs/jbosstm/trunk/qa/tests/src/org/jboss/jbossts/qa/ArjunaCore/LockManager/client/MemoryClient001.java
===================================================================
--- labs/jbosstm/trunk/qa/tests/src/org/jboss/jbossts/qa/ArjunaCore/LockManager/client/MemoryClient001.java 2009-11-18 10:52:53 UTC (rev 30195)
+++ labs/jbosstm/trunk/qa/tests/src/org/jboss/jbossts/qa/ArjunaCore/LockManager/client/MemoryClient001.java 2009-11-18 11:16:40 UTC (rev 30196)
@@ -63,9 +63,6 @@
//comit transaction
commit();
- //lets go to sleep to see if this helps the vm clean itself up
- qautil.runGarbageCollection();
-
//get first memory reading.
getFirstReading();
@@ -81,9 +78,6 @@
//abort transaction
abort();
- //lets go to sleep to see if this helps the vm clean itself up
- qautil.runGarbageCollection();
-
getSecondReading();
qaMemoryAssert();
Modified: labs/jbosstm/trunk/qa/tests/src/org/jboss/jbossts/qa/ArjunaCore/LockManager/client/MemoryClient002.java
===================================================================
--- labs/jbosstm/trunk/qa/tests/src/org/jboss/jbossts/qa/ArjunaCore/LockManager/client/MemoryClient002.java 2009-11-18 10:52:53 UTC (rev 30195)
+++ labs/jbosstm/trunk/qa/tests/src/org/jboss/jbossts/qa/ArjunaCore/LockManager/client/MemoryClient002.java 2009-11-18 11:16:40 UTC (rev 30196)
@@ -63,9 +63,6 @@
//comit transaction
commit();
- //lets go to sleep to see if this helps the vm clean itself up
- qautil.runGarbageCollection();
-
//get first memory reading.
getFirstReading();
@@ -81,9 +78,6 @@
//abort transaction
abort();
- //lets go to sleep to see if this helps the vm clean itself up
- qautil.runGarbageCollection();
-
getSecondReading();
qaMemoryAssert();
Modified: labs/jbosstm/trunk/qa/tests/src/org/jboss/jbossts/qa/ArjunaCore/LockManager/client/MemoryClient003.java
===================================================================
--- labs/jbosstm/trunk/qa/tests/src/org/jboss/jbossts/qa/ArjunaCore/LockManager/client/MemoryClient003.java 2009-11-18 10:52:53 UTC (rev 30195)
+++ labs/jbosstm/trunk/qa/tests/src/org/jboss/jbossts/qa/ArjunaCore/LockManager/client/MemoryClient003.java 2009-11-18 11:16:40 UTC (rev 30196)
@@ -69,9 +69,6 @@
}
}
- //lets go to sleep to see if this helps the vm clean itself up
- qautil.runGarbageCollection();
-
//get first memory reading.
getFirstReading();
@@ -92,9 +89,6 @@
}
}
- //lets go to sleep to see if this helps the vm clean itself up
- qautil.runGarbageCollection();
-
getSecondReading();
qaMemoryAssert();
Modified: labs/jbosstm/trunk/qa/tests/src/org/jboss/jbossts/qa/ArjunaCore/LockManager/client/MemoryClient004.java
===================================================================
--- labs/jbosstm/trunk/qa/tests/src/org/jboss/jbossts/qa/ArjunaCore/LockManager/client/MemoryClient004.java 2009-11-18 10:52:53 UTC (rev 30195)
+++ labs/jbosstm/trunk/qa/tests/src/org/jboss/jbossts/qa/ArjunaCore/LockManager/client/MemoryClient004.java 2009-11-18 11:16:40 UTC (rev 30196)
@@ -78,9 +78,6 @@
System.err.println("Time taken to increase resource " + mMaxIteration + " iteration(s): " + stopWatchTime + "ms");
}
- //lets go to sleep to see if this helps the vm clean itself up
- qautil.runGarbageCollection();
-
//get first memory reading.
getFirstReading();
@@ -104,9 +101,6 @@
System.err.println("Time taken to increase resource " + mMaxIteration + " iteration(s): " + stopWatchTime + "ms");
}
- //lets go to sleep to see if this helps the vm clean itself up
- qautil.runGarbageCollection();
-
getSecondReading();
qaMemoryAssert();
Modified: labs/jbosstm/trunk/qa/tests/src/org/jboss/jbossts/qa/ArjunaCore/StateManager/CrashRecovery/client/Client001a.java
===================================================================
--- labs/jbosstm/trunk/qa/tests/src/org/jboss/jbossts/qa/ArjunaCore/StateManager/CrashRecovery/client/Client001a.java 2009-11-18 10:52:53 UTC (rev 30195)
+++ labs/jbosstm/trunk/qa/tests/src/org/jboss/jbossts/qa/ArjunaCore/StateManager/CrashRecovery/client/Client001a.java 2009-11-18 11:16:40 UTC (rev 30196)
@@ -23,6 +23,7 @@
import org.jboss.jbossts.qa.ArjunaCore.StateManager.impl.BasicStateRecord;
import org.jboss.jbossts.qa.ArjunaCore.Utils.BaseTestClient;
import org.jboss.jbossts.qa.ArjunaCore.Utils.qautil;
+import org.jboss.jbossts.qa.Utils.CrashRecoveryDelays;
public class Client001a extends BaseTestClient
{
@@ -44,8 +45,7 @@
setNumberOfResources(2);
setUniquePrefix(1);
- //sleep
- qautil.sleep();
+ CrashRecoveryDelays.awaitRecoveryArjunaCore();
//restore objects from uid's
BasicStateRecord[] mStateRecordList = new BasicStateRecord[mNumberOfResources];
Modified: labs/jbosstm/trunk/qa/tests/src/org/jboss/jbossts/qa/ArjunaCore/StateManager/CrashRecovery/client/Client002a.java
===================================================================
--- labs/jbosstm/trunk/qa/tests/src/org/jboss/jbossts/qa/ArjunaCore/StateManager/CrashRecovery/client/Client002a.java 2009-11-18 10:52:53 UTC (rev 30195)
+++ labs/jbosstm/trunk/qa/tests/src/org/jboss/jbossts/qa/ArjunaCore/StateManager/CrashRecovery/client/Client002a.java 2009-11-18 11:16:40 UTC (rev 30196)
@@ -23,6 +23,7 @@
import org.jboss.jbossts.qa.ArjunaCore.StateManager.impl.BasicStateRecord;
import org.jboss.jbossts.qa.ArjunaCore.Utils.BaseTestClient;
import org.jboss.jbossts.qa.ArjunaCore.Utils.qautil;
+import org.jboss.jbossts.qa.Utils.CrashRecoveryDelays;
public class Client002a extends BaseTestClient
{
@@ -44,8 +45,7 @@
setNumberOfResources(2);
setUniquePrefix(1);
- //sleep
- qautil.sleep();
+ CrashRecoveryDelays.awaitRecoveryArjunaCore();
//restore objects from uid's
BasicStateRecord[] mStateRecordList = new BasicStateRecord[mNumberOfResources];
Modified: labs/jbosstm/trunk/qa/tests/src/org/jboss/jbossts/qa/ArjunaCore/StateManager/client/MemoryClient001.java
===================================================================
--- labs/jbosstm/trunk/qa/tests/src/org/jboss/jbossts/qa/ArjunaCore/StateManager/client/MemoryClient001.java 2009-11-18 10:52:53 UTC (rev 30195)
+++ labs/jbosstm/trunk/qa/tests/src/org/jboss/jbossts/qa/ArjunaCore/StateManager/client/MemoryClient001.java 2009-11-18 11:16:40 UTC (rev 30196)
@@ -62,9 +62,6 @@
//comit transaction
commit();
- //lets go to sleep to see if this helps the vm clean itself up
- qautil.runGarbageCollection();
-
//get first memory reading.
getFirstReading();
@@ -80,9 +77,6 @@
//abort transaction
abort();
- //lets go to sleep to see if this helps the vm clean itself up
- qautil.runGarbageCollection();
-
getSecondReading();
qaMemoryAssert();
Modified: labs/jbosstm/trunk/qa/tests/src/org/jboss/jbossts/qa/ArjunaCore/StateManager/client/MemoryClient002.java
===================================================================
--- labs/jbosstm/trunk/qa/tests/src/org/jboss/jbossts/qa/ArjunaCore/StateManager/client/MemoryClient002.java 2009-11-18 10:52:53 UTC (rev 30195)
+++ labs/jbosstm/trunk/qa/tests/src/org/jboss/jbossts/qa/ArjunaCore/StateManager/client/MemoryClient002.java 2009-11-18 11:16:40 UTC (rev 30196)
@@ -63,9 +63,6 @@
//comit transaction
commit();
- //lets go to sleep to see if this helps the vm clean itself up
- qautil.runGarbageCollection();
-
//get first memory reading.
getFirstReading();
@@ -81,9 +78,6 @@
//abort transaction
abort();
- //lets go to sleep to see if this helps the vm clean itself up
- qautil.runGarbageCollection();
-
getSecondReading();
qaMemoryAssert();
Modified: labs/jbosstm/trunk/qa/tests/src/org/jboss/jbossts/qa/ArjunaCore/StateManager/client/MemoryClient003.java
===================================================================
--- labs/jbosstm/trunk/qa/tests/src/org/jboss/jbossts/qa/ArjunaCore/StateManager/client/MemoryClient003.java 2009-11-18 10:52:53 UTC (rev 30195)
+++ labs/jbosstm/trunk/qa/tests/src/org/jboss/jbossts/qa/ArjunaCore/StateManager/client/MemoryClient003.java 2009-11-18 11:16:40 UTC (rev 30196)
@@ -68,9 +68,6 @@
}
}
- //lets go to sleep to see if this helps the vm clean itself up
- qautil.runGarbageCollection();
-
//get first memory reading.
getFirstReading();
@@ -91,9 +88,6 @@
}
}
- //lets go to sleep to see if this helps the vm clean itself up
- qautil.runGarbageCollection();
-
getSecondReading();
qaMemoryAssert();
Modified: labs/jbosstm/trunk/qa/tests/src/org/jboss/jbossts/qa/ArjunaCore/StateManager/client/MemoryClient004.java
===================================================================
--- labs/jbosstm/trunk/qa/tests/src/org/jboss/jbossts/qa/ArjunaCore/StateManager/client/MemoryClient004.java 2009-11-18 10:52:53 UTC (rev 30195)
+++ labs/jbosstm/trunk/qa/tests/src/org/jboss/jbossts/qa/ArjunaCore/StateManager/client/MemoryClient004.java 2009-11-18 11:16:40 UTC (rev 30196)
@@ -69,9 +69,6 @@
}
}
- //lets go to sleep to see if this helps the vm clean itself up
- qautil.runGarbageCollection();
-
//get first memory reading.
getFirstReading();
@@ -92,9 +89,6 @@
}
}
- //lets go to sleep to see if this helps the vm clean itself up
- qautil.runGarbageCollection();
-
getSecondReading();
qaMemoryAssert();
Modified: labs/jbosstm/trunk/qa/tests/src/org/jboss/jbossts/qa/ArjunaCore/Utils/qautil.java
===================================================================
--- labs/jbosstm/trunk/qa/tests/src/org/jboss/jbossts/qa/ArjunaCore/Utils/qautil.java 2009-11-18 10:52:53 UTC (rev 30195)
+++ labs/jbosstm/trunk/qa/tests/src/org/jboss/jbossts/qa/ArjunaCore/Utils/qautil.java 2009-11-18 11:16:40 UTC (rev 30196)
@@ -27,71 +27,6 @@
public class qautil
{
- public static void runGarbageCollection() {
- // no clean way to to this at present, so we'll sleep and hope the gc runs.
- System.gc();
- try {
- Thread.sleep(100);
- } catch(InterruptedException e) {
-
- }
- }
-
- /**
- * Default sleep behavior is to perform gc then sleep for 1 min (1000 milli seconds)
- */
- public static void sleep()
- {
- sleep(true);
- }
-
- /**
- * Sleep method used when gc is not required.
- */
- private static void sleep(boolean gc)
- {
- if (gc)
- {
- System.gc();
- }
- sleep(mSleepTime);
- }
-
- /**
- * Convenience method to send the current thread to sleep for a number of
- * milli seconds. (1000 milli = 1 second)
- */
- private static void sleep(int milli)
- {
- sleep("milli", milli);
- }
-
- /**
- * Use the string option to pass in "min" if you would like the thread to
- * sleep for a set number of minutes.
- */
- private static void sleep(String option, int duration)
- {
- int milli = duration;
- if (option != null && option.equalsIgnoreCase("min"))
- {
- milli = duration * mSleepTime;
- }
- try
- {
- //System.err.println("sleeping for " + milli / mSleepTime + " mins");
- Thread.currentThread().sleep(milli);
- //System.err.println("awake");
- }
- catch (Exception e)
- {
- System.err.println("exception in sleep");
- }
- }
-
- //default is 1 min
- private static int mSleepTime = 60000;
-
public static void storeUid(String objectName, Uid objectUid)
throws Exception
{
Modified: labs/jbosstm/trunk/qa/tests/src/org/jboss/jbossts/qa/Utils/CrashRecoveryDelays.java
===================================================================
--- labs/jbosstm/trunk/qa/tests/src/org/jboss/jbossts/qa/Utils/CrashRecoveryDelays.java 2009-11-18 10:52:53 UTC (rev 30195)
+++ labs/jbosstm/trunk/qa/tests/src/org/jboss/jbossts/qa/Utils/CrashRecoveryDelays.java 2009-11-18 11:16:40 UTC (rev 30196)
@@ -35,6 +35,10 @@
*/
public class CrashRecoveryDelays
{
+ public static void awaitRecoveryArjunaCore() throws InterruptedException {
+ doRecovery();
+ }
+
public static void awaitRecoveryCR07(int num_clients) throws InterruptedException {
awaitRecovery(1, num_clients);
}
Modified: labs/jbosstm/trunk/qa/tests/src/org/jboss/jbossts/qa/Utils/JVMStats.java
===================================================================
--- labs/jbosstm/trunk/qa/tests/src/org/jboss/jbossts/qa/Utils/JVMStats.java 2009-11-18 10:52:53 UTC (rev 30195)
+++ labs/jbosstm/trunk/qa/tests/src/org/jboss/jbossts/qa/Utils/JVMStats.java 2009-11-18 11:16:40 UTC (rev 30196)
@@ -41,7 +41,15 @@
while (presentMemory < memory)
{
memory = presentMemory;
- System.gc();
+
+ // no clean way to to this at present, so we'll sleep and hope the gc runs.
+ System.gc();
+ try {
+ Thread.sleep(100);
+ } catch(InterruptedException e) {
+
+ }
+
presentMemory = (runtime.totalMemory() - runtime.freeMemory());
}
More information about the jboss-svn-commits
mailing list