jmb
/
hardened_malloc
mirror of https://github.com/GrapheneOS/hardened_malloc.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

simplify malloc_info code

pull/121/head
Daniel Micay 2020-09-17 16:09:45 -04:00
parent 50e0f1334c
commit 41fb89517a
1 changed files with 5 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
h_malloc.c
View File

@ -1808,16 +1808,11 @@ EXPORT int h_malloc_info(int options, UNUSED FILE *fp) {
for (unsigned class = 0; class < N_SIZE_CLASSES; class++) { for (unsigned class = 0; class < N_SIZE_CLASSES; class++) {
struct size_class *c = &ro.size_class_metadata[arena][class]; struct size_class *c = &ro.size_class_metadata[arena][class];
u64 nmalloc;
u64 ndalloc;
size_t slab_allocated;
size_t allocated;
mutex_lock(&c->lock); mutex_lock(&c->lock);
nmalloc = c->nmalloc; u64 nmalloc = c->nmalloc;
ndalloc = c->ndalloc; u64 ndalloc = c->ndalloc;
slab_allocated = c->slab_allocated; size_t slab_allocated = c->slab_allocated;
allocated = c->allocated; size_t allocated = c->allocated;
mutex_unlock(&c->lock); mutex_unlock(&c->lock);
if (nmalloc || ndalloc || slab_allocated || allocated) { if (nmalloc || ndalloc || slab_allocated || allocated) {
@ -1833,11 +1828,9 @@ EXPORT int h_malloc_info(int options, UNUSED FILE *fp) {
fputs("</heap>", fp); fputs("</heap>", fp);
} }
size_t region_allocated;
struct region_allocator *ra = ro.region_allocator; struct region_allocator *ra = ro.region_allocator;
mutex_lock(&ra->lock); mutex_lock(&ra->lock);
region_allocated = ra->allocated; size_t region_allocated = ra->allocated;
mutex_unlock(&ra->lock); mutex_unlock(&ra->lock);
fprintf(fp, "<heap nr=\"%u\">", N_ARENA); fprintf(fp, "<heap nr=\"%u\">", N_ARENA);