Changeset 3105f50

Timestamp:

05/28/15 21:36:03 (9 years ago)

Author:

Hal Finkel <hfinkel@…>

Branches:

master

Children:

081a0fa

Parents:

430548b

git-author:

Hal Finkel <hfinkel@…> (05/28/15 21:36:03)

git-committer:

Hal Finkel <hfinkel@…> (05/28/15 21:36:03)

Message:

use the self link for no file

File:

• memlog.c (modified) (3 diffs)

memlog.c

@@ -29 +29 @@
 // sure this does not cause an infinite loop.
 static __thread int in_malloc = 0;
+static char self_path[PATH_MAX+1] = { '\0' };
 
 __attribute__((__constructor__))
@@ -35 +36 @@
   uname(&u);
 
-  char log_name[PATH_MAX];
-  snprintf(log_name, PATH_MAX, "%s.%d.memlog", u.nodename, getpid());
+  char log_name[PATH_MAX+1];
+  snprintf(log_name, PATH_MAX+1, "%s.%d.memlog", u.nodename, getpid());
   log_file = fopen(log_name, "w");
   if (!log_file)
     fprintf(stderr, "fopen failed for '%s': %m\n", log_name);
+
+  const char *link_name = "/proc/self/exe";
+  readlink(link_name, self_path, PATH_MAX);
 }
 
@@ -110 +114 @@
       file_name = dlinfo.dli_fname;
     } else {
-      off = pc;
-      relpc = pc;
+      // We don't know these...
+      off = 0;
+      relpc = 0;
       proc_name = "?";
-      file_name = "?";
+
+      // If we can't determine the file, assume it is the base executable
+      // (which does the right thing for statically-linked binaries).
+      file_name = self_path;
     }