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

Add oplist for oplist of shared pointer

Browse Source 
Fix issue in case of memory full of shared_pointer with no throw mechanism.
This commit is contained in:
Patrick Pelissier committed 2017-03-06 22:45:15 +01:00
1 parent ee578a5c44
commit 29e01a9e2d
1 file changed
+20 -9
Download Patch File Download Diff File Expand all files Collapse all files
m-shared.h
+20 -9
View File
@@ -33,7 +33,23 @@
#include "m-core.h"
#define SHARED_PTR_OPLIST(name) ( \
/* Define the oplist of a shared pointer.
USAGE: SHARED_OPLIST(name [, oplist_of_the_type]) */
#define SHARED_PTR_OPLIST(...) \
M_IF_NARGS_EQ1(__VA_ARGS__) \
(SHAREDI_PTR_OPLIST(__VA_ARGS__, M_DEFAULT_OPLIST ), \
SHAREDI_PTR_OPLIST(__VA_ARGS__ ))
/* Define shared pointer and its function.
USAGE: SHARED_PTR_DEF(name[, oplist]) */
#define SHARED_PTR_DEF(name, ...) \
M_IF_NARGS_EQ1(__VA_ARGS__) \
(SHAREDI_PTR_DEF2(name, __VA_ARGS__, M_DEFAULT_OPLIST ), \
SHAREDI_PTR_DEF2(name, __VA_ARGS__ ))
/********************************** INTERNAL ************************************/
#define SHAREDI_PTR_OPLIST(name, oplist) ( \
INIT(M_C3(shared_, name, _init)), \
CLEAR(M_C3(shared_, name, _clear)), \
INIT_SET(M_C3(shared_, name, _init_set)), \
@@ -42,13 +58,6 @@
MOVE(M_C3(shared_, name, _move)) \
)
#define SHARED_PTR_DEF(name, ...) \
M_IF_NARGS_EQ1(__VA_ARGS__) \
(SHAREDI_PTR_DEF2(name, __VA_ARGS__, M_DEFAULT_OPLIST ), \
SHAREDI_PTR_DEF2(name, __VA_ARGS__ ))
/********************************** INTERNAL ************************************/
#define SHAREDI_PTR_DEF2(name, type, oplist) \
typedef struct M_C3(shared_, name, _s){ \
int cpt; \
@@ -83,8 +92,10 @@
return; \
} \
ptr = M_MEMORY_ALLOC (struct M_C3(shared_, name, _s)); \
if (ptr == NULL) \
if (ptr == NULL) { \
M_MEMORY_FULL(sizeof(struct M_C3(shared_, name, _s))); \
return; \
} \
ptr->cpt = 1; \
ptr->data = data; \
*shared = ptr; \