AuroraMiddleware/glibc
1
0
Fork 0
mirror of https://sourceware.org/git/glibc.git synced 2025-01-05 09:01:07 +00:00
Code Issues Packages Projects Releases Wiki Activity

Update.

Browse Source 
2002-07-06  Bruno Haible  <bruno@clisp.org>

	* malloc/hooks.c (public_gET_STATe): Access max_total_mem in mp_.
This commit is contained in:
Ulrich Drepper 2002-07-11 15:46:17 +00:00
parent 9d957ce2a2
commit 1ae915d98d
2 changed files with 9 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
ChangeLog
View File

@ -1,3 +1,7 @@
2002-07-06 Bruno Haible <bruno@clisp.org>
* malloc/hooks.c (public_gET_STATe): Access max_total_mem in mp_.
2002-07-11 Ulrich Drepper <drepper@redhat.com> 2002-07-11 Ulrich Drepper <drepper@redhat.com>
* resolv/res_hconf.c (_res_hconf_init): Move code into new * resolv/res_hconf.c (_res_hconf_init): Move code into new

11
malloc/hooks.c
View File

@ -352,8 +352,11 @@ realloc_check(oldmem, bytes, caller)
if (chunk_is_mmapped(oldp)) { if (chunk_is_mmapped(oldp)) {
#if HAVE_MREMAP #if HAVE_MREMAP
mchunkptr newp = mremap_chunk(oldp, nb); mchunkptr newp = mremap_chunk(oldp, nb);
if(!newp) { if(newp)
newmem = chunk2mem(newp);
else
#endif #endif
{
/* Note the extra SIZE_SZ overhead. */ /* Note the extra SIZE_SZ overhead. */
if(oldsize - SIZE_SZ >= nb) if(oldsize - SIZE_SZ >= nb)
newmem = oldmem; /* do nothing */ newmem = oldmem; /* do nothing */
@ -366,11 +369,7 @@ realloc_check(oldmem, bytes, caller)
munmap_chunk(oldp); munmap_chunk(oldp);
} }
} }
#if HAVE_MREMAP
} else {
newmem = chunk2mem(newp);
} }
#endif
} else { } else {
#endif /* HAVE_MMAP */ #endif /* HAVE_MMAP */
if (top_check() >= 0) if (top_check() >= 0)
@ -534,7 +533,7 @@ public_gET_STATe(void)
ms->check_action = check_action; ms->check_action = check_action;
ms->max_sbrked_mem = main_arena.max_system_mem; ms->max_sbrked_mem = main_arena.max_system_mem;
#ifdef NO_THREADS #ifdef NO_THREADS
ms->max_total_mem = max_total_mem; ms->max_total_mem = mp_.max_total_mem;
#else #else
ms->max_total_mem = 0; ms->max_total_mem = 0;
#endif #endif