Refactor dmprof: split lib.Dump into lib.Dump and lib.DeepDump.

tools/deep_memory_profiler/lib/deep_dump.py

-# Copyright 2013 The Chromium Authors. All rights reserved.
+# 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 copy
 import datetime
 import logging
 import os
 import re
 import time
 
+from lib.dump import Dump
 from lib.exceptions import EmptyDumpException, InvalidDumpException
 from lib.exceptions import ObsoleteDumpVersionException, ParsingException
 from lib.pageframe import PageFrame
 from lib.range_dict import ExclusiveRangeDict
 from lib.symbol import procfs
 
 
 LOGGER = logging.getLogger('dmprof')
 VIRTUAL, COMMITTED, ALLOC_COUNT, FREE_COUNT, _AT, BUCKET_ID = range(6)
 
@@ skipping 15 matching lines @@
 
 # DUMP_DEEP_5 doesn't separate sections for malloc and mmap.
 # malloc and mmap are identified in bucket files.
 # DUMP_DEEP_5 should be processed by POLICY_DEEP_4.
 DUMP_DEEP_5 = 'DUMP_DEEP_5'
 
 # DUMP_DEEP_6 adds a mmap list to DUMP_DEEP_5.
 DUMP_DEEP_6 = 'DUMP_DEEP_6'
 
 
-class Dump(object):
+class DeepDump(Dump):
   """Represents a heap profile dump."""
 
   _PATH_PATTERN = re.compile(r'^(.*)\.([0-9]+)\.([0-9]+)\.heap$')
 
   _HOOK_PATTERN = re.compile(
       r'^ ([ \(])([a-f0-9]+)([ \)])-([ \(])([a-f0-9]+)([ \)])\s+'
       r'(hooked|unhooked)\s+(.+)$', re.IGNORECASE)
 
   _HOOKED_PATTERN = re.compile(r'(?P<TYPE>.+ )?(?P<COMMITTED>[0-9]+) / '
                                '(?P<RESERVED>[0-9]+) @ (?P<BUCKETID>[0-9]+)')
   _UNHOOKED_PATTERN = re.compile(r'(?P<TYPE>.+ )?(?P<COMMITTED>[0-9]+) / '
                                  '(?P<RESERVED>[0-9]+)')
 
   _OLD_HOOKED_PATTERN = re.compile(r'(?P<TYPE>.+) @ (?P<BUCKETID>[0-9]+)')
   _OLD_UNHOOKED_PATTERN = re.compile(r'(?P<TYPE>.+) (?P<COMMITTED>[0-9]+)')
 
   _TIME_PATTERN_FORMAT = re.compile(
       r'^Time: ([0-9]+/[0-9]+/[0-9]+ [0-9]+:[0-9]+:[0-9]+)(\.[0-9]+)?')
   _TIME_PATTERN_SECONDS = re.compile(r'^Time: ([0-9]+)$')
 
   def __init__(self, path, modified_time):
+    super(DeepDump, self).__init__()
     self._path = path
     matched = self._PATH_PATTERN.match(path)
     self._pid = int(matched.group(2))
     self._count = int(matched.group(3))
     self._time = modified_time
     self._map = {}
     self._procmaps = ExclusiveRangeDict(ProcMapsEntryAttribute)
     self._stacktrace_lines = []
     self._global_stats = {} # used only in apply_policy
 
@@ skipping 321 matching lines @@
         True if the given stacktrace_line is valid.
     """
     words = stacktrace_line.split()
     if len(words) < BUCKET_ID + 1:
       return False
     if words[BUCKET_ID - 1] != '@':
       return False
     return True
 
 
-class DumpList(object):
-  """Represents a sequence of heap profile dumps.
-
-  Individual dumps are loaded into memory lazily as the sequence is accessed,
-  either while being iterated through or randomly accessed.  Loaded dumps are
-  not cached, meaning a newly loaded Dump object is returned every time an
-  element in the list is accessed.
-  """
-
-  def __init__(self, dump_path_list):
-    self._dump_path_list = dump_path_list
-
-  @staticmethod
-  def load(path_list):
-    return DumpList(path_list)
-
-  def __len__(self):
-    return len(self._dump_path_list)
-
-  def __iter__(self):
-    for dump in self._dump_path_list:
-      yield Dump.load(dump)
-
-  def __getitem__(self, index):
-    return Dump.load(self._dump_path_list[index])
-
-
 class ProcMapsEntryAttribute(ExclusiveRangeDict.RangeAttribute):
   """Represents an entry of /proc/maps in range_dict.ExclusiveRangeDict."""
   _DUMMY_ENTRY = procfs.ProcMapsEntry(
       0,     # begin
       0,     # end
       '-',   # readable
       '-',   # writable
       '-',   # executable
       '-',   # private
       0,     # offset
@@ skipping 34 matching lines @@
   Returns:
       A pair of an integer indicating a line number after skipped, and a
       boolean value which is True if found a line which skipping_condition
       is False for.
   """
   while skipping_condition(index):
     index += 1
     if index >= max_index:
       return index, False
   return index, True