Revision: 90
http://polepos.svn.sourceforge.net/polepos/?rev=90&view=rev
Author: carlrosenberger
Date: 2009-09-15 13:28:25 +0000 (Tue, 15 Sep 2009)
Log Message:
-----------
cr + rbo: Removed MemoryWatcher since it's effect on the running test is too high.
Instead we measure the memory used after the test is run.
Modified Paths:
--------------
trunk/polepos/src/org/polepos/framework/Circuit.java
trunk/polepos/src/org/polepos/util/MemoryUtil.java
Modified: trunk/polepos/src/org/polepos/framework/Circuit.java
===================================================================
--- trunk/polepos/src/org/polepos/framework/Circuit.java 2009-09-09 14:43:47 UTC (rev 89)
+++ trunk/polepos/src/org/polepos/framework/Circuit.java 2009-09-15 13:28:25 UTC (rev 90)
@@ -22,6 +22,7 @@
import java.lang.reflect.*;
import java.util.*;
+import org.polepos.util.*;
import org.polepos.watcher.*;
/**
@@ -37,7 +38,9 @@
// should start before time watcher
private TimeWatcher _timeWatcher;
- private MemoryWatcher _memoryWatcher;
+ // TODO: The effect of MemoryWatcher is too strong on the running tests.
+ // We should investigate if we can get less intrusive results with JMX
+ // private MemoryWatcher _memoryWatcher;
private FileSizeWatcher _fileSizeWatcher;
@@ -50,7 +53,7 @@
private void initWatchers() {
_timeWatcher = new TimeWatcher();
- _memoryWatcher = new MemoryWatcher();
+ // _memoryWatcher = new MemoryWatcher();
_fileSizeWatcher = new FileSizeWatcher();
}
@@ -193,7 +196,7 @@
}
}
- _memoryWatcher.start();
+ // _memoryWatcher.start();
_timeWatcher.start();
_fileSizeWatcher.monitorFile(team.databaseFile());
_fileSizeWatcher.start();
@@ -222,12 +225,13 @@
}
_timeWatcher.stop();
- _memoryWatcher.stop();
+ // _memoryWatcher.stop();
_fileSizeWatcher.stop();
if(lap.reportResult()){
long time = (Long)_timeWatcher.value();
- long memory = (Long) _memoryWatcher.value();
+ // long memory = (Long) _memoryWatcher.value();
+ long memory = MemoryUtil.usedMemory();
long databaseSize = (Long) _fileSizeWatcher.value();
result.report(new Result(this, team, lap, setup, index, time, memory, databaseSize, driver.checkSum()));
Modified: trunk/polepos/src/org/polepos/util/MemoryUtil.java
===================================================================
--- trunk/polepos/src/org/polepos/util/MemoryUtil.java 2009-09-09 14:43:47 UTC (rev 89)
+++ trunk/polepos/src/org/polepos/util/MemoryUtil.java 2009-09-15 13:28:25 UTC (rev 90)
@@ -37,11 +37,7 @@
System.gc();
System.runFinalization();
}
- try {
- Thread.sleep(10);
- } catch (InterruptedException e) {
- e.printStackTrace();
- }
+ Thread.yield();
long usedMemoryAfterGC = internalUsedMemory();
if(usedMemoryAfterGC >= usedMemoryBeforeGC){
return usedMemoryBeforeGC;
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
