Restore malloc debug.
Some libc changes were preventing the initialization call from being made.
The basic problem appears to be that libc_init_common.c is only built once,
and it's only built for the non-debug libc.
diff --git a/libc/bionic/libc_init_common.c b/libc/bionic/libc_init_common.c
index c77c162..d78d673 100644
--- a/libc/bionic/libc_init_common.c
+++ b/libc/bionic/libc_init_common.c
@@ -52,10 +52,6 @@
int __system_properties_init(void);
-#ifdef MALLOCK_LEAK_CHECK
-void malloc_debug_init(void);
-#endif
-
void __libc_init_common(uintptr_t *elfdata)
{
int argc = *elfdata;
@@ -87,9 +83,4 @@
/* setup system properties - requires environment */
__system_properties_init();
-
- /* setup malloc leak checker, requires system properties */
-#if MALLOC_LEAK_CHECK
- malloc_debug_init();
-#endif
}
diff --git a/libc/bionic/libc_init_dynamic.c b/libc/bionic/libc_init_dynamic.c
index b8e1078..b479b27 100644
--- a/libc/bionic/libc_init_dynamic.c
+++ b/libc/bionic/libc_init_dynamic.c
@@ -77,6 +77,13 @@
tls_area[TLS_SLOT_BIONIC_PREINIT] = NULL;
__libc_init_common(elfdata);
+
+#ifdef MALLOC_LEAK_CHECK
+ /* setup malloc leak checker, requires system properties */
+ extern void malloc_debug_init(void);
+ malloc_debug_init();
+#endif
+
}
__noreturn void __libc_init(uintptr_t *elfdata,
diff --git a/libc/bionic/libc_init_static.c b/libc/bionic/libc_init_static.c
index d097b6b..e6264bb 100644
--- a/libc/bionic/libc_init_static.c
+++ b/libc/bionic/libc_init_static.c
@@ -68,6 +68,12 @@
/* Initialize the C runtime environment */
__libc_init_common(elfdata);
+#ifdef MALLOC_LEAK_CHECK
+ /* setup malloc leak checker, requires system properties */
+ extern void malloc_debug_init(void);
+ malloc_debug_init();
+#endif
+
/* Several Linux ABIs don't pass the onexit pointer, and the ones that
* do never use it. Therefore, we ignore it.
*/
diff --git a/libc/bionic/malloc_leak.c b/libc/bionic/malloc_leak.c
index df09424..305f954 100644
--- a/libc/bionic/malloc_leak.c
+++ b/libc/bionic/malloc_leak.c
@@ -91,7 +91,14 @@
static HashTable gHashTable;
// =============================================================================
-// output fucntions
+// log functions
+// =============================================================================
+
+#define debug_log(format, ...) \
+ __libc_android_log_print(ANDROID_LOG_DEBUG, "malloc_leak", (format), ##__VA_ARGS__ )
+
+// =============================================================================
+// output functions
// =============================================================================
static int hash_entry_compare(const void* arg1, const void* arg2)
@@ -257,12 +264,6 @@
uint32_t guard;
};
-// =============================================================================
-// log funtions
-// =============================================================================
-
-#define debug_log(format, ...) \
- __libc_android_log_print(ANDROID_LOG_DEBUG, "malloc_leak", (format), ##__VA_ARGS__ )
// =============================================================================
// Hash Table functions