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

Remove ishared prefix from the Intrusive Shared Port

Browse Source 
See commit on shared pointer.
This commit is contained in:
Patrick Pelissier committed 2017-07-25 22:27:00 +02:00
1 parent 5a67582fc0
commit ad27d331a1
2 files changed
+26 -26
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

m-i-shared.h
+23 -23
View File
@@ -58,11 +58,11 @@
#define ISHAREDI_PTR_OPLIST(name, oplist) ( \
INIT(M_INIT_DEFAULT), \
INIT_SET(M_C3(ishared_, name, _init_set2) M_IPTR), \
SET(M_C3(ishared_, name, _set) M_IPTR), \
CLEAR(M_C3(ishared_, name, _clear)), \
CLEAN(M_C3(ishared_, name, _clean) M_IPTR), \
TYPE(M_C3(ishared_,name,_t)), \
INIT_SET(M_C(name, _init_set2) M_IPTR), \
SET(M_C(name, _set) M_IPTR), \
CLEAR(M_C(name, _clear)), \
CLEAN(M_C(name, _clean) M_IPTR), \
TYPE(M_C(name, _type_t)), \
OPLIST(oplist), \
SUBTYPE(M_C3(ishared_type_,name,_t)) \
,M_IF_METHOD(NEW, oplist)(NEW(M_GET_NEW oplist),) \
@@ -72,34 +72,34 @@
#define ISHAREDI_PTR_DEF2(name, type, oplist) \
\
typedef type *M_C3(ishared_,name,_t); \
typedef type M_C3(ishared_type_,name,_t); \
typedef type *M_C(name,_t); \
typedef type M_C(name, _type_t); \
\
static inline type * \
M_C3(ishared_, name, _init)(type *ptr) \
M_C(name, _init)(type *ptr) \
{ \
if (ptr != NULL) \
atomic_init(&ptr->M_C(name, _cpt), 1); \
return ptr; \
} \
\
\
static inline type * \
M_C3(ishared_, name, _init_set)(type *shared) \
M_C(name, _init_set)(type *shared) \
{ \
if (shared != NULL) \
atomic_fetch_add(&(shared->M_C(name, _cpt)), 1); \
return shared; \
} \
\
\
static inline void \
M_C3(ishared_, name, _init_set2)(type ** ptr, type *shared) \
M_C(name, _init_set2)(type ** ptr, type *shared) \
{ \
assert (ptr != NULL); \
*ptr = M_C3(ishared_, name, _init_set)(shared); \
*ptr = M_C(name, _init_set)(shared); \
} \
\
\
static inline type * \
M_C3(ishared_, name, _init_new)(void) \
M_C(name, _init_new)(void) \
{ \
type *ptr = M_GET_NEW oplist (type); \
if (ptr == NULL) { \
@@ -110,9 +110,9 @@
atomic_init (&ptr->M_C(name, _cpt), 1); \
return ptr; \
} \
\
\
static inline void \
M_C3(ishared_, name, _clear)(type *shared) \
M_C(name, _clear)(type *shared) \
{ \
if (shared != NULL) { \
if (atomic_fetch_sub(&(shared->M_C(name, _cpt)), 1) == 1) { \
@@ -121,20 +121,20 @@
} \
} \
} \
\
\
static inline void \
M_C3(ishared_, name, _clean)(type **shared) \
M_C(name, _clean)(type **shared) \
{ \
M_C3(ishared_, name, _clear)(*shared); \
M_C(name, _clear)(*shared); \
*shared = NULL; \
} \
\
static inline void \
M_C3(ishared_, name, _set)(type ** ptr, type *shared) \
M_C(name, _set)(type ** ptr, type *shared) \
{ \
assert (ptr != NULL); \
M_C3(ishared_, name, _clear)(*ptr); \
*ptr = M_C3(ishared_, name, _init_set)(shared); \
M_C(name, _clear)(*ptr); \
*ptr = M_C(name, _init_set)(shared); \
} \
\
tests/test-mbuffer.c
+3 -3
View File
@@ -189,7 +189,7 @@ static void test_no_thread(void)
#include "m-i-shared.h"
// Tiny test structure
typedef struct test_s {
ISHARED_PTR_INTERFACE(itest, struct test_s);
ISHARED_PTR_INTERFACE(ishared_itest, struct test_s);
char buffer[52];
char bigbuffer[1000000];
} test_t;
@@ -197,7 +197,7 @@ typedef struct test_s {
static void test_init(test_t *p) { memset(p->buffer, 0x00, 52); }
static void test_clear(test_t *p) { memset(p->buffer, 0xFF, 52); }
ISHARED_PTR_DEF(itest, test_t,
ISHARED_PTR_DEF(ishared_itest, test_t,
(INIT(test_init M_IPTR), CLEAR(test_clear M_IPTR), DEL(free)))
static test_t *test_new(void)
@@ -209,7 +209,7 @@ static test_t *test_new(void)
}
BUFFER_DEF(itest, test_t *, 16, BUFFER_PUSH_INIT_POP_MOVE,
ISHARED_PTR_OPLIST(itest))
ISHARED_PTR_OPLIST(ishared_itest))
static buffer_itest_t comm1;
static buffer_itest_t comm2;