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

rename free_slabs to empty_slabs

pull/50/head
Daniel Micay 2018-08-30 04:55:39 -04:00
parent b6d4af872f
commit f94068ea63
1 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
malloc.c
View File

@ -173,7 +173,7 @@ static struct size_class {
void *class_region_start; void *class_region_start;
struct slab_metadata *slab_info; struct slab_metadata *slab_info;
struct slab_metadata *partial_slabs; struct slab_metadata *partial_slabs;
struct slab_metadata *free_slabs; struct slab_metadata *empty_slabs;
struct libdivide_u32_t size_divisor; struct libdivide_u32_t size_divisor;
struct libdivide_u64_t slab_size_divisor; struct libdivide_u64_t slab_size_divisor;
struct random_state rng; struct random_state rng;
@ -300,11 +300,11 @@ static inline void *slab_allocate(size_t requested_size) {
pthread_mutex_lock(&c->mutex); pthread_mutex_lock(&c->mutex);
if (c->partial_slabs == NULL) { if (c->partial_slabs == NULL) {
if (c->free_slabs != NULL) { if (c->empty_slabs != NULL) {
struct slab_metadata *metadata = c->free_slabs; struct slab_metadata *metadata = c->empty_slabs;
c->free_slabs = c->free_slabs->next; c->empty_slabs = c->empty_slabs->next;
if (c->free_slabs) { if (c->empty_slabs) {
c->free_slabs->prev = NULL; c->empty_slabs->prev = NULL;
} }
metadata->next = c->partial_slabs; metadata->next = c->partial_slabs;
@ -427,13 +427,13 @@ static inline void slab_free(void *p) {
metadata->next->prev = metadata->prev; metadata->next->prev = metadata->prev;
} }
metadata->next = c->free_slabs; metadata->next = c->empty_slabs;
metadata->prev = NULL; metadata->prev = NULL;
if (c->free_slabs) { if (c->empty_slabs) {
c->free_slabs->prev = metadata; c->empty_slabs->prev = metadata;
} }
c->free_slabs = metadata; c->empty_slabs = metadata;
} }
pthread_mutex_unlock(&c->mutex); pthread_mutex_unlock(&c->mutex);