[Oilpan] Move global definitions into a scoped area

tools/perf/measurements/oilpan_gc_times.py

 # Copyright 2014 The Chromium Authors. All rights reserved.
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
 import os
 
 from measurements import smoothness_controller
 from measurements import timeline_controller
 from telemetry import benchmark
 from telemetry.core.platform import tracing_category_filter
 from telemetry.core.platform import tracing_options
 from telemetry.page import action_runner
 from telemetry.page import page_test
 from telemetry.results import results_options
 from telemetry.timeline.model import TimelineModel
 from telemetry.util import statistics
 from telemetry.value import list_of_scalar_values
 from telemetry.value import scalar
 from telemetry.value import trace
 
 
 _CR_RENDERER_MAIN = 'CrRendererMain'
 _RUN_SMOOTH_ACTIONS = 'RunSmoothAllActions'
-_GC_REASONS = ['precise', 'conservative', 'idle', 'forced']
-_GC_STAGES = ['mark', 'lazy_sweep', 'complete_sweep']
-
-
-def _GetGcReason(args):
-  # Old style
-  if 'precise' in args:
-    if args['forced']:
-      return 'forced'
-    return 'precise' if args['precise'] else 'conservative'
-
-  if args['gcReason'] == 'ConservativeGC':
-    return 'conservative'
-  if args['gcReason'] == 'PreciseGC':
-    return 'precise'
-  if args['gcReason'] == 'ForcedGCForTesting':
-    return 'forced'
-  if args['gcReason'] == 'IdleGC':
-    return 'idle'
-  return None  # Unknown
 
 
 def _AddTracingResults(events, results):
+  _GC_REASONS = ['precise', 'conservative', 'idle', 'forced']
+  _GC_STAGES = ['mark', 'lazy_sweep', 'complete_sweep']
+
+  def GetGcReason(args):
+    # Old format
+    if 'precise' in args:
+      if args['forced']:
+        return 'forced'
+      return 'precise' if args['precise'] else 'conservative'
+
+    if args['gcReason'] == 'ConservativeGC':
+      return 'conservative'
+    if args['gcReason'] == 'PreciseGC':
+      return 'precise'
+    if args['gcReason'] == 'ForcedGCForTesting':
+      return 'forced'
+    if args['gcReason'] == 'IdleGC':
+      return 'idle'
+    return None  # Unknown
+
   def DumpMetric(page, name, values, unit, results):
     if values[name]:
       results.AddValue(list_of_scalar_values.ListOfScalarValues(
           page, name, unit, values[name]))
       results.AddValue(scalar.ScalarValue(
           page, name + '_max', unit, max(values[name])))
       results.AddValue(scalar.ScalarValue(
           page, name + '_total', unit, sum(values[name])))
 
   # Prepare
   values = {'oilpan_coalesce': []}
   for reason in _GC_REASONS:
     for stage in _GC_STAGES:
       values['oilpan_%s_%s' % (reason, stage)] = []
 
-  # Parse in time line
+  # Parse tarce events

[keishi, 2015/04/06 07:00:08]

nit: /tarce/trace/

[peria, 2015/04/06 07:06:01]

Done.

   reason = None
   mark_time = 0
   lazy_sweep_time = 0
   complete_sweep_time = 0
   for event in events:
     duration = event.thread_duration or event.duration
     if event.name == 'ThreadHeap::coalesce':
       values['oilpan_coalesce'].append(duration)
       continue
     if event.name == 'Heap::collectGarbage':
       if reason is not None:
         values['oilpan_%s_mark' % reason].append(mark_time)
         values['oilpan_%s_lazy_sweep' % reason].append(lazy_sweep_time)
         values['oilpan_%s_complete_sweep' % reason].append(complete_sweep_time)
 
-      reason = _GetGcReason(event.args)
+      reason = GetGcReason(event.args)
       mark_time = duration
       lazy_sweep_time = 0
       complete_sweep_time = 0
       continue
     if event.name == 'ThreadHeap::lazySweepPages':
       lazy_sweep_time += duration
       continue
     if event.name == 'ThreadState::completeSweep':
       complete_sweep_time += duration
       continue
@@ skipping 103 matching lines @@
 class OilpanGCTimesForInternals(_OilpanGCTimesBase):
   def __init__(self):
     super(OilpanGCTimesForInternals, self).__init__()
 
   @classmethod
   def CustomizeBrowserOptions(cls, options):
     # 'expose-internals-for-testing' can be enabled on content shell.
     assert 'content-shell' in options.browser_type
     options.AppendExtraBrowserArgs(['--expose-internals-for-testing',
                                     '--js-flags=--expose-gc'])