[jboss-svn-commits] JBL Code SVN: r29958 - in labs/jbosstm/trunk/qa/tests/src/org/jboss/jbossts/qa/ArjunaCore: LockManager/client and 2 other directories.

jboss-svn-commits at lists.jboss.org jboss-svn-commits at lists.jboss.org
Wed Nov 4 10:42:45 EST 2009


Author: jhalliday
Date: 2009-11-04 10:42:45 -0500 (Wed, 04 Nov 2009)
New Revision: 29958

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/MemoryClient002.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/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
Log:
Improve memory test. JBTM-390


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-04 14:44:03 UTC (rev 29957)
+++ labs/jbosstm/trunk/qa/tests/src/org/jboss/jbossts/qa/ArjunaCore/AbstractRecord/client/MemoryClient001.java	2009-11-04 15:42:45 UTC (rev 29958)
@@ -62,7 +62,7 @@
 			commit();
 
 			//lets go to sleep to see if this helps the vm clean itself up
-			qautil.sleep();
+			qautil.runGarbageCollection();
 
 			//get first memory reading.
 			getFirstReading();
@@ -77,7 +77,7 @@
 			abort();
 
 			//lets go to sleep to see if this helps the vm clean itself up
-			qautil.sleep();
+			qautil.runGarbageCollection();
 
 			getSecondReading();
 

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-04 14:44:03 UTC (rev 29957)
+++ labs/jbosstm/trunk/qa/tests/src/org/jboss/jbossts/qa/ArjunaCore/AbstractRecord/client/MemoryClient002.java	2009-11-04 15:42:45 UTC (rev 29958)
@@ -51,7 +51,7 @@
 			commit();
 
 			//lets go to sleep to see if this helps the vm clean itself up
-			qautil.sleep();
+			qautil.runGarbageCollection();
 
 			//get first memory reading.
 			getFirstReading();
@@ -63,7 +63,7 @@
 			abort();
 
 			//lets go to sleep to see if this helps the vm clean itself up
-			qautil.sleep();
+			qautil.runGarbageCollection();
 
 			getSecondReading();
 

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-04 14:44:03 UTC (rev 29957)
+++ labs/jbosstm/trunk/qa/tests/src/org/jboss/jbossts/qa/ArjunaCore/LockManager/client/MemoryClient001.java	2009-11-04 15:42:45 UTC (rev 29958)
@@ -64,7 +64,7 @@
 			commit();
 
 			//lets go to sleep to see if this helps the vm clean itself up
-			qautil.sleep();
+			qautil.runGarbageCollection();
 
 			//get first memory reading.
 			getFirstReading();
@@ -82,7 +82,7 @@
 			abort();
 
 			//lets go to sleep to see if this helps the vm clean itself up
-			qautil.sleep();
+			qautil.runGarbageCollection();
 
 			getSecondReading();
 

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-04 14:44:03 UTC (rev 29957)
+++ labs/jbosstm/trunk/qa/tests/src/org/jboss/jbossts/qa/ArjunaCore/LockManager/client/MemoryClient002.java	2009-11-04 15:42:45 UTC (rev 29958)
@@ -64,7 +64,7 @@
 			commit();
 
 			//lets go to sleep to see if this helps the vm clean itself up
-			qautil.sleep();
+			qautil.runGarbageCollection();
 
 			//get first memory reading.
 			getFirstReading();
@@ -82,7 +82,7 @@
 			abort();
 
 			//lets go to sleep to see if this helps the vm clean itself up
-			qautil.sleep();
+			qautil.runGarbageCollection();
 
 			getSecondReading();
 

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-04 14:44:03 UTC (rev 29957)
+++ labs/jbosstm/trunk/qa/tests/src/org/jboss/jbossts/qa/ArjunaCore/LockManager/client/MemoryClient003.java	2009-11-04 15:42:45 UTC (rev 29958)
@@ -70,7 +70,7 @@
 			}
 
 			//lets go to sleep to see if this helps the vm clean itself up
-			qautil.sleep();
+			qautil.runGarbageCollection();
 
 			//get first memory reading.
 			getFirstReading();
@@ -93,7 +93,7 @@
 			}
 
 			//lets go to sleep to see if this helps the vm clean itself up
-			qautil.sleep();
+			qautil.runGarbageCollection();
 
 			getSecondReading();
 

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-04 14:44:03 UTC (rev 29957)
+++ labs/jbosstm/trunk/qa/tests/src/org/jboss/jbossts/qa/ArjunaCore/LockManager/client/MemoryClient004.java	2009-11-04 15:42:45 UTC (rev 29958)
@@ -79,7 +79,7 @@
 			}
 
 			//lets go to sleep to see if this helps the vm clean itself up
-			qautil.sleep();
+			qautil.runGarbageCollection();
 
 			//get first memory reading.
 			getFirstReading();
@@ -105,7 +105,7 @@
 			}
 
 			//lets go to sleep to see if this helps the vm clean itself up
-			qautil.sleep();
+			qautil.runGarbageCollection();
 
 			getSecondReading();
 

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-04 14:44:03 UTC (rev 29957)
+++ labs/jbosstm/trunk/qa/tests/src/org/jboss/jbossts/qa/ArjunaCore/StateManager/client/MemoryClient001.java	2009-11-04 15:42:45 UTC (rev 29958)
@@ -63,7 +63,7 @@
 			commit();
 
 			//lets go to sleep to see if this helps the vm clean itself up
-			qautil.sleep();
+			qautil.runGarbageCollection();
 
 			//get first memory reading.
 			getFirstReading();
@@ -81,7 +81,7 @@
 			abort();
 
 			//lets go to sleep to see if this helps the vm clean itself up
-			qautil.sleep();
+			qautil.runGarbageCollection();
 
 			getSecondReading();
 

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-04 14:44:03 UTC (rev 29957)
+++ labs/jbosstm/trunk/qa/tests/src/org/jboss/jbossts/qa/ArjunaCore/StateManager/client/MemoryClient002.java	2009-11-04 15:42:45 UTC (rev 29958)
@@ -64,7 +64,7 @@
 			commit();
 
 			//lets go to sleep to see if this helps the vm clean itself up
-			qautil.sleep();
+			qautil.runGarbageCollection();
 
 			//get first memory reading.
 			getFirstReading();
@@ -82,7 +82,7 @@
 			abort();
 
 			//lets go to sleep to see if this helps the vm clean itself up
-			qautil.sleep();
+			qautil.runGarbageCollection();
 
 			getSecondReading();
 

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-04 14:44:03 UTC (rev 29957)
+++ labs/jbosstm/trunk/qa/tests/src/org/jboss/jbossts/qa/ArjunaCore/StateManager/client/MemoryClient003.java	2009-11-04 15:42:45 UTC (rev 29958)
@@ -69,7 +69,7 @@
 			}
 
 			//lets go to sleep to see if this helps the vm clean itself up
-			qautil.sleep();
+			qautil.runGarbageCollection();
 
 			//get first memory reading.
 			getFirstReading();
@@ -92,7 +92,7 @@
 			}
 
 			//lets go to sleep to see if this helps the vm clean itself up
-			qautil.sleep();
+			qautil.runGarbageCollection();
 
 			getSecondReading();
 

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-04 14:44:03 UTC (rev 29957)
+++ labs/jbosstm/trunk/qa/tests/src/org/jboss/jbossts/qa/ArjunaCore/StateManager/client/MemoryClient004.java	2009-11-04 15:42:45 UTC (rev 29958)
@@ -70,7 +70,7 @@
 			}
 
 			//lets go to sleep to see if this helps the vm clean itself up
-			qautil.sleep();
+			qautil.runGarbageCollection();
 
 			//get first memory reading.
 			getFirstReading();
@@ -93,7 +93,7 @@
 			}
 
 			//lets go to sleep to see if this helps the vm clean itself up
-			qautil.sleep();
+			qautil.runGarbageCollection();
 
 			getSecondReading();
 

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-04 14:44:03 UTC (rev 29957)
+++ labs/jbosstm/trunk/qa/tests/src/org/jboss/jbossts/qa/ArjunaCore/Utils/qautil.java	2009-11-04 15:42:45 UTC (rev 29958)
@@ -27,6 +27,16 @@
 
 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)
 	 */



More information about the jboss-svn-commits mailing list