emo/hardened_malloc
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

include zero byte size class in stats

Browse Source 
The allocations don't consume any actual memory, but it does still use
up the virtual memory assigned to the size class and requires metadata.
This commit is contained in:
Daniel Micay 2019-04-06 22:43:56 -04:00
parent 712748aaa8
commit e94fe50a0d
1 changed files with 3 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
h_malloc.c
View File

@ -1609,8 +1609,7 @@ EXPORT struct mallinfo h_mallinfo(void) {
mutex_unlock(&ra->lock); mutex_unlock(&ra->lock);
for (unsigned arena = 0; arena < N_ARENA; arena++) { for (unsigned arena = 0; arena < N_ARENA; arena++) {
// skip zero byte size class for (unsigned class = 0; class < N_SIZE_CLASSES; class++) {
for (unsigned class = 1; 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];
mutex_lock(&c->lock); mutex_lock(&c->lock);
@ -1665,8 +1664,7 @@ EXPORT struct mallinfo __mallinfo_arena_info(UNUSED size_t arena) {
#if STATS #if STATS
if (arena < N_ARENA) { if (arena < N_ARENA) {
// skip zero byte size class for (unsigned class = 0; class < N_SIZE_CLASSES; class++) {
for (unsigned class = 1; 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];
mutex_lock(&c->lock); mutex_lock(&c->lock);
@ -1697,8 +1695,7 @@ EXPORT struct mallinfo __mallinfo_bin_info(UNUSED size_t arena, UNUSED size_t bi
struct mallinfo info = {0}; struct mallinfo info = {0};
#if STATS #if STATS
// skip zero byte size class for consistency if (arena < N_ARENA && bin < N_SIZE_CLASSES) {
if (arena < N_ARENA && bin > 0 && bin < N_SIZE_CLASSES) {
struct size_class *c = &ro.size_class_metadata[arena][bin]; struct size_class *c = &ro.size_class_metadata[arena][bin];
mutex_lock(&c->lock); mutex_lock(&c->lock);