summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rwxr-xr-xjava/perftests/bin/processing/process.sh2
-rwxr-xr-xjava/perftests/bin/processing/processTests.py8
2 files changed, 7 insertions, 3 deletions
diff --git a/java/perftests/bin/processing/process.sh b/java/perftests/bin/processing/process.sh
index 5e0adf1541..6dbf9b9ea8 100755
--- a/java/perftests/bin/processing/process.sh
+++ b/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/java/perftests/bin/processing/processTests.py b/java/perftests/bin/processing/processTests.py
index bb9efcc5a2..8db44eda79 100755
--- a/java/perftests/bin/processing/processTests.py
+++ b/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: