Fix CPU profiling for Crankshaft.

tools/ll_prof.py

 #!/usr/bin/env python
 #
 # Copyright 2010 the V8 project authors. All rights reserved.
 # Redistribution and use in source and binary forms, with or without
 # modification, are permitted provided that the following conditions are
 # met:
 #
 #     * Redistributions of source code must retain the above copyright
 #       notice, this list of conditions and the following disclaimer.
 #     * Redistributions in binary form must reproduce the above
@@ skipping 335 matching lines @@
     self.header_size = header_size
 
 
 class CodeLogReader(object):
   """V8 code event log reader."""
 
   _CODE_INFO_RE = re.compile(
     r"code-info,([^,]+),(\d+)")
 
   _CODE_CREATE_RE = re.compile(
-    r"code-creation,([^,]+),(0x[a-f0-9]+),(\d+),\"(.*)\"(?:,(\d+))?")
+    r"code-creation,([^,]+),(0x[a-f0-9]+),(\d+),\"(.*)\"(?:,(0x[a-f0-9]+),([~*])?)?(?:,(\d+))?")
 
   _CODE_MOVE_RE = re.compile(
     r"code-move,(0x[a-f0-9]+),(0x[a-f0-9]+)")
 
   _CODE_DELETE_RE = re.compile(
     r"code-delete,(0x[a-f0-9]+)")
 
   _SNAPSHOT_POS_RE = re.compile(
     r"snapshot-pos,(0x[a-f0-9]+),(\d+)")
 
@@ skipping 26 matching lines @@
         return made_progress
 
       match = CodeLogReader._CODE_CREATE_RE.match(line)
       if match:
         start_address = int(match.group(2), 16) + code_header_size
         end_address = start_address + int(match.group(3)) - code_header_size
         if start_address in self.address_to_snapshot_name:
           name = self.address_to_snapshot_name[start_address]
           origin = JS_SNAPSHOT_ORIGIN
         else:
-          name = "%s:%s" % (match.group(1), match.group(4))
+          if match.group(6):

[Vitaly Repeshko, 2011/02/22 15:11:19]

Could you please assign these groups (1, 4, 6) to locals (like it's done for
"start_address") to make this code readable?

[mnaganov (inactive), 2011/02/22 16:18:22]

Done.

+            name = "%s:%s%s" % (match.group(1), match.group(6), match.group(4))
+          else:
+            name = "%s:%s" % (match.group(1), match.group(4))
           origin = JS_ORIGIN
         if self.is_snapshot:
           origin_offset = 0
         else:
-          origin_offset = int(match.group(5))
+          origin_offset = int(match.group(7))
         code = Code(name, start_address, end_address, origin, origin_offset)
         conficting_code = self.code_map.Find(start_address)
         if conficting_code:
           CodeLogReader._HandleCodeConflict(conficting_code, code)
           # TODO(vitalyr): this warning is too noisy because of our
           # attempts to reconstruct code log from the snapshot.
           # print >>sys.stderr, \
           #     "Warning: Skipping duplicate code log entry %s" % code
           continue
         self.code_map.Add(code)
@@ skipping 527 matching lines @@
       print "%10d total ticks" % ticks
       print "%10d ticks not in symbols" % missed_ticks
       print "%10d unaccounted ticks" % really_missed_ticks
       print "%10d total symbols" % len([c for c in code_map.AllCode()])
       print "%10d used symbols" % len([c for c in code_map.UsedCode()])
       print "%9.2fs library processing time" % mmap_time
       print "%9.2fs tick processing time" % sample_time
 
   log_reader.Dispose()
   trace_reader.Dispose()