Changeset 134408c

Timestamp:

05/28/15 08:18:21 (10 years ago)

Author:

Hal Finkel <hfinkel@…>

Branches:

master

Children:

69850c8

Parents:

0a0ef57

git-author:

Hal Finkel <hfinkel@…> (05/28/15 08:18:21)

git-committer:

Hal Finkel <hfinkel@…> (05/28/15 08:18:21)

Message:

print tid; break on UNW_ENOINFO

File:

• memlog.c (modified) (5 diffs)

memlog.c

@@ -8 +8 @@
 #include <string.h>
 
+#include <sys/syscall.h>
 #include <sys/time.h>
 #include <sys/resource.h>
@@ -54 +55 @@
   }
 
-  fprintf(log_file, "\t%ld.%06ld %ld", usage.ru_utime.tv_sec,
-          usage.ru_utime.tv_usec, usage.ru_maxrss);
+  fprintf(log_file, "\t%ld.%06ld %ld %ld", usage.ru_utime.tv_sec,
+          usage.ru_utime.tv_usec, usage.ru_maxrss, syscall(SYS_gettid));
 
   int r;
@@ -86 +87 @@
 
         if ((r = unw_get_proc_info_by_ip(unw_local_addr_space, pc, &pip, NULL))) {
+          if (r == -UNW_ENOINFO)
+            break; // the cursor is now invalid; must break here.
+
           fprintf(stderr, "unw_get_proc_info_by_ip failed: %s [%d]\n",
                   unw_strerror(r), r);
@@ -91 +95 @@
         }
       } else {
+        if (r == -UNW_ENOINFO)
+          break; // the cursor is now invalid; must break here.
+
         fprintf(stderr, "unw_get_proc_info failed: %s [%d]\n",
                 unw_strerror(r), r);
@@ -109 +116 @@
   }
 
-  if (r < 0)
+  if (r < 0 && r != -UNW_ENOINFO)
     fprintf(stderr, "unw_step failed: %s [%d]\n",
             unw_strerror(r), r);