Changeset 0a0ef57

Timestamp:

05/28/15 08:00:26 (9 years ago)

Author:

Hal Finkel <hfinkel@…>

Branches:

master

Children:

134408c

Parents:

0ec59c5

git-author:

Hal Finkel <hfinkel@…> (05/28/15 08:00:26)

git-committer:

Hal Finkel <hfinkel@…> (05/28/15 08:00:26)

Message:

unw_get_proc_info does not work on ppc/ppc64; add getrusage info

Files:

• Makefile (modified) (1 diff)
• memlog.c (modified) (5 diffs)

Makefile

@@ -4 +4 @@
 UNW_HOME = ${HOME}/install/libunwind
 CPPFLAGS = -I$(UNW_HOME)/include
-LDFLAGS = -L$(UNW_HOME)/lib64 -Wl,-rpath,$(UNW_HOME)/lib64 -lunwind -lpthread
+LDFLAGS = -L$(UNW_HOME)/lib64 -Wl,-rpath,$(UNW_HOME)/lib64 -lunwind -lpthread -ldl
 
 all: memlog.so memlog.a

memlog.c

@@ -8 +8 @@
 #include <string.h>
 
+#include <sys/time.h>
+#include <sys/resource.h>
 #include <sys/types.h>
 #include <sys/stat.h>
@@ -32 +34 @@
   snprintf(log_name, PATH_MAX, "%s.%d.memory.log_file", u.nodename, getpid());
   log_file = fopen(log_name, "w");
+  if (!log_file)
+    fprintf(stderr, "fopen failed for '%s': %m\n", log_name);
 }
 
@@ -44 +48 @@
 
 static void print_context(unw_context_t *context) {
+  struct rusage usage;
+  if (getrusage(RUSAGE_SELF, &usage)) {
+    fprintf(stderr, "getrusage failed: %m\n");
+    return;
+  }
+
+  fprintf(log_file, "\t%ld.%06ld %ld", usage.ru_utime.tv_sec,
+          usage.ru_utime.tv_usec, usage.ru_maxrss);
+
+  int r;
   unw_cursor_t cursor;
-  if (unw_init_local(&cursor, context))
-    return;
-
-  while (unw_step(&cursor) > 0) {
-    unw_proc_info_t pip;
-    if (unw_get_proc_info(&cursor, &pip))
-      return;
-
+  if ((r = unw_init_local(&cursor, context))) {
+    fprintf(stderr, "unw_init_local failed: %s [%d]\n",
+            unw_strerror(r), r);
+    return;
+  }
+
+  while ((r = unw_step(&cursor)) > 0) {
     unw_word_t off;
     char proc_name[PATH_MAX];
@@ -58 +71 @@
       off = 0;
       strcpy(proc_name, "?");
+    }
+
+    unw_proc_info_t pip;
+    if ((r = unw_get_proc_info(&cursor, &pip))) {
+      // unw_get_proc_info is not supported on some platforms (ppc and ppc64,
+      // for example), so we need to try harder...
+      if (r == -UNW_EINVAL) {
+        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 ((r = unw_get_proc_info_by_ip(unw_local_addr_space, pc, &pip, NULL))) {
+          fprintf(stderr, "unw_get_proc_info_by_ip failed: %s [%d]\n",
+                  unw_strerror(r), r);
+          return;
+        }
+      } else {
+        fprintf(stderr, "unw_get_proc_info failed: %s [%d]\n",
+                unw_strerror(r), r);
+        return;
+      }
     }
 
@@ -71 +108 @@
             (void *) (pip.start_ip + off));
   }
+
+  if (r < 0)
+    fprintf(stderr, "unw_step failed: %s [%d]\n",
+            unw_strerror(r), r);
 }