admin/mlib
1
0 Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Add mempool support for rbtree.

Browse Source
This commit is contained in:
Patrick Pelissier committed 2017-04-01 19:02:54 +02:00
1 parent 744f5de7ad
commit 2176cffb46
2 files changed
+35 -5
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

bench/bench-mlib.c
+10
View File
@@ -100,10 +100,17 @@ static void test_list (size_t n)
/********************************************************************************************/ /********************************************************************************************/
#ifdef USE_MEMPOOL
RBTREE_DEF(ulong, unsigned long, (MEMPOOL( rbtree_mpool), MEMPOOL_LINKAGE(static)))
#else
RBTREE_DEF(ulong, unsigned long) RBTREE_DEF(ulong, unsigned long)
#endif
static void test_rbtree(size_t n) static void test_rbtree(size_t n)
{ {
#ifdef USE_MEMPOOL
mempool_rbtree_ulong_init(rbtree_mpool);
#endif
rand_init(); rand_init();
M_LET(tree, RBTREE_OPLIST(ulong)) { M_LET(tree, RBTREE_OPLIST(ulong)) {
for (size_t i = 0; i < n; i++) { for (size_t i = 0; i < n; i++) {
@@ -118,6 +125,9 @@ static void test_rbtree(size_t n)
} }
g_result = s; g_result = s;
} }
#ifdef USE_MEMPOOL
mempool_rbtree_ulong_clear(rbtree_mpool);
#endif
} }
/********************************************************************************************/ /********************************************************************************************/
m-rbtree.h
+25 -5
View File
@@ -146,6 +146,26 @@ typedef enum {
const type *cptr; \ const type *cptr; \
} M_C3(rbtree_union_, name,_t); \ } M_C3(rbtree_union_, name,_t); \
\ \
M_IF_METHOD(MEMPOOL, oplist)( \
MEMPOOL_DEF(M_C(rbtree_,name), node_t) \
M_GET_MEMPOOL_LINKAGE oplist M_C3(mempool_rbtree_, name, _t) M_GET_MEMPOOL oplist; \
static inline node_t *M_C3(rbtreei_,name,_new)(void) { \
return M_C3(mempool_rbtree_, name, _alloc)(M_GET_MEMPOOL oplist); \
} \
static inline void M_C3(rbtreei_,name,_del)(node_t *ptr) { \
M_C3(mempool_rbtree_, name, _free)(M_GET_MEMPOOL oplist, ptr); \
} \
RBTREEI_DEF3(name, type, oplist, tree_t, node_t) \
, /* No mempool allocation */ \
static inline node_t *M_C3(rbtreei_,name,_new)(void) { \
return M_GET_NEW oplist (node_t); \
} \
static inline void M_C3(rbtreei_,name,_del)(node_t *ptr) { \
M_GET_DEL oplist (ptr); \
} \
RBTREEI_DEF3(name, type, oplist, tree_t, node_t) )
#define RBTREEI_DEF3(name, type, oplist, tree_t, node_t) \
static inline const type * \ static inline const type * \
M_C3(rbtree_, name, _const_cast)(type *ptr) \ M_C3(rbtree_, name, _const_cast)(type *ptr) \
{ \ { \
@@ -190,7 +210,7 @@ typedef enum {
} \ } \
assert (n == stack[cpt - 1]); \ assert (n == stack[cpt - 1]); \
M_GET_CLEAR oplist (n->data); \ M_GET_CLEAR oplist (n->data); \
M_GET_DEL oplist (n); \ M_C3(rbtreei_,name,_del) (n); \
assert((stack[cpt-1] = NULL) == NULL); \ assert((stack[cpt-1] = NULL) == NULL); \
cpt--; \ cpt--; \
} \ } \
@@ -214,7 +234,7 @@ typedef enum {
node_t *n = tree->node; \ node_t *n = tree->node; \
/* If nothing, create new node */ \ /* If nothing, create new node */ \
if (n == NULL) { \ if (n == NULL) { \
n = M_GET_NEW oplist(node_t); \ n = M_C3(rbtreei_,name,_new)(); \
if (M_UNLIKELY (n == NULL)) { \ if (M_UNLIKELY (n == NULL)) { \
M_MEMORY_FULL(sizeof (node_t)); \ M_MEMORY_FULL(sizeof (node_t)); \
return; \ return; \
@@ -253,7 +273,7 @@ typedef enum {
return; \ return; \
} \ } \
/* Create new */ \ /* Create new */ \
n = M_GET_NEW oplist(node_t); \ n = M_C3(rbtreei_,name,_new)(); \
if (M_UNLIKELY (n == NULL) ) { \ if (M_UNLIKELY (n == NULL) ) { \
M_MEMORY_FULL (sizeof (node_t)); \ M_MEMORY_FULL (sizeof (node_t)); \
return; \ return; \
@@ -578,7 +598,7 @@ typedef enum {
M_C3(rbtreei_,name,_copyn)(const node_t *o) \ M_C3(rbtreei_,name,_copyn)(const node_t *o) \
{ \ { \
if (o == NULL) return NULL; \ if (o == NULL) return NULL; \
node_t *n = M_GET_NEW oplist(node_t); \ node_t *n = M_C3(rbtreei_,name,_new)(); \
if (M_UNLIKELY (n == NULL) ) { \ if (M_UNLIKELY (n == NULL) ) { \
M_MEMORY_FULL (sizeof (node_t)); \ M_MEMORY_FULL (sizeof (node_t)); \
return NULL; \ return NULL; \
@@ -842,7 +862,7 @@ typedef enum {
if (data_ptr != NULL) \ if (data_ptr != NULL) \
M_GET_SET oplist (*data_ptr, n->data); \ M_GET_SET oplist (*data_ptr, n->data); \
M_GET_CLEAR oplist (n->data); \ M_GET_CLEAR oplist (n->data); \
M_GET_DEL oplist (n); \ M_C3(rbtreei_,name,_del) (n); \
tree->size --; \ tree->size --; \
RBTREEI_CONTRACT (tree); \ RBTREEI_CONTRACT (tree); \
return true; \ return true; \