Changeset 69850c8

Timestamp:

05/28/15 12:09:35 (9 years ago)

Author:

Hal Finkel <hfinkel@…>

Branches:

master

Children:

a736d81

Parents:

134408c

git-author:

Hal Finkel <hfinkel@…> (05/28/15 12:09:35)

git-committer:

Hal Finkel <hfinkel@…> (05/28/15 12:09:35)

Message:

trying to avoid using unw_get_proc_name, etc.

File:

• memlog.c (modified) (5 diffs)

memlog.c

@@ -27 +27 @@
 static pthread_mutex_t log_mutex = PTHREAD_MUTEX_INITIALIZER;
 
+// The malloc hook might use functions that call malloc, and we need to make
+// sure this does not cause an infinite loop.
+static __thread int in_malloc = 0;
+
 __attribute__((__constructor__))
 static void record_init() {
@@ -44 +48 @@
     return;
 
+  // These functions might call free, but we're shutting down, so don't try to
+  // unwind the stack from here...
+  in_malloc = 1;
+
   (void) fflush(log_file);
   (void) fclose(log_file);
@@ -67 +75 @@
 
   while ((r = unw_step(&cursor)) > 0) {
+    unw_word_t pc;
+    if ((r = unw_get_reg(&cursor, UNW_REG_IP, &pc))) {
+      fprintf(stderr, "unw_get_reg UNW_REG_IP failed: %s [%d]\n",
+              unw_strerror(r), r);
+      return;
+    }
+
+    if (!pc)
+      break;
+
+    unw_word_t off, relpc;
+    const char *proc_name;
+    const char *file_name;
+    Dl_info dlinfo;
+    if (dladdr((void *) pc, &dlinfo) && dlinfo.dli_fname &&
+        *dlinfo.dli_fname) {
+      unw_word_t saddr = (unw_word_t) dlinfo.dli_saddr;
+      if (saddr) {
+#if defined(__powerpc64__) && !defined(__powerpc64le__)
+        // On PPC64 ELFv1, the symbol address points to the function descriptor, not
+        // the actual starting address.
+        saddr = *(unw_word_t*) saddr;
+#endif
+
+        off = pc - saddr;
+        relpc = pc - ((unw_word_t) dlinfo.dli_fbase);
+      } else {
+        off = 0;
+        relpc = 0;
+      }
+
+      proc_name = dlinfo.dli_sname;
+      if (!proc_name)
+        proc_name = "?";
+
+      file_name = dlinfo.dli_fname;
+    } else {
+      off = pc;
+      relpc = pc;
+      proc_name = "?";
+      file_name = "?";
+    }
+
+    fprintf(log_file, "\t%s (%s+0x%x) [0x%lx (0x%lx)]", file_name, proc_name, (int) off,
+            (long) pc, (long) relpc);
+
+#if 0
     unw_word_t off;
     char proc_name[PATH_MAX];
@@ -114 +169 @@
     fprintf(log_file, "\t%s (%s+0x%x) [%p]", file_name, proc_name, (int) off,
             (void *) (pip.start_ip + off));
+#endif
   }
 
@@ -159 +215 @@
 extern void __libc_free(void *ptr);
 
-// The malloc hook might use functions that call malloc, and we need to make
-// sure this does not cause an infinite loop.
-static __thread int in_malloc = 0;
-
 void *malloc(size_t size) {
   if (in_malloc)