lib/glibc
1
0
Fork 0
mirror of https://sourceware.org/git/glibc.git synced 2025-08-05 19:35:52 +03:00
Code Activity

Remove nested function mi_arena from malloc_info.

Browse Source 
The nested function mi_arena was removed from malloc_info
and made into a non-nested static inline function of the same
name with the correct set of arguments passed from malloc_info.
This enables building glibc with compilers that don't support
nested functions. Future work on malloc_info should remove these
functions entirely to support JSON format output. Therefore we
do the minimum required to remove the nested function.
This commit is contained in:
Carlos O'Donell
2014-05-26 09:54:59 -04:00
parent d298c41635
commit fdfd175d46
2 changed files with 149 additions and 133 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
ChangeLog
View File

@@ -1,3 +1,9 @@
2014-05-26 Carlos O'Donell <carlos@redhat.com>
* malloc/malloc.c (mi_arena): New function.
(malloc_info): Remove nested function mi_arena. Call non-nosted
function mi_arena.
2014-05-26 Adhemerval Zanella <azanella@linux.vnet.ibm.com>
* sysdeps/powerpc/powerpc32/power4/memset.S (memset): Replace insrdi

70
malloc/malloc.c
View File

@@ -4986,27 +4986,20 @@ __posix_memalign (void **memptr, size_t alignment, size_t size)
}
weak_alias (__posix_memalign, posix_memalign)
int
malloc_info (int options, FILE *fp)
static inline void
mi_arena (mstate ar_ptr,
FILE *fp,
size_t *total_nblocks,
size_t *total_nfastblocks,
size_t *total_avail,
size_t *total_fastavail,
size_t *total_system,
size_t *total_max_system,
size_t *total_aspace,
size_t *total_aspace_mprotect)
{
/* For now, at least. */
if (options != 0)
return EINVAL;
int n = 0;
size_t total_nblocks = 0;
size_t total_nfastblocks = 0;
size_t total_avail = 0;
size_t total_fastavail = 0;
size_t total_system = 0;
size_t total_max_system = 0;
size_t total_aspace = 0;
size_t total_aspace_mprotect = 0;
void
mi_arena (mstate ar_ptr)
{
fprintf (fp, "<heap nr=\"%d\">\n<sizes>\n", n++);
size_t nblocks = 0;
@@ -5023,7 +5016,6 @@ malloc_info (int options, FILE *fp)
#define nsizes (sizeof (sizes) / sizeof (sizes[0]))
mutex_lock (&ar_ptr->mutex);
for (size_t i = 0; i < NFASTBINS; ++i)
{
mchunkptr p = fastbin (ar_ptr, i);
@@ -5083,11 +5075,11 @@ malloc_info (int options, FILE *fp)
mutex_unlock (&ar_ptr->mutex);
total_nfastblocks += nfastblocks;
total_fastavail += fastavail;
*total_nfastblocks += nfastblocks;
*total_fastavail += fastavail;
total_nblocks += nblocks;
total_avail += avail;
*total_nblocks += nblocks;
*total_avail += avail;
for (size_t i = 0; i < nsizes; ++i)
if (sizes[i].count != 0 && i != NFASTBINS)
@@ -5101,8 +5093,8 @@ malloc_info (int options, FILE *fp)
sizes[NFASTBINS].from, sizes[NFASTBINS].to,
sizes[NFASTBINS].total, sizes[NFASTBINS].count);
total_system += ar_ptr->system_mem;
total_max_system += ar_ptr->max_system_mem;
*total_system += ar_ptr->system_mem;
*total_max_system += ar_ptr->max_system_mem;
fprintf (fp,
"</sizes>\n<total type=\"fast\" count=\"%zu\" size=\"%zu\"/>\n"
@@ -5119,8 +5111,8 @@ malloc_info (int options, FILE *fp)
"<aspace type=\"total\" size=\"%zu\"/>\n"
"<aspace type=\"mprotect\" size=\"%zu\"/>\n",
heap->size, heap->mprotect_size);
total_aspace += heap->size;
total_aspace_mprotect += heap->mprotect_size;
*total_aspace += heap->size;
*total_aspace_mprotect += heap->mprotect_size;
}
else
{
@@ -5128,13 +5120,29 @@ malloc_info (int options, FILE *fp)
"<aspace type=\"total\" size=\"%zu\"/>\n"
"<aspace type=\"mprotect\" size=\"%zu\"/>\n",
ar_ptr->system_mem, ar_ptr->system_mem);
total_aspace += ar_ptr->system_mem;
total_aspace_mprotect += ar_ptr->system_mem;
*total_aspace += ar_ptr->system_mem;
*total_aspace_mprotect += ar_ptr->system_mem;
}
fputs ("</heap>\n", fp);
}
int
malloc_info (int options, FILE *fp)
{
/* For now, at least. */
if (options != 0)
return EINVAL;
size_t total_nblocks = 0;
size_t total_nfastblocks = 0;
size_t total_avail = 0;
size_t total_fastavail = 0;
size_t total_system = 0;
size_t total_max_system = 0;
size_t total_aspace = 0;
size_t total_aspace_mprotect = 0;
if (__malloc_initialized < 0)
ptmalloc_init ();
@@ -5144,7 +5152,9 @@ malloc_info (int options, FILE *fp)
mstate ar_ptr = &main_arena;
do
{
mi_arena (ar_ptr);
mi_arena (ar_ptr, fp, &total_nblocks, &total_nfastblocks, &total_avail,
&total_fastavail, &total_system, &total_max_system,
&total_aspace, &total_aspace_mprotect);
ar_ptr = ar_ptr->next;
}
while (ar_ptr != &main_arena);