diff options
| author | Martin Ritchie <ritchiem@apache.org> | 2010-04-12 15:43:47 +0000 |
|---|---|---|
| committer | Martin Ritchie <ritchiem@apache.org> | 2010-04-12 15:43:47 +0000 |
| commit | 8a6ed6eed866416f8342bd10f3413dd04190eb21 (patch) | |
| tree | 96a61c8d96bc37f9d82f137b1f44384faf094bf7 /qpid/java/perftests | |
| parent | d96f592d18e80cab8f73c740b6cb14d612befe36 (diff) | |
| download | qpid-python-8a6ed6eed866416f8342bd10f3413dd04190eb21.tar.gz | |
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
git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@933287 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'qpid/java/perftests')
| -rwxr-xr-x | qpid/java/perftests/bin/processing/process.sh | 2 | ||||
| -rwxr-xr-x | qpid/java/perftests/bin/processing/processTests.py | 8 |
2 files changed, 7 insertions, 3 deletions
diff --git a/qpid/java/perftests/bin/processing/process.sh b/qpid/java/perftests/bin/processing/process.sh index 5e0adf1541..6dbf9b9ea8 100755 --- a/qpid/java/perftests/bin/processing/process.sh +++ b/qpid/java/perftests/bin/processing/process.sh @@ -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 diff --git a/qpid/java/perftests/bin/processing/processTests.py b/qpid/java/perftests/bin/processing/processTests.py index bb9efcc5a2..8db44eda79 100755 --- a/qpid/java/perftests/bin/processing/processTests.py +++ b/qpid/java/perftests/bin/processing/processTests.py @@ -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: |