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

If the size is constant (!= 0) when defining the buffer

Browse Source 
then the array is embedded within the structure rather
than allocated when initialization of the structure
occurs.
This commit is contained in:
Patrick Pelissier committed 2018-01-06 22:57:14 +01:00
1 parent 362fbb39d4
commit 3f7b16c736
1 file changed
+13 -9
Download Patch File Download Diff File Expand all files Collapse all files
m-buffer.h
+13 -9
View File
@@ -71,7 +71,7 @@ typedef enum {
/********************************** INTERNAL ************************************/ /********************************** INTERNAL ************************************/
/* Define the exclusion size so that 2 atomic variables can be in /* Define the exclusion size so that 2 atomic variables can be in
separate cache line. This prevent false sharing to occur within the separate cache line. This prevents false sharing to occur within the
CPU cache. */ CPU cache. */
#if defined(_M_X64) || defined(_M_AMD64) || defined(__x86_64__) #if defined(_M_X64) || defined(_M_AMD64) || defined(__x86_64__)
# define BUFFERI_ALIGN_FOR_CACHELINE_EXCLUSION 128 # define BUFFERI_ALIGN_FOR_CACHELINE_EXCLUSION 128
@@ -107,7 +107,7 @@ typedef enum {
BUFFERI_IF_CTE_SIZE(m_size)( ,size_t size;) \ BUFFERI_IF_CTE_SIZE(m_size)( ,size_t size;) \
size_t idx_prod, idx_cons, overwrite; \ size_t idx_prod, idx_cons, overwrite; \
atomic_ulong number[1 + BUFFERI_POLICY_P(policy, BUFFER_DEFERRED_POP)]; \ atomic_ulong number[1 + BUFFERI_POLICY_P(policy, BUFFER_DEFERRED_POP)]; \
type *data; \ BUFFERI_IF_CTE_SIZE(m_size)(type data[m_size], type *data); \
} buffer_t[1]; \ } buffer_t[1]; \
\ \
static inline void \ static inline void \
@@ -125,11 +125,13 @@ M_C(name, _init)(buffer_t v, size_t size) \
m_cond_init(v->there_is_room_for_data); \ m_cond_init(v->there_is_room_for_data); \
} else \ } else \
assert(BUFFERI_POLICY_P((policy), BUFFER_UNBLOCKING)); \ assert(BUFFERI_POLICY_P((policy), BUFFER_UNBLOCKING)); \
v->data = M_GET_REALLOC oplist (type, NULL, BUFFERI_SIZE(m_size)); \ BUFFERI_IF_CTE_SIZE(m_size)( , \
if (v->data == NULL) { \ v->data = M_GET_REALLOC oplist (type, NULL, BUFFERI_SIZE(m_size)); \
M_MEMORY_FULL (BUFFERI_SIZE(m_size)*sizeof(type)); \ if (v->data == NULL) { \
return; \ M_MEMORY_FULL (BUFFERI_SIZE(m_size)*sizeof(type)); \
} \ return; \
} \
) \
if (!BUFFERI_POLICY_P((policy), BUFFER_PUSH_INIT_POP_MOVE)) { \ if (!BUFFERI_POLICY_P((policy), BUFFER_PUSH_INIT_POP_MOVE)) { \
for(size_t i = 0; i < size; i++) { \ for(size_t i = 0; i < size; i++) { \
M_GET_INIT oplist(v->data[i]); \ M_GET_INIT oplist(v->data[i]); \
@@ -167,8 +169,10 @@ M_C(name, _init)(buffer_t v, size_t size) \
{ \ { \
BUFFERI_CONTRACT(v,m_size); \ BUFFERI_CONTRACT(v,m_size); \
M_C(name, _int_clear_obj)(v); \ M_C(name, _int_clear_obj)(v); \
M_GET_FREE oplist (v->data); \ BUFFERI_IF_CTE_SIZE(m_size)( , \
v->data = NULL; \ M_GET_FREE oplist (v->data); \
v->data = NULL; \
) \
v->overwrite = 0; \ v->overwrite = 0; \
if (!BUFFERI_POLICY_P((policy), BUFFER_THREAD_UNSAFE)) { \ if (!BUFFERI_POLICY_P((policy), BUFFER_THREAD_UNSAFE)) { \
m_mutex_clear(v->mutex); \ m_mutex_clear(v->mutex); \