Add support for PERF_RECORD_MMAP2 record type

tools/ll_prof.py

 #!/usr/bin/env python
 #
 # Copyright 2012 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 550 matching lines @@
 
 
 # Reference: /usr/include/linux/perf_event.h
 PERF_EVENT_HEADER_DESC = Descriptor([
   ("type", "u32"),
   ("misc", "u16"),
   ("size", "u16")
 ])
 
 
-# Reference: kernel/events/core.c
+# Reference: kernel/tools/perf/util/event.h
 PERF_MMAP_EVENT_BODY_DESC = Descriptor([
   ("pid", "u32"),
   ("tid", "u32"),
   ("addr", "u64"),
   ("len", "u64"),
   ("pgoff", "u64")
 ])
 
+# Reference: kernel/tools/perf/util/event.h
+PERF_MMAP2_EVENT_BODY_DESC = Descriptor([
+  ("pid", "u32"),
+  ("tid", "u32"),
+  ("addr", "u64"),
+  ("len", "u64"),
+  ("pgoff", "u64"),
+  ("maj", "u32"),
+  ("min", "u32"),
+  ("ino", "u64"),
+  ("ino_generation", "u64"),
+  ("prot", "u32"),
+  ("flags","u32")
+])
 
 # perf_event_attr.sample_type bits control the set of
 # perf_sample_event fields.
 PERF_SAMPLE_IP = 1 << 0
 PERF_SAMPLE_TID = 1 << 1
 PERF_SAMPLE_TIME = 1 << 2
 PERF_SAMPLE_ADDR = 1 << 3
 PERF_SAMPLE_READ = 1 << 4
 PERF_SAMPLE_CALLCHAIN = 1 << 5
 PERF_SAMPLE_ID = 1 << 6
@@ skipping 19 matching lines @@
   # before the callchain and has variable size.
   ("nr", "u64", PERF_SAMPLE_CALLCHAIN)
   # Raw data follows the callchain and is ignored.
 ]
 
 
 PERF_SAMPLE_EVENT_IP_FORMAT = "u64"
 
 
 PERF_RECORD_MMAP = 1
+PERF_RECORD_MMAP2 = 10
 PERF_RECORD_SAMPLE = 9
 
 
 class TraceReader(object):
   """Perf (linux-2.6/tools/perf) trace file reader."""
 
   _TRACE_HEADER_MAGIC = 4993446653023372624
 
   def __init__(self, trace_name):
     self.trace_file = open(trace_name, "r")
@@ skipping 26 matching lines @@
     self.offset += header.size
     return header, offset
 
   def ReadMmap(self, header, offset):
     mmap_info = PERF_MMAP_EVENT_BODY_DESC.Read(self.trace,
                                                offset + self.header_size)
     # Read null-terminated filename.
     filename = self.trace[offset + self.header_size + ctypes.sizeof(mmap_info):
                           offset + header.size]
     mmap_info.filename = HOST_ROOT + filename[:filename.find(chr(0))]
     return mmap_info

[Michael Achenbach, 2015/11/24 10:05:19]

nit: empty line

+  def ReadMmap2(self, header, offset):
+    mmap_info = PERF_MMAP2_EVENT_BODY_DESC.Read(self.trace,
+                                               offset + self.header_size)

[Michael Achenbach, 2015/11/24 10:05:19]

nit: indentation

+    # Read null-terminated filename.
+    filename = self.trace[offset + self.header_size + ctypes.sizeof(mmap_info):
+                          offset + header.size]
+    mmap_info.filename = HOST_ROOT + filename[:filename.find(chr(0))]
+    return mmap_info
 
   def ReadSample(self, header, offset):
     sample = self.sample_event_body_desc.Read(self.trace,
                                               offset + self.header_size)
     if not self.callchain_supported:
       return sample
     sample.ips = []
     offset += self.header_size + ctypes.sizeof(sample)
     for _ in xrange(sample.nr):
       sample.ips.append(
@@ skipping 290 matching lines @@
       break
     events += 1
     if header.type == PERF_RECORD_MMAP:
       start = time.time()
       mmap_info = trace_reader.ReadMmap(header, offset)
       if mmap_info.filename == HOST_ROOT + V8_GC_FAKE_MMAP:
         log_reader.ReadUpToGC()
       else:
         library_repo.Load(mmap_info, code_map, options)
       mmap_time += time.time() - start
+    elif header.type == PERF_RECORD_MMAP2:
+      start = time.time()
+      mmap_info = trace_reader.ReadMmap2(header, offset)
+      if mmap_info.filename == HOST_ROOT + V8_GC_FAKE_MMAP:
+        log_reader.ReadUpToGC()
+      else:
+        library_repo.Load(mmap_info, code_map, options)
+      mmap_time += time.time() - start
     elif header.type == PERF_RECORD_SAMPLE:
       ticks += 1
       start = time.time()
       sample = trace_reader.ReadSample(header, offset)
       code = code_map.Find(sample.ip)
       if code:
         code.Tick(sample.ip)
         if code.codetype == Code.OPTIMIZED:
           optimized_ticks += 1
         elif code.codetype == Code.FULL_CODEGEN:
@@ skipping 34 matching lines @@
       PrintTicks(optimized_ticks, ticks, "ticks in optimized code")
       PrintTicks(generated_ticks, ticks, "ticks in other lazily compiled code")
       PrintTicks(v8_internal_ticks, ticks, "ticks in v8::internal::*")
       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()