Cleanup metrics in memreport.py.

tools/android/memdump/memreport.py

 #!/usr/bin/env python
 #
 # Copyright (c) 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 collections
 import json
 import optparse
 import os
 import re
 import threading
 import time
 import sys
 
 from sets import Set
 from string import Template
 
 sys.path.append(os.path.join(sys.path[0], os.pardir, os.pardir, os.pardir,
                              'build','android'))
 from pylib import android_commands
 from pylib import constants
 
 
 _ENTRIES = [
     ('Total', '.* r... .*'),
     ('Read-only', '.* r--. .*'),
     ('Read-write', '.* rw.. .*'),
     ('Executable', '.* ..x. .*'),
-    ('Anonymous total', '.* .... .* .*other=[0-9]+ ($|.*chromium:.*)'),
-    ('Anonymous read-write', '.* rw.. .* .*other=[0-9]+ ($|.*chromium:.*)'),
+    ('Anonymous total', '.* .... .* .*other=[0-9]+ $'),
+    ('Anonymous read-write', '.* rw.. .* .*other=[0-9]+ $'),
     ('Anonymous executable (JIT\'ed code)', '.* ..x. .* shared_other=[0-9]+ $'),
     ('File total', '.* .... .* /.*'),
     ('File read-write', '.* rw.. .* /.*'),
     ('File executable', '.* ..x. .* /.*'),
-    ('chromium mmap', '.* r... .*chromium:.*'),
-    ('chromium TransferBuffer', '.* r... .*chromium:.*CreateTransferBuffer.*'),
-    ('Galaxy Nexus GL driver', '.* r... .*pvrsrvkm.*'),
+    ('/dev files', '.* r... .* /dev/.*'),
     ('Dalvik', '.* rw.. .* /.*dalvik.*'),
     ('Dalvik heap', '.* rw.. .* /.*dalvik-heap.*'),
-    ('Native heap (jemalloc)', '.* r... .* /.*jemalloc.*'),
-    ('System heap', '.* r... .* \\[heap\\]'),
+    ('Native heap (malloc)', '.* r... .* .*malloc.*'),
     ('Ashmem', '.* rw.. .* /dev/ashmem .*'),
     ('libchromeview.so total', '.* r... .* /.*libchromeview.so'),
     ('libchromeview.so read-only', '.* r--. .* /.*libchromeview.so'),
     ('libchromeview.so read-write', '.* rw-. .* /.*libchromeview.so'),
     ('libchromeview.so executable', '.* r.x. .* /.*libchromeview.so'),
 ]
 
 
 def _CollectMemoryStats(memdump, region_filters):
   processes = []
@@ skipping 212 matching lines @@
                     type='int',
                     help='Interval in seconds for manual collections.')
   options, args = parser.parse_args(argv)
   if options.manual_graph:
     return _RunManualGraph(options.package, options.interval)
   _DumpCSV(_CollectMemoryStats(sys.stdin, [value for (key, value) in _ENTRIES]))
 
 
 if __name__ == '__main__':
   main(sys.argv)