Make dmprof handle long runs better

tools/deep_memory_profiler/subcommands/cat.py

 # Copyright 2013 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 json
 import logging
 import sys
 
 from lib.bucket import BUCKET_ID, COMMITTED, ALLOC_COUNT, FREE_COUNT
 from lib.ordered_dict import OrderedDict
@@ skipping 25 matching lines @@
         alternative_dirs_dict[target_path] = host_path
     (bucket_set, dumps) = SubCommand.load_basic_files(
         dump_path, True, alternative_dirs=alternative_dirs_dict)
 
     # Load all sorters.
     sorters = SorterSet()
 
     json_root = OrderedDict()
     json_root['version'] = 1
     json_root['run_id'] = None
-    for dump in dumps:
-      if json_root['run_id'] and json_root['run_id'] != dump.run_id:
-        LOGGER.error('Inconsistent heap profile dumps.')
-        json_root['run_id'] = ''
-        break
-      json_root['run_id'] = dump.run_id
     json_root['roots'] = []
     for sorter in sorters:
       if sorter.root:
         json_root['roots'].append([sorter.world, sorter.name])
     json_root['default_template'] = 'l2'
     json_root['templates'] = sorters.templates.as_dict()
 
     orders = OrderedDict()
     orders['worlds'] = OrderedDict()
     for world in ['vm', 'malloc']:
       orders['worlds'][world] = OrderedDict()
       orders['worlds'][world]['breakdown'] = OrderedDict()
       for sorter in sorters.iter_world(world):
         order = []
         for rule in sorter.iter_rule():
           if rule.name not in order:
             order.append(rule.name)
         orders['worlds'][world]['breakdown'][sorter.name] = order
     json_root['orders'] = orders
 
     json_root['snapshots'] = []
 
     for dump in dumps:
+      if json_root['run_id'] and json_root['run_id'] != dump.run_id:
+        LOGGER.error('Inconsistent heap profile dumps.')
+        json_root['run_id'] = ''
+      else:
+        json_root['run_id'] = dump.run_id
+
       LOGGER.info('Sorting a dump %s...' % dump.path)
       json_root['snapshots'].append(
           self._fill_snapshot(dump, bucket_set, sorters))
 
     if options.indent:
       json.dump(json_root, sys.stdout, indent=2)
     else:
       json.dump(json_root, sys.stdout)
     print ''
 
@@ skipping 101 matching lines @@
                          int(words[ALLOC_COUNT]),
                          int(words[FREE_COUNT]),
                          bucket)
       elif not bucket:
         # 'Not-found' buckets are all assumed as malloc buckets.
         yield MallocUnit(int(words[BUCKET_ID]),
                          int(words[COMMITTED]),
                          int(words[ALLOC_COUNT]),
                          int(words[FREE_COUNT]),
                          None)