Changeset 1bd82e0

Timestamp:

05/29/15 07:53:00 (9 years ago)

Author:

Hal Finkel <hfinkel@…>

Branches:

master

Children:

e1b15ec

Parents:

966f5de

git-author:

Hal Finkel <hfinkel@…> (05/29/15 07:53:00)

git-committer:

Hal Finkel <hfinkel@…> (05/29/15 07:53:00)

Message:

adjust for c++, use caching of dladdr, fixup for short names when making dot

Files:

• Makefile (modified) (2 diffs)
• memlog.cpp (moved) (moved from memlog.c) (5 diffs)
• memlog2dot (modified) (1 diff)

Makefile

@@ -1 @@
-CC = /soft/compilers/bgclang/wbin/bgclang
-CFLAGS = -std=gnu99 -O3 -g
+CXX = /soft/compilers/bgclang/wbin/bgclang++
+CXXFLAGS = -std=gnu++11 -O3 -g
 
 CPPFLAGS =
@@ -7 +7 @@
 all: libmemlog.so memlog_s.o
 
-memlog_s.o: memlog.c
-        $(CC) $(CPPFLAGS) $(CFLAGS) -c -o memlog_s.o memlog.c
+memlog_s.o: memlog.cpp
+        $(CXX) $(CPPFLAGS) $(CXXFLAGS) -c -o memlog_s.o memlog.cpp
 
-libmemlog.so: memlog.c
-        $(CC) $(CPPFLAGS) $(CFLAGS) $(LDFLAGS) -fPIC -shared -o libmemlog.so memlog.c
+libmemlog.so: memlog.cpp
+        $(CXX) $(CPPFLAGS) $(CXXFLAGS) $(LDFLAGS) -fPIC -shared -o libmemlog.so memlog.cpp
 
 clean:

memlog.cpp

@@ -3 +3 @@
 #endif
 
-#include <stdlib.h>
-#include <stdio.h>
+#include <cstdlib>
+#include <cstdio>
+#include <cstring>
+
+#include <unordered_map>
+#include <utility>
+
 #include <limits.h>
-#include <string.h>
-
 #include <malloc.h>
 #include <execinfo.h>
@@ -22 +25 @@
 #include <dlfcn.h>
 
+using namespace std;
+
 // NOTE: When static linking, this depends on linker wrapping.
 // Add to your LDFLAGS:
@@ -68 +73 @@
 // dladdr is, relatively, quit slow. For this to work on a large application,
 // we need to cache the lookup results.
-static int dladdr_cached(void *addr, Dl_info *info) {
-  return dladdr(addr, info);
+static int dladdr_cached(void * addr, Dl_info *info) {
+  static unordered_map<void *, Dl_info> dladdr_cache;
+
+  auto I = dladdr_cache.find(addr);
+  if (I == dladdr_cache.end()) {
+    int r;
+    if (!(r = dladdr(addr, info)))
+      memset(info, 0, sizeof(Dl_info));
+
+    dladdr_cache.insert(make_pair(addr, *info));
+    return r;
+  }
+
+  memcpy(info, &I->second, sizeof(Dl_info));
+  return 1;
 }
 
@@ -176 +194 @@
 // glibc exports its underlying malloc implementation under the name
 // __libc_malloc so that hooks like this can use it.
+extern "C" {
 extern void *__libc_malloc(size_t size);
 extern void *__libc_realloc(void *ptr, size_t size);
@@ -277 +296 @@
 }
 
+} // extern "C"
+

memlog2dot

@@ -206 +206 @@
     chomp($func);
 
+    # It sometimes happens that addr2line is a bit too smart: when debugging
+    # information is available, it might print a local alias for the
+    # function instead of the full name (for example, printing 'List'
+    # instead of 'Foo::List<int>::List(int, int const&)').
+    if ($node->{'proc_name'} ne '?') {
+      my $proc_name = $node->{'proc_name'};
+      $proc_name = `c++filt '$proc_name'`;
+      chomp($proc_name);
+
+      if (length($proc_name) > length($func)) {
+        $func = $proc_name;
+      }
+    }
+
     $ret .= $func . '\n';