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

extend stats with nmalloc and ndalloc

pull/87/head
Daniel Micay 2019-04-06 23:06:47 -04:00
parent e94fe50a0d
commit 27a4c883ce
1 changed files with 11 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
h_malloc.c
View File

@ -241,6 +241,8 @@ struct __attribute__((aligned(CACHELINE_SIZE))) size_class {
struct slab_metadata *free_slabs_quarantine[FREE_SLABS_QUARANTINE_RANDOM_LENGTH]; struct slab_metadata *free_slabs_quarantine[FREE_SLABS_QUARANTINE_RANDOM_LENGTH];
#if STATS #if STATS
u64 nmalloc; // may wrap (per jemalloc API)
u64 ndalloc; // may wrap (per jemalloc API)
size_t allocated; size_t allocated;
size_t slab_allocated; size_t slab_allocated;
#endif #endif
@ -485,6 +487,7 @@ static inline void *allocate_small(size_t requested_size) {
#if STATS #if STATS
c->allocated += size; c->allocated += size;
c->nmalloc++;
#endif #endif
mutex_unlock(&c->lock); mutex_unlock(&c->lock);
return p; return p;
@ -522,6 +525,7 @@ static inline void *allocate_small(size_t requested_size) {
#if STATS #if STATS
c->allocated += size; c->allocated += size;
c->nmalloc++;
#endif #endif
mutex_unlock(&c->lock); mutex_unlock(&c->lock);
return p; return p;
@ -548,6 +552,7 @@ static inline void *allocate_small(size_t requested_size) {
#if STATS #if STATS
c->allocated += size; c->allocated += size;
c->nmalloc++;
#endif #endif
mutex_unlock(&c->lock); mutex_unlock(&c->lock);
return p; return p;
@ -573,6 +578,7 @@ static inline void *allocate_small(size_t requested_size) {
#if STATS #if STATS
c->allocated += size; c->allocated += size;
c->nmalloc++;
#endif #endif
mutex_unlock(&c->lock); mutex_unlock(&c->lock);
return p; return p;
@ -636,6 +642,7 @@ static inline void deallocate_small(void *p, const size_t *expected_size) {
mutex_lock(&c->lock); mutex_lock(&c->lock);
#if STATS #if STATS
c->allocated -= size; c->allocated -= size;
c->ndalloc++;
#endif #endif
struct slab_metadata *metadata = get_metadata(c, p); struct slab_metadata *metadata = get_metadata(c, p);
@ -1688,8 +1695,8 @@ EXPORT struct mallinfo __mallinfo_arena_info(UNUSED size_t arena) {
// This internal Android API uses mallinfo in a non-standard way to implement malloc_info: // This internal Android API uses mallinfo in a non-standard way to implement malloc_info:
// //
// ordblks: total allocated space // ordblks: total allocated space
// uordblks: nmalloc (not implemented here yet) // uordblks: nmalloc
// fordblks: dmalloc (not implemented here yet) // fordblks: ndalloc
// (other fields are unused) // (other fields are unused)
EXPORT struct mallinfo __mallinfo_bin_info(UNUSED size_t arena, UNUSED size_t bin) { EXPORT struct mallinfo __mallinfo_bin_info(UNUSED size_t arena, UNUSED size_t bin) {
struct mallinfo info = {0}; struct mallinfo info = {0};
@ -1700,6 +1707,8 @@ EXPORT struct mallinfo __mallinfo_bin_info(UNUSED size_t arena, UNUSED size_t bi
mutex_lock(&c->lock); mutex_lock(&c->lock);
info.ordblks = c->allocated; info.ordblks = c->allocated;
info.uordblks = c->nmalloc;
info.fordblks = c->ndalloc;
mutex_unlock(&c->lock); mutex_unlock(&c->lock);
} }
#endif #endif