Mercurial > emacs
changeset 78441:06446146e55e
(__malloc_initialize): Remove pthread_once. Not needed.
| author | YAMAMOTO Mitsuharu <mituharu@math.s.chiba-u.ac.jp> |
|---|---|
| date | Tue, 07 Aug 2007 09:04:33 +0000 |
| parents | 4fa26746dfc9 |
| children | 57891dda995d |
| files | src/gmalloc.c |
| diffstat | 1 files changed, 3 insertions(+), 6 deletions(-) [+] |
line wrap: on
line diff
--- a/src/gmalloc.c Tue Aug 07 09:02:32 2007 +0000 +++ b/src/gmalloc.c Tue Aug 07 09:04:33 2007 +0000 @@ -582,7 +582,6 @@ } #ifdef USE_PTHREAD -static pthread_once_t malloc_init_once_control = PTHREAD_ONCE_INIT; pthread_mutex_t _malloc_mutex = PTHREAD_MUTEX_INITIALIZER; pthread_mutex_t _aligned_blocks_mutex = PTHREAD_MUTEX_INITIALIZER; int _malloc_thread_enabled_p; @@ -656,18 +655,16 @@ return; } -/* Set everything up and remember that we have. */ +/* Set everything up and remember that we have. + main will call malloc which calls this function. That is before any threads + or signal handlers has been set up, so we don't need thread protection. */ int __malloc_initialize () { -#ifdef USE_PTHREAD - pthread_once (&malloc_init_once_control, malloc_initialize_1); -#else if (__malloc_initialized) return 0; malloc_initialize_1 (); -#endif return __malloc_initialized; }