Changeset 4c51931

Timestamp:

06/03/15 01:17:08 (9 years ago)

Author:

Hal Finkel <hfinkel@…>

Branches:

master

Children:

3c9fc94

Parents:

ed8b809

git-author:

Hal Finkel <hfinkel@…> (06/03/15 01:17:08)

git-committer:

Hal Finkel <hfinkel@…> (06/03/15 01:17:08)

Message:

move cache from bring a local static to avoid deadlocking cxa_atexit

File:

• memlog.cpp (modified) (6 diffs)

memlog.cpp

@@ -14 +14 @@
 
 #include <limits.h>
+#include <errno.h>
 #include <malloc.h>
 #include <execinfo.h>
@@ -40 +41 @@
 //   -Wl,--wrap,malloc,--wrap,free,--wrap,realloc,--wrap,calloc,--wrap,memalign /path/to/memlog_s.o -lpthread -ldl
 
-FILE *log_file = 0;
+static FILE *log_file = 0;
 static pthread_mutex_t log_mutex = PTHREAD_MUTEX_INITIALIZER;
 
@@ -49 +50 @@
 
 #ifdef __bgq__
-int on_bgq = 0;
-#endif
-
-void *initial_brk = 0;
+static int on_bgq = 0;
+#endif
+
+static void *initial_brk = 0;
+
+static unordered_map<void *, Dl_info> *dladdr_cache = 0;
 
 __attribute__((__constructor__))
@@ -111 +114 @@
   (void) fflush(log_file);
   (void) fclose(log_file);
+
+  if (dladdr_cache)
+    delete dladdr_cache;
 }
 
@@ -116 +122 @@
 // we need to cache the lookup results.
 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()) {
+  if (!dladdr_cache)
+    dladdr_cache = new unordered_map<void *, Dl_info>;
+
+  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));
+    dladdr_cache->insert(make_pair(addr, *info));
     return r;
   }
@@ -246 +253 @@
 
 #ifdef __PIC__
-int (*__real_posix_memalign)(void **memptr, size_t alignment, size_t size) = 0;
-
-void *(*__real_mmap)(void *addr, size_t length, int prot, int flags,
-                     int fd, off_t offset) = 0;
-void *(*__real_mmap64)(void *addr, size_t length, int prot, int flags,
-                       int fd, off64_t offset) = 0;
-int (*__real_munmap)(void *addr, size_t length) = 0;
+static int (*__real_posix_memalign)(void **memptr, size_t alignment,
+                                    size_t size) = 0;
+
+static void *(*__real_mmap)(void *addr, size_t length, int prot, int flags,
+                            int fd, off_t offset) = 0;
+static void *(*__real_mmap64)(void *addr, size_t length, int prot, int flags,
+                              int fd, off64_t offset) = 0;
+static int (*__real_munmap)(void *addr, size_t length) = 0;
 #else
 extern "C" {