A patch for malloc.

A patch for malloc.

[H.J. Lu]

> 
> 
> This one is a bit hard to get at, but this is what I see:
> 

Please try this patch. __libc_pagesize handling in glibc 2.1.2 and 2.2
is wrong since __pthread_initialize will call malloc () with wrong
__libc_pagesize. This patch fixes glibc 2.1.2.

Ulrich, please fix both glibc 2.1.2 and 2.2.

Thanks.


H.J.
---
Fri Aug  6 14:21:24 1999  H.J. Lu  <hjl@gnu.org>

        * malloc/malloc.c (ptmalloc_init): Make sure __libc_pagesize is
        initiailized before any calls to malloc.

--- ../../import/glibc-2.1/libc/malloc/malloc.c	Wed Jul 21 07:30:38 1999
+++ malloc/malloc.c	Fri Aug  6 14:25:42 1999
@@ -1649,6 +1649,9 @@ ptmalloc_init __MALLOC_P((void))
 
   if(__malloc_initialized >= 0) return;
   __malloc_initialized = 0;
+#ifdef _LIBC
+  __libc_pagesize = __getpagesize();
+#endif
 #ifndef NO_THREADS
 #if defined _LIBC || defined MALLOC_HOOKS
   /* With some threads implementations, creating thread-specific data
@@ -1663,7 +1666,6 @@ ptmalloc_init __MALLOC_P((void))
   /* Initialize the pthreads interface. */
   if (__pthread_initialize != NULL)
     __pthread_initialize();
-  __libc_pagesize = __getpagesize();
 #endif
   mutex_init(&main_arena.mutex);
   mutex_init(&list_lock);

Re: A patch for malloc.

[Ulrich Drepper]

hjl@lucon.org (H.J. Lu) writes:

> Ulrich, please fix both glibc 2.1.2 and 2.2.

Done.  Thanks

-- 
---------------.      drepper at gnu.org  ,-.   1325 Chesapeake Terrace
Ulrich Drepper  \    ,-------------------'   \  Sunnyvale, CA 94089 USA
Cygnus Solutions `--' drepper at cygnus.com   `------------------------

A patch for malloc

[H.J. Lu]

Here is a patch for malloc. It is quite confusing without 0x.

Thanks.


-- 
H.J. Lu (hjl@gnu.org)
---
Tue Aug 11 07:37:50 1998  H.J. Lu  (hjl@gnu.org)

	* malloc/malloc.c (free_check): Add 0x to print a pointer.
	(realloc_check): Likewise.

Index: malloc/malloc.c
===================================================================
RCS file: /home/work/cvs/gnu/glibc-2.0/malloc/malloc.c,v
retrieving revision 1.1.1.4
diff -p -u -r1.1.1.4 malloc.c
--- malloc.c	1998/05/20 21:51:16	1.1.1.4
+++ malloc.c	1998/08/11 14:36:20
@@ -4269,7 +4269,7 @@ free_check(mem) Void_t* mem;
     (void)mutex_unlock(&main_arena.mutex);
     switch(check_action) {
     case 1:
-      fprintf(stderr, "free(): invalid pointer %lx!\n", (long)(mem));
+      fprintf(stderr, "free(): invalid pointer 0x%lx!\n", (long)(mem));
       break;
     case 2:
       abort();
@@ -4307,7 +4307,7 @@ realloc_check(oldmem, bytes) Void_t* old
     (void)mutex_unlock(&main_arena.mutex);
     switch(check_action) {
     case 1:
-      fprintf(stderr, "realloc(): invalid pointer %lx!\n", (long)(oldmem));
+      fprintf(stderr, "realloc(): invalid pointer 0x%lx!\n", (long)(oldmem));
       break;
     case 2:
       abort();

Re: A patch for malloc

[Ulrich Drepper]

hjl@lucon.org (H.J. Lu) writes:

> Here is a patch for malloc. It is quite confusing without 0x.

I've changed the code to use %p.  Thanks,

-- 
---------------.      drepper at gnu.org  ,-.   1325 Chesapeake Terrace
Ulrich Drepper  \    ,-------------------'   \  Sunnyvale, CA 94089 USA
Cygnus Solutions `--' drepper at cygnus.com   `------------------------