project-base/server-skynet-source-3rd-jemalloc
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Convert base_mtx locking protocol comments to assertions.

Browse Source
This commit is contained in:
Jason Evans 2016-04-17 12:33:39 -07:00
parent 2288424325
commit d9394d0ca8
1 changed files with 12 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
src/base.c
View File

@ -13,12 +13,13 @@ static size_t base_mapped;
/******************************************************************************/ /******************************************************************************/
/* base_mtx must be held. */
static extent_node_t * static extent_node_t *
base_node_try_alloc(void) base_node_try_alloc(tsd_t *tsd)
{ {
extent_node_t *node; extent_node_t *node;
malloc_mutex_assert_owner(tsd, &base_mtx);
if (base_nodes == NULL) if (base_nodes == NULL)
return (NULL); return (NULL);
node = base_nodes; node = base_nodes;
@ -27,33 +28,34 @@ base_node_try_alloc(void)
return (node); return (node);
} }
/* base_mtx must be held. */
static void static void
base_node_dalloc(extent_node_t *node) base_node_dalloc(tsd_t *tsd, extent_node_t *node)
{ {
malloc_mutex_assert_owner(tsd, &base_mtx);
JEMALLOC_VALGRIND_MAKE_MEM_UNDEFINED(node, sizeof(extent_node_t)); JEMALLOC_VALGRIND_MAKE_MEM_UNDEFINED(node, sizeof(extent_node_t));
*(extent_node_t **)node = base_nodes; *(extent_node_t **)node = base_nodes;
base_nodes = node; base_nodes = node;
} }
/* base_mtx must be held. */
static extent_node_t * static extent_node_t *
base_chunk_alloc(size_t minsize) base_chunk_alloc(tsd_t *tsd, size_t minsize)
{ {
extent_node_t *node; extent_node_t *node;
size_t csize, nsize; size_t csize, nsize;
void *addr; void *addr;
malloc_mutex_assert_owner(tsd, &base_mtx);
assert(minsize != 0); assert(minsize != 0);
node = base_node_try_alloc(); node = base_node_try_alloc(tsd);
/* Allocate enough space to also carve a node out if necessary. */ /* Allocate enough space to also carve a node out if necessary. */
nsize = (node == NULL) ? CACHELINE_CEILING(sizeof(extent_node_t)) : 0; nsize = (node == NULL) ? CACHELINE_CEILING(sizeof(extent_node_t)) : 0;
csize = CHUNK_CEILING(minsize + nsize); csize = CHUNK_CEILING(minsize + nsize);
addr = chunk_alloc_base(csize); addr = chunk_alloc_base(csize);
if (addr == NULL) { if (addr == NULL) {
if (node != NULL) if (node != NULL)
base_node_dalloc(node); base_node_dalloc(tsd, node);
return (NULL); return (NULL);
} }
base_mapped += csize; base_mapped += csize;
@ -98,7 +100,7 @@ base_alloc(tsd_t *tsd, size_t size)
extent_tree_szad_remove(&base_avail_szad, node); extent_tree_szad_remove(&base_avail_szad, node);
} else { } else {
/* Try to allocate more space. */ /* Try to allocate more space. */
node = base_chunk_alloc(csize); node = base_chunk_alloc(tsd, csize);
} }
if (node == NULL) { if (node == NULL) {
ret = NULL; ret = NULL;
@ -111,7 +113,7 @@ base_alloc(tsd_t *tsd, size_t size)
extent_node_size_set(node, extent_node_size_get(node) - csize); extent_node_size_set(node, extent_node_size_get(node) - csize);
extent_tree_szad_insert(&base_avail_szad, node); extent_tree_szad_insert(&base_avail_szad, node);
} else } else
base_node_dalloc(node); base_node_dalloc(tsd, node);
if (config_stats) { if (config_stats) {
base_allocated += csize; base_allocated += csize;
/* /*