[PATCH] malloc-standard: synchronize on fork
Timo Teräs
timo.teras at iki.fi
Sat Mar 26 18:28:04 UTC 2011
Otherwise other threads can leave malloc state locked, and the child
will hang indefinitely if it tries to malloc something.
Signed-off-by: Timo Teräs <timo.teras at iki.fi>
---
libc/stdlib/malloc-standard/free.c | 17 +++++++++++++++++
1 files changed, 17 insertions(+), 0 deletions(-)
diff --git a/libc/stdlib/malloc-standard/free.c b/libc/stdlib/malloc-standard/free.c
index 39e54d6..df512cc 100644
--- a/libc/stdlib/malloc-standard/free.c
+++ b/libc/stdlib/malloc-standard/free.c
@@ -118,6 +118,21 @@ int malloc_trim(size_t pad)
to inline it at all call points, which turns out not to be an
optimization at all. (Inlining it in __malloc_consolidate is fine though.)
*/
+static void _malloc_lock(void)
+{
+ __UCLIBC_MUTEX_LOCK_CANCEL_UNSAFE(__malloc_lock);
+}
+
+static void _malloc_unlock(void)
+{
+ __UCLIBC_MUTEX_UNLOCK_CANCEL_UNSAFE(__malloc_lock);
+}
+
+static void _malloc_reset(void)
+{
+ __UCLIBC_MUTEX_INIT_VAR(__malloc_lock);
+}
+
static void malloc_init_state(mstate av)
{
int i;
@@ -145,6 +160,8 @@ static void malloc_init_state(mstate av)
av->top = initial_top(av);
av->pagesize = malloc_getpagesize;
+
+ __libc_atfork(_malloc_lock, _malloc_unlock, _malloc_reset);
}
--
1.7.1
More information about the uClibc
mailing list