1999-07-30  Ulrich Drepper  <drepper@cygnus.com>

	* malloc/malloc.c (ptmalloc_init): Correct last patch.  The
	assignment cannot be moved.
This commit is contained in:
Ulrich Drepper 1999-07-31 04:34:31 +00:00
parent 66f8fa9bec
commit 94ffedf6e6
2 changed files with 8 additions and 1 deletions

View File

@ -1,3 +1,8 @@
1999-07-30 Ulrich Drepper <drepper@cygnus.com>
* malloc/malloc.c (ptmalloc_init): Correct last patch. The
assignment cannot be moved.
1999-07-29 H.J. Lu <hjl@gnu.org> 1999-07-29 H.J. Lu <hjl@gnu.org>
* malloc/malloc.c (ptmalloc_init): Also initialize __libc_pagesize * malloc/malloc.c (ptmalloc_init): Also initialize __libc_pagesize

View File

@ -1663,16 +1663,18 @@ ptmalloc_init __MALLOC_P((void))
/* Initialize the pthreads interface. */ /* Initialize the pthreads interface. */
if (__pthread_initialize != NULL) if (__pthread_initialize != NULL)
__pthread_initialize(); __pthread_initialize();
__libc_pagesize = __getpagesize();
#endif #endif
mutex_init(&main_arena.mutex); mutex_init(&main_arena.mutex);
mutex_init(&list_lock); mutex_init(&list_lock);
tsd_key_create(&arena_key, NULL); tsd_key_create(&arena_key, NULL);
tsd_setspecific(arena_key, (Void_t *)&main_arena); tsd_setspecific(arena_key, (Void_t *)&main_arena);
thread_atfork(ptmalloc_lock_all, ptmalloc_unlock_all, ptmalloc_init_all); thread_atfork(ptmalloc_lock_all, ptmalloc_unlock_all, ptmalloc_init_all);
#endif /* !defined NO_THREADS */ #else /* !defined NO_THREADS */
#ifdef _LIBC #ifdef _LIBC
__libc_pagesize = __getpagesize(); __libc_pagesize = __getpagesize();
#endif #endif
#endif /* !defined NO_THREADS */
#if defined _LIBC || defined MALLOC_HOOKS #if defined _LIBC || defined MALLOC_HOOKS
if((s = getenv("MALLOC_TRIM_THRESHOLD_"))) if((s = getenv("MALLOC_TRIM_THRESHOLD_")))
mALLOPt(M_TRIM_THRESHOLD, atoi(s)); mALLOPt(M_TRIM_THRESHOLD, atoi(s));