Commit 0be49927 authored by vegorov@chromium.org's avatar vegorov@chromium.org

Align tools/gc-nvp-trace-processor.py with --trace-gc-nvp output.

R=erik.corry@gmail.com
BUG=
TEST=

Review URL: http://codereview.chromium.org/8915005

git-svn-id: http://v8.googlecode.com/svn/branches/bleeding_edge@10259 ce2b1a6d-e550-0410-aec6-3dcde31c8c00
parent d22b86a5
...@@ -219,7 +219,7 @@ def other_scope(r): ...@@ -219,7 +219,7 @@ def other_scope(r):
if r['gc'] == 's': if r['gc'] == 's':
# there is no 'other' scope for scavenging collections. # there is no 'other' scope for scavenging collections.
return 0 return 0
return r['pause'] - r['mark'] - r['sweep'] - r['compact'] - r['external'] return r['pause'] - r['mark'] - r['sweep'] - r['external']
def scavenge_scope(r): def scavenge_scope(r):
if r['gc'] == 's': if r['gc'] == 's':
...@@ -238,7 +238,6 @@ plots = [ ...@@ -238,7 +238,6 @@ plots = [
Plot(Item('Scavenge', scavenge_scope, lc = 'green'), Plot(Item('Scavenge', scavenge_scope, lc = 'green'),
Item('Marking', 'mark', lc = 'purple'), Item('Marking', 'mark', lc = 'purple'),
Item('Sweep', 'sweep', lc = 'blue'), Item('Sweep', 'sweep', lc = 'blue'),
Item('Compaction', 'compact', lc = 'red'),
Item('External', 'external', lc = '#489D43'), Item('External', 'external', lc = '#489D43'),
Item('Other', other_scope, lc = 'grey'), Item('Other', other_scope, lc = 'grey'),
Item('IGC Steps', 'stepstook', lc = '#FF6347')) Item('IGC Steps', 'stepstook', lc = '#FF6347'))
...@@ -250,7 +249,6 @@ plots = [ ...@@ -250,7 +249,6 @@ plots = [
Plot(Item('Scavenge', scavenge_scope, lc = 'green'), Plot(Item('Scavenge', scavenge_scope, lc = 'green'),
Item('Marking', 'mark', lc = 'purple'), Item('Marking', 'mark', lc = 'purple'),
Item('Sweep', 'sweep', lc = 'blue'), Item('Sweep', 'sweep', lc = 'blue'),
Item('Compaction', 'compact', lc = 'red'),
Item('External', 'external', lc = '#489D43'), Item('External', 'external', lc = '#489D43'),
Item('Other', other_scope, lc = '#ADD8E6'), Item('Other', other_scope, lc = '#ADD8E6'),
Item('External', 'external', lc = '#D3D3D3')) Item('External', 'external', lc = '#D3D3D3'))
...@@ -309,7 +307,6 @@ def process_trace(filename): ...@@ -309,7 +307,6 @@ def process_trace(filename):
trace = parse_gc_trace(filename) trace = parse_gc_trace(filename)
marksweeps = filter(lambda r: r['gc'] == 'ms', trace) marksweeps = filter(lambda r: r['gc'] == 'ms', trace)
markcompacts = filter(lambda r: r['gc'] == 'mc', trace)
scavenges = filter(lambda r: r['gc'] == 's', trace) scavenges = filter(lambda r: r['gc'] == 's', trace)
globalgcs = filter(lambda r: r['gc'] != 's', trace) globalgcs = filter(lambda r: r['gc'] != 's', trace)
...@@ -368,10 +365,8 @@ def process_trace(filename): ...@@ -368,10 +365,8 @@ def process_trace(filename):
stats(out, 'Total in GC', trace, 'pause') stats(out, 'Total in GC', trace, 'pause')
stats(out, 'Scavenge', scavenges, 'pause') stats(out, 'Scavenge', scavenges, 'pause')
stats(out, 'MarkSweep', marksweeps, 'pause') stats(out, 'MarkSweep', marksweeps, 'pause')
stats(out, 'MarkCompact', markcompacts, 'pause')
stats(out, 'Mark', filter(lambda r: r['mark'] != 0, trace), 'mark') stats(out, 'Mark', filter(lambda r: r['mark'] != 0, trace), 'mark')
stats(out, 'Sweep', filter(lambda r: r['sweep'] != 0, trace), 'sweep') stats(out, 'Sweep', filter(lambda r: r['sweep'] != 0, trace), 'sweep')
stats(out, 'Compact', filter(lambda r: r['compact'] != 0, trace), 'compact')
stats(out, stats(out,
'External', 'External',
filter(lambda r: r['external'] != 0, trace), filter(lambda r: r['external'] != 0, trace),
...@@ -379,7 +374,6 @@ def process_trace(filename): ...@@ -379,7 +374,6 @@ def process_trace(filename):
out.write('</table>') out.write('</table>')
throughput('TOTAL', trace) throughput('TOTAL', trace)
throughput('MS', marksweeps) throughput('MS', marksweeps)
throughput('MC', markcompacts)
throughput('OLDSPACE', globalgcs) throughput('OLDSPACE', globalgcs)
out.write('<br/>') out.write('<br/>')
for chart in charts: for chart in charts:
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment