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

tools/binary_size/describe.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.
 """Methods for converting model objects to human-readable formats."""
 
 import datetime
 import itertools
 import time
 
 import models
@@ skipping 175 matching lines @@
     anonymous_syms = attributed_syms.Inverted()
     if star_syms or anonymous_syms:
       missing_size = star_syms.size + anonymous_syms.size
       yield ('+ Without %d merge sections and %d anonymous entries ('
                   'accounting for %d bytes):') % (
           len(star_syms),  len(anonymous_syms), missing_size)
       yield '+ ' + one_stat(attributed_syms)
 
 
 def _UtcToLocal(utc):
-    epoch = time.mktime(utc.timetuple())
-    offset = (datetime.datetime.fromtimestamp(epoch) -
-              datetime.datetime.utcfromtimestamp(epoch))
-    return utc + offset
+  epoch = time.mktime(utc.timetuple())
+  offset = (datetime.datetime.fromtimestamp(epoch) -
+            datetime.datetime.utcfromtimestamp(epoch))
+  return utc + offset
 
 
 def DescribeSizeInfoMetadata(size_info):
-  time_str = 'Unknown'
-  if size_info.timestamp:
-    time_str = _UtcToLocal(size_info.timestamp).strftime('%Y-%m-%d %H:%M:%S')
-  return 'mapfile mtime=%s \ttag=%s' % (time_str, size_info.tag)
+  display_dict = size_info.metadata.copy()
+  timestamp = display_dict.get(models.METADATA_ELF_MTIME)
+  if timestamp:
+    timestamp_obj = datetime.datetime.utcfromtimestamp(timestamp)
+    display_dict[models.METADATA_ELF_MTIME] = (
+        _UtcToLocal(timestamp_obj).strftime('%Y-%m-%d %H:%M:%S'))
+  return ' '.join(sorted('%s=%s' % t for t in display_dict.iteritems()))
 
 
 def GenerateLines(obj, verbose=False):
   return Describer(verbose).GenerateLines(obj)
 
 
 def WriteLines(lines, func):
   for l in lines:
     func(l)
     func('\n')