supersize: Add symbol.template_name, and strip <>s from symbol.name

tools/binary_size/libsupersize/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 35 matching lines @@
   # 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)
   for i, key in enumerate(path_tuples):
     path_tuples[key] = i
   file_obj.write('%d\n' % len(path_tuples))
   file_obj.writelines('%s\t%s\n' % pair for pair in path_tuples)
   _LogSize(file_obj, 'paths')  # For libchrome, adds 200kb.
 
   # Symbol counts by section.
-  by_section = size_info.symbols.GroupBySectionName().Sorted(
-      key=lambda s:(s[0].IsBss(), s[0].address, s.name))
+  by_section = size_info.symbols.GroupedBySectionName().Sorted(
+      key=lambda s:(s[0].IsBss(), s[0].address, s.full_name))
   file_obj.write('%s\n' % '\t'.join(g.name for g in by_section))
   file_obj.write('%s\n' % '\t'.join(str(len(g)) for g in by_section))
 
   def write_numeric(func, delta=False):
     for group in by_section:
       prev_value = 0
       last_sym = group[-1]
       for symbol in group:
         value = func(symbol)
         if delta:
           value, prev_value = value - prev_value, value
         file_obj.write(str(value))
         if symbol is not last_sym:
           file_obj.write(' ')
       file_obj.write('\n')
 
   write_numeric(lambda s: s.address, delta=True)
   _LogSize(file_obj, 'addresses')  # For libchrome, adds 300kb.
   # Do not write padding, it will be recalcualted from addresses on load.
   write_numeric(lambda s: s.size_without_padding)
   _LogSize(file_obj, 'sizes')  # For libchrome, adds 300kb
   write_numeric(lambda s: path_tuples[(s.object_path, s.source_path)],
                 delta=True)
   _LogSize(file_obj, 'path indices')  # For libchrome: adds 125kb.
 
   prev_aliases = None
   for group in by_section:
     for symbol in group:
-      # Do not write name when full_name exists. It will be derived on load.
-      file_obj.write(symbol.full_name or symbol.name)
+      file_obj.write(symbol.full_name)
       if symbol.aliases and symbol.aliases is not prev_aliases:
         file_obj.write('\t0%x' % symbol.num_aliases)
       prev_aliases = symbol.aliases
       if symbol.flags:
         file_obj.write('\t%x' % symbol.flags)
       file_obj.write('\n')
   _LogSize(file_obj, 'names (final)')  # For libchrome: adds 3.5mb.
 
 
 def _LoadSizeInfoFromFile(file_obj):
@@ skipping 46 matching lines @@
 
       if len(parts) == 3:
         aliases_part = parts[1]
         flags_part = parts[2]
       elif len(parts) == 2:
         if parts[1][0] == '0':
           aliases_part = parts[1]
         else:
           flags_part = parts[1]
 
-      name = parts[0]
+      full_name = parts[0]
       flags = int(flags_part, 16) if flags_part else 0
       num_aliases = int(aliases_part, 16) if aliases_part else 0
 
       new_sym = models.Symbol.__new__(models.Symbol)
       new_sym.section_name = cur_section_name
       new_sym.address = addresses[section_index][i]
       new_sym.size = sizes[section_index][i]
-      new_sym.name = name
+      new_sym.full_name = full_name
       paths = path_tuples[path_indices[section_index][i]]
       new_sym.object_path = paths[0]
       new_sym.source_path = paths[1]
       new_sym.flags = flags
       new_sym.padding = 0  # Derived
-      new_sym.full_name = None  # Derived
+      new_sym.template_name = ''  # Derived
+      new_sym.name = ''  # Derived
 
       if num_aliases:
         assert alias_counter == 0
         new_sym.aliases = [new_sym]
         alias_counter = num_aliases - 1
       elif alias_counter > 0:
         new_sym.aliases = raw_symbols[symbol_idx - 1].aliases
         new_sym.aliases.append(new_sym)
         alias_counter -= 1
       else:
         new_sym.aliases = None
 
       raw_symbols[symbol_idx] = new_sym
       symbol_idx += 1
 
-  return models.SizeInfo(section_sizes, models.SymbolGroup(raw_symbols),
-                         metadata=metadata)
+  return models.SizeInfo(section_sizes, raw_symbols, metadata=metadata)
 
 
 def SaveSizeInfo(size_info, path):
   """Saves |size_info| to |path}."""
   if os.environ.get('SUPERSIZE_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)