//tools/binary_size: Add Disassemble() to console.py. Tweak metadata.

tools/binary_size/file_format.py

 # Copyright 2017 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.
 
 """Deals with loading & saving .size files."""
 
 import cStringIO
 import calendar
 import collections
 import datetime
@@ skipping 14 matching lines @@
     return
   file_obj.flush()
   size = os.fstat(file_obj.fileno()).st_size
   logging.debug('File size with %s: %d' % (desc, size))
 
 
 def _SaveSizeInfoToFile(size_info, file_obj):
   file_obj.write('# Created by //tools/binary_size\n')
   file_obj.write('%s\n' % _SERIALIZATION_VERSION)
   headers = {
-      'tag': size_info.tag,
+      'metadata': size_info.metadata,
       'section_sizes': size_info.section_sizes,
   }
-  if size_info.timestamp:
-    headers['timestamp'] = calendar.timegm(size_info.timestamp.timetuple())
   metadata_str = json.dumps(headers, file_obj, indent=2, sort_keys=True)
   file_obj.write('%d\n' % len(metadata_str))
   file_obj.write(metadata_str)
   file_obj.write('\n')
   _LogSize(file_obj, 'header')  # For libchrome: 570 bytes.
 
   # Store a single copy of all paths and have them referenced by index.
   # Using an OrderedDict makes the indices more repetitive (better compression).
   path_tuples = collections.OrderedDict.fromkeys(
       (s.object_path, s.source_path) for s in size_info.symbols)
@@ skipping 42 matching lines @@
 
 def _LoadSizeInfoFromFile(file_obj):
   """Loads a size_info from the given file."""
   lines = iter(file_obj)
   next(lines)  # Comment line.
   actual_version = next(lines)[:-1]
   assert actual_version == _SERIALIZATION_VERSION, (
       'Version mismatch. Need to write some upgrade code.')
   json_len = int(next(lines))
   json_str = file_obj.read(json_len)
-  metadata = json.loads(json_str)
-  timestamp = metadata.get('timestamp')
-  if timestamp is not None:
-    timestamp = datetime.datetime.utcfromtimestamp(timestamp)
-  tag = metadata['tag']
-  section_sizes = metadata['section_sizes']
-
+  headers = json.loads(json_str)
+  section_sizes = headers['section_sizes']
+  metadata = headers['metadata']
   lines = iter(file_obj)
   next(lines)  # newline after closing } of json.
 
   num_path_tuples = int(next(lines))
   path_tuples = [None] * num_path_tuples
   for i in xrange(num_path_tuples):
     path_tuples[i] = next(lines)[:-1].split('\t')
 
   section_names = next(lines)[:-1].split('\t')
   section_counts = [int(c) for c in next(lines)[:-1].split('\t')]
@@ skipping 30 matching lines @@
       paths = path_tuples[path_indices[section_index][i]]
       new_sym.object_path = paths[0]
       new_sym.source_path = paths[1]
       new_sym.is_anonymous = is_anonymous
       new_sym.padding = 0  # Derived
       new_sym.full_name = None  # Derived
       symbol_list[symbol_idx] = new_sym
       symbol_idx += 1
 
   symbols = models.SymbolGroup(symbol_list)
-  return models.SizeInfo(section_sizes, symbols, timestamp=timestamp, tag=tag)
+  return models.SizeInfo(section_sizes, symbols, metadata=metadata)
 
 
 def SaveSizeInfo(size_info, path):
   """Saves |size_info| to |path}."""
   if os.environ.get('MEASURE_GZIP') == '1':
     with gzip.open(path, 'wb') as f:
       _SaveSizeInfoToFile(size_info, f)
   else:
     # It is seconds faster to do gzip in a separate step. 6s -> 3.5s.
     stringio = cStringIO.StringIO()
     _SaveSizeInfoToFile(size_info, stringio)
 
     logging.debug('Serialization complete. Gzipping...')
     stringio.seek(0)
     with gzip.open(path, 'wb') as f:
       shutil.copyfileobj(stringio, f)
 
 
 def LoadSizeInfo(path):
   """Returns a SizeInfo loaded from |path|."""
   with gzip.open(path) as f:
     return _LoadSizeInfoFromFile(f)