Changeset 5a9481e

Timestamp:

05/29/15 04:19:35 (10 years ago)

Author:

Hal Finkel <hfinkel@…>

Branches:

master

Children:

966f5de

Parents:

bdaf020

git-author:

Hal Finkel <hfinkel@…> (05/29/15 04:19:35)

git-committer:

Hal Finkel <hfinkel@…> (05/29/15 04:19:35)

Message:

obtain lock to close files, etc.; misc. rearranging

File:

• memlog.c (modified) (8 diffs)

memlog.c

@@ -59 +59 @@
   in_malloc = 1;
 
+  // Avoid any racing by obtaining the lock.
+  if (pthread_mutex_lock(&log_mutex))
+    return;
+
   (void) fflush(log_file);
   (void) fclose(log_file);
+}
+
+// dladdr is, relatively, quit slow. For this to work on a large application,
+// we need to cache the lookup results.
+static int dladdr_cached(void *addr, Dl_info *info) {
+  return dladdr(addr, info);
 }
 
@@ -80 +90 @@
 
   int found_caller = 0;
-  caller =  __builtin_extract_return_addr((void*) caller);
   for (int pci = 0; pci < num_pcs; ++pci) {
     intptr_t pc = (intptr_t) pcs[pci];
@@ -98 +107 @@
     const char *file_name;
     Dl_info dlinfo;
-    if (dladdr((void *) pc, &dlinfo) && dlinfo.dli_fname &&
+    if (dladdr_cached((void *) pc, &dlinfo) && dlinfo.dli_fname &&
         *dlinfo.dli_fname) {
       intptr_t saddr = (intptr_t) dlinfo.dli_saddr;
@@ -181 +190 @@
 
 void *FUNC(malloc)(size_t size) {
-  const void *caller = __builtin_return_address(0);
+  const void *caller =
+    __builtin_extract_return_addr(__builtin_return_address(0));
 
   if (in_malloc)
@@ -197 +207 @@
 
 void *FUNC(realloc)(void *ptr, size_t size) {
-  const void *caller = __builtin_return_address(0);
+  const void *caller =
+    __builtin_extract_return_addr(__builtin_return_address(0));
 
   if (in_malloc)
@@ -216 +227 @@
 
 void *FUNC(calloc)(size_t nmemb, size_t size) {
-  const void *caller = __builtin_return_address(0);
+  const void *caller =
+    __builtin_extract_return_addr(__builtin_return_address(0));
 
   if (in_malloc)
@@ -233 +245 @@
 
 void *FUNC(memalign)(size_t boundary, size_t size) {
-  const void *caller = __builtin_return_address(0);
+  const void *caller =
+    __builtin_extract_return_addr(__builtin_return_address(0));
 
   if (in_malloc)
@@ -250 +263 @@
 
 void FUNC(free)(void *ptr) {
-  const void *caller = __builtin_return_address(0);
+  const void *caller =
+    __builtin_extract_return_addr(__builtin_return_address(0));
 
   if (in_malloc || !ptr)