Author: ritchiem
Date: Mon Apr 12 15:43:47 2010
New Revision: 933287
URL: http://svn.apache.org/viewvc?rev=933287&view=rev
Log:
QPID-2424 : Update tests to correctly handle timestamps from stat that are in
nano seconds rather than millis.
Fixed GC_FREQ generation it was not using GC_TIME.log as input
Merged from 0.5.x-dev rev 920394
Modified:
qpid/trunk/qpid/java/perftests/bin/processing/process.sh
qpid/trunk/qpid/java/perftests/bin/processing/processTests.py
Modified: qpid/trunk/qpid/java/perftests/bin/processing/process.sh
URL:
http://svn.apache.org/viewvc/qpid/trunk/qpid/java/perftests/bin/processing/process.sh?rev=933287&r1=933286&r2=933287&view=diff
==============================================================================
--- qpid/trunk/qpid/java/perftests/bin/processing/process.sh (original)
+++ qpid/trunk/qpid/java/perftests/bin/processing/process.sh Mon Apr 12
15:43:47 2010
@@ -53,7 +53,7 @@ processCMSGCFile()
calculateStats "MEM_PRE" HEAP_PRE_GC.log
calculateStats "MEM_POST" HEAP_POST_GC.log
- calculateStatsBC "GC_FREQ" GC_FREQ.log
+ calculateStatsBC "GC_FREQ" GC_TIME.log
# Calculate ParNew GC Cumulative total
Modified: qpid/trunk/qpid/java/perftests/bin/processing/processTests.py
URL:
http://svn.apache.org/viewvc/qpid/trunk/qpid/java/perftests/bin/processing/processTests.py?rev=933287&r1=933286&r2=933287&view=diff
==============================================================================
--- qpid/trunk/qpid/java/perftests/bin/processing/processTests.py (original)
+++ qpid/trunk/qpid/java/perftests/bin/processing/processTests.py Mon Apr 12
15:43:47 2010
@@ -323,10 +323,14 @@ def lineToDate(line):
m = pattern.match(line)
micro = None
if m:
- micro = m.group('micro')
+ micro = m.group('micro')
if micro == None:
- micro = 0
+ micro = 0
+
+ # Correct issue where micros are actually nanos
+ if int(micro) > 999999:
+ micro = int(micro) / 1000
return datetime(year,month,day,hour,minute,seconds,int(micro))
else:
---------------------------------------------------------------------
Apache Qpid - AMQP Messaging Implementation
Project: http://qpid.apache.org
Use/Interact: mailto:commits-subscr...@qpid.apache.org
