From 28177d466fbbfd10927b4d05655c2ec6711faa1b Mon Sep 17 00:00:00 2001 From: Jason Evans Date: Mon, 20 Sep 2010 11:24:24 -0700 Subject: [PATCH] Remove bad assertions in malloc_{pre,post}fork(). Remove assertions that malloc_{pre,post}fork() are only called if threading is enabled. This was true of these functions in the context of FreeBSD's libc, but now the functions are called unconditionally as a result of registering them with pthread_atfork(). --- jemalloc/src/jemalloc.c | 8 +------- 1 file changed, 1 insertion(+), 7 deletions(-) diff --git a/jemalloc/src/jemalloc.c b/jemalloc/src/jemalloc.c index be3d7da1..40c3a637 100644 --- a/jemalloc/src/jemalloc.c +++ b/jemalloc/src/jemalloc.c @@ -1394,9 +1394,7 @@ JEMALLOC_P(dallocm)(void *ptr, int flags) /* * The following functions are used by threading libraries for protection of - * malloc during fork(). These functions are only called if the program is - * running in threaded mode, so there is no need to check whether the program - * is threaded here. + * malloc during fork(). */ void @@ -1404,8 +1402,6 @@ jemalloc_prefork(void) { unsigned i; - assert(isthreaded); - /* Acquire all mutexes in a safe order. */ malloc_mutex_lock(&arenas_lock); @@ -1432,8 +1428,6 @@ jemalloc_postfork(void) { unsigned i; - assert(isthreaded); - /* Release all mutexes, now that fork() has completed. */ #ifdef JEMALLOC_SWAP