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

use prefix for extended mallinfo functions

pull/103/head
Daniel Micay 2019-09-07 18:30:04 -04:00
parent fb9f5d630b
commit a28da3c65a
2 changed files with 13 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
h_malloc.c
View File

@ -1808,12 +1808,12 @@ COLD EXPORT int h_malloc_set_state(UNUSED void *state) {
#endif #endif
#ifdef __ANDROID__ #ifdef __ANDROID__
EXPORT size_t __mallinfo_narenas(void) { EXPORT size_t h_mallinfo_narenas(void) {
// Consider region allocator to be an arena with index N_ARENA. // Consider region allocator to be an arena with index N_ARENA.
return N_ARENA + 1; return N_ARENA + 1;
} }
EXPORT size_t __mallinfo_nbins(void) { EXPORT size_t h_mallinfo_nbins(void) {
return N_SIZE_CLASSES; return N_SIZE_CLASSES;
} }
@ -1824,7 +1824,7 @@ EXPORT size_t __mallinfo_nbins(void) {
// uordblks: huge allocations // uordblks: huge allocations
// fsmblks: small allocations // fsmblks: small allocations
// (other fields are unused) // (other fields are unused)
EXPORT struct mallinfo __mallinfo_arena_info(UNUSED size_t arena) { EXPORT struct mallinfo h_mallinfo_arena_info(UNUSED size_t arena) {
struct mallinfo info = {0}; struct mallinfo info = {0};
#if CONFIG_STATS #if CONFIG_STATS
@ -1856,7 +1856,7 @@ EXPORT struct mallinfo __mallinfo_arena_info(UNUSED size_t arena) {
// uordblks: nmalloc // uordblks: nmalloc
// fordblks: ndalloc // 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 h_mallinfo_bin_info(UNUSED size_t arena, UNUSED size_t bin) {
struct mallinfo info = {0}; struct mallinfo info = {0};
#if CONFIG_STATS #if CONFIG_STATS

13
h_malloc.h
View File

@ -30,6 +30,11 @@ __BEGIN_DECLS
#define h_malloc_get_state malloc_get_state #define h_malloc_get_state malloc_get_state
#define h_malloc_set_state malloc_set_state #define h_malloc_set_state malloc_set_state
#define h_mallinfo_narenas mallinfo_narenas
#define h_mallinfo_nbins mallinfo_nbins
#define h_mallinfo_arena_info mallinfo_arena_info
#define h_mallinfo_bin_info mallinfo_bin_info
#define h_iterate iterate #define h_iterate iterate
#define h_malloc_disable malloc_disable #define h_malloc_disable malloc_disable
#define h_malloc_enable malloc_enable #define h_malloc_enable malloc_enable
@ -81,10 +86,10 @@ int h_malloc_set_state(void *state);
// Android extensions // Android extensions
#ifdef __ANDROID__ #ifdef __ANDROID__
size_t __mallinfo_narenas(void); size_t h_mallinfo_narenas(void);
size_t __mallinfo_nbins(void); size_t h_mallinfo_nbins(void);
struct mallinfo __mallinfo_arena_info(size_t arena); struct mallinfo h_mallinfo_arena_info(size_t arena);
struct mallinfo __mallinfo_bin_info(size_t arena, size_t bin); struct mallinfo h_mallinfo_bin_info(size_t arena, size_t bin);
int h_iterate(uintptr_t base, size_t size, void (*callback)(uintptr_t ptr, size_t size, void *arg), int h_iterate(uintptr_t base, size_t size, void (*callback)(uintptr_t ptr, size_t size, void *arg),
void *arg); void *arg);
void h_malloc_disable(void); void h_malloc_disable(void);