print stack traces for where leaks were allocated

diff --git a/src/kit/kit-memory.c b/src/kit/kit-memory.c
index 50d9abc..f4f84b4 100644 (file)
--- a/src/kit/kit-memory.c
+++ b/src/kit/kit-memory.c
@@ -59,12 +59,29 @@ static int _cur_allocs = 0;
 static int _total_allocs = 0;
 static int _fail_nth = -1;
 
+
+#if defined(KIT_BUILD_TESTS) && defined(BUILT_R_DYNAMIC)
+typedef struct _KitAllocationEntry {
+        const void *memory;
+        void *backtrace[100];
+        int backtrace_size;
+        struct _KitAllocationEntry *next;
+} KitAllocationEntry;
+
+static KitAllocationEntry *alloc_list_head = NULL;
+#endif
+
 void 
 _kit_memory_reset (void)
 {
         _cur_allocs = 0;
         _total_allocs = 0;
         _fail_nth = -1;
+
+#if defined(KIT_BUILD_TESTS) && defined(BUILT_R_DYNAMIC)
+        /* TODO: free existing allocs */
+        alloc_list_head = NULL;
+#endif
 }
 
 int 
@@ -85,6 +102,67 @@ _kit_memory_fail_nth_alloc (int number)
         _fail_nth = number;
 }
 
+static inline void
+_alloc_add (const void *memory)
+{
+#if defined(KIT_BUILD_TESTS) && defined(BUILT_R_DYNAMIC)
+        KitAllocationEntry *entry;
+
+        entry = malloc (sizeof (KitAllocationEntry));
+        entry->memory = memory;
+        entry->backtrace_size = backtrace (entry->backtrace, 100);
+        entry->next = alloc_list_head;
+
+        alloc_list_head = entry;
+#endif
+}
+
+static inline void
+_alloc_remove (const void *memory)
+{
+#if defined(KIT_BUILD_TESTS) && defined(BUILT_R_DYNAMIC)
+        KitAllocationEntry *l;
+        KitAllocationEntry **prev;
+
+        prev = &alloc_list_head;
+        for (l = alloc_list_head; l != NULL; l = l->next) {
+                if (l->memory == memory) {
+                        *prev = l->next;
+                        free (l);
+                        break;
+                }
+
+                prev = &(l->next);
+        }
+#endif
+}
+
+void
+_kit_memory_print_outstanding_allocations (void)
+{
+#if defined(KIT_BUILD_TESTS) && defined(BUILT_R_DYNAMIC)
+        KitAllocationEntry *l;
+        for (l = alloc_list_head; l != NULL; l = l->next) {
+                int i;
+                char **syms;
+
+                syms = backtrace_symbols (l->backtrace, l->backtrace_size);
+
+                i = 0;
+                while (i < l->backtrace_size)
+                {
+                        fprintf (stderr, "  %s\n", syms[i]);
+                        ++i;
+                }
+                fprintf (stderr, "\n");
+                fflush (stderr);
+
+                free (syms);
+        }
+#endif
+}
+
+
 /**
  * kit_malloc:
  * @bytes: number of 8-bit bytes to allocate
@@ -113,6 +191,7 @@ kit_malloc (size_t bytes)
         if (p != NULL)  {
                 _cur_allocs++;
                 _total_allocs++;
+                _alloc_add (p);
         }
 
         return p;
@@ -141,6 +220,7 @@ kit_malloc0 (size_t bytes)
         if (p != NULL)  {
                 _cur_allocs++;
                 _total_allocs++;
+                _alloc_add (p);
         }
 
         return p;
@@ -173,7 +253,10 @@ kit_realloc (void *memory, size_t bytes)
                 return NULL;
         }
 
+        _alloc_remove (p);
         p = realloc (memory, bytes);
+        if (p != NULL)
+                _alloc_add (p);
 
         return p;
 }
@@ -189,6 +272,7 @@ kit_free (void *memory)
 {
         free (memory);
         if (memory != NULL) {
+                _alloc_remove (memory);
                 _cur_allocs--;
         }
 }

diff --git a/src/kit/kit-memory.h b/src/kit/kit-memory.h
index 7c887fc..fae2da1 100644 (file)
--- a/src/kit/kit-memory.h
+++ b/src/kit/kit-memory.h
@@ -71,6 +71,7 @@ void  _kit_memory_reset (void);
 int   _kit_memory_get_current_allocations (void);
 int   _kit_memory_get_total_allocations (void);
 void  _kit_memory_fail_nth_alloc (int number);
+void  _kit_memory_print_outstanding_allocations (void);
 
 KIT_END_DECLS
 

diff --git a/src/kit/kit-test.c b/src/kit/kit-test.c
index 5aae02e..3f8718f 100644 (file)
--- a/src/kit/kit-test.c
+++ b/src/kit/kit-test.c
@@ -98,6 +98,7 @@ kit_test_run (KitTest **tests, size_t num_tests)
                 delta = _kit_memory_get_current_allocations ();
                 if (delta != 0) {
                         printf ("  Unit test leaked %d allocations\n", delta);
+                        _kit_memory_print_outstanding_allocations ();
                         ret = FALSE;
                 }
                 if (num_fd != num_fd_after) {
@@ -121,7 +122,8 @@ kit_test_run (KitTest **tests, size_t num_tests)
                         
                         delta = _kit_memory_get_current_allocations ();
                         if (delta != 0) {
-                                printf ("  Unit test leaked %d allocations\n", delta);
+                                printf ("  Unit test leaked %d allocations:\n", delta);
+                                _kit_memory_print_outstanding_allocations ();
                                 ret = FALSE;
                         }
                         if (num_fd != num_fd_after) {