Changeset 6654 for trunk/ARBDB/arbdb.cxx

Timestamp:

13/05/10 17:30:03 (2 years ago)

Author:

westram

Message:

• This patch stuffs all memory leaks in ARBDB (as far as covered by unit-tests) for DEBUG and NDEBUG version!
• ARBDB global data (aka 'gb_local')
  • track number of opened/closed DBs
  • GBK_install_SIGSEGV_handler only once in GB_init_gb()
  • when closing last DB -> call GB_exit_gb() freeing more memory (also called atexit, including assertion failing if a DB is still open)
  • added class ARBDB_memory_manager (just calls gbm_init_mem + gbm_flush_mem)
  • GB_exit_gb flushes ARBDB_memory_manager (if all blocks were freed by gbm_free_mem, everything will be flushed)
• fixed a few more static buffer leaks
• gb_make_entry - alloc correct blocksizes for GB_STRING and GB_LINK
• fixed a hack in gb_read_bin_rek_V2
  • was increasing size of memory block to avoid illegal memory access in decompress (introduced in [1003]; may occur again)
  • due to mismatch in size between gbm_get_mem and gbm_free_mem memory was never flushed even if all blocks have been freed
• fixed memleak in gb_read_bin_rek_V2
  • when loading mapfile, previously created 'gb_main' was not freed
• added allocation logger to admalloc.cxx (inactive - use TRACE_ALLOCS to activate it)
  • traces all allocs/frees of ARBDB managed memory
  • detects wrong usage (double free, size and index mismatch) and shows were the block was allocated
  • added new backtrace functions helpful for debugging (store stack-backtraces and print them later)

Files:

• trunk/ARBDB/arbdb.cxx (modified) (6 diffs)

trunk/ARBDB/arbdb.cxx

@@ -285 +285 @@
 };
 
+void GB_exit_gb() {
+    if (gb_local) {
+        gb_assert(gb_local->openedDBs == gb_local->closedDBs);
+
+        free(gb_local->bitcompress);
+        gb_free_compress_tree(gb_local->bituncompress);
+        free(gb_local->write_buffer);
+
+        free(check_out_buffer(&gb_local->buf2));
+        free(check_out_buffer(&gb_local->buf1));
+
+        gbm_free_mem((char*)gb_local, sizeof(*gb_local), 0);
+        gb_local = NULL;
+
+        gbm_flush_mem();
+    }
+}
+
 void GB_init_gb() {
     if (!gb_local) {
-        gb_local = (struct gb_local_data *)gbm_get_mem(sizeof(struct gb_local_data), 0);
+        GBK_install_SIGSEGV_handler(true);          // never uninstalled
+
+        gbm_init_mem();
+
+        gb_local = (gb_local_data *)gbm_get_mem(sizeof(gb_local_data), 0);
 
         init_buffer(&gb_local->buf1, 4000);
@@ -300 +322 @@
         gb_local->bitcompress   = gb_build_compress_list(GB_BIT_compress_data, 1, &(gb_local->bc_size));
 
+        gb_local->openedDBs = 0;
+        gb_local->closedDBs = 0;
+
 #ifdef ARBDB_SIZEDEBUG
         arbdb_stat = (long *)GB_calloc(sizeof(long), 1000);
 #endif
+
+        atexit(GB_exit_gb);
     }
 }
@@ -969 +996 @@
 {
     char *d;
-    long memsize[2];
+    long memsize;
 
     GB_TEST_WRITE(gbd, GB_BITS, "GB_write_bits");
@@ -975 +1002 @@
     gb_save_extern_data_in_ts(gbd);
 
-    d = gb_compress_bits(bits, size, (const unsigned char *)c_0, memsize);
+    d = gb_compress_bits(bits, size, (const unsigned char *)c_0, &memsize);
     gbd->flags.compressed_data = 1;
-    GB_SETSMDMALLOC(gbd, size, memsize[0], d);
+    GB_SETSMDMALLOC(gbd, size, memsize, d);
     gb_touch_entry(gbd, GB_NORMAL_CHANGE);
     GB_DO_CALLBACKS(gbd);
@@ -2599 +2626 @@
 
 GB_ERROR GB_print_debug_information(void */*dummy_AW_root*/, GBDATA *gb_main) {
-    int i;
     GB_MAIN_TYPE *Main = GB_MAIN(gb_main);
     GB_push_transaction(gb_main);
-    for (i=0; i<Main->keycnt; i++) {
+    for (int i=0; i<Main->keycnt; i++) {
         if (Main->keys[i].key) {
             printf("%3i %20s    nref %i\n", i, Main->keys[i].key, (int)Main->keys[i].nref);
@@ -2610 +2636 @@
         }
     }
-    gbm_debug_mem(Main);
+    gbm_debug_mem();
     GB_pop_transaction(gb_main);
     return 0;