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

Rename internal field size to capacity

Browse Source 
to match what it is used for.
This commit is contained in:
Patrick Pelissier committed 2023-07-13 21:48:33 +02:00
1 parent c9bb739f24
commit e9b25f2414
1 file changed
+4 -4
Download Patch File Download Diff File Expand all files Collapse all files
m-buffer.h
+4 -4
View File
@@ -218,7 +218,7 @@ m_buff3r_number_dec(m_buff3r_number_ct n, unsigned int policy)
/* Return the size (run time or build time). /* Return the size (run time or build time).
NOTE: It assumed that the buffer variable name is 'v' */ NOTE: It assumed that the buffer variable name is 'v' */
#define M_BUFF3R_SIZE(m_size) \ #define M_BUFF3R_SIZE(m_size) \
M_BUFF3R_IF_CTE_SIZE(m_size) (m_size, v->size) M_BUFF3R_IF_CTE_SIZE(m_size) (m_size, v->capacity)
/* Contract of a buffer. /* Contract of a buffer.
Nothing particular since we cannot test much without locking it. Nothing particular since we cannot test much without locking it.
@@ -277,7 +277,7 @@ m_buff3r_number_dec(m_buff3r_number_ct n, unsigned int policy)
size_t overwrite; /* Number of overwritten values */ \ size_t overwrite; /* Number of overwritten values */ \
m_cond_t there_is_data; /* condition raised when there is data */ \ m_cond_t there_is_data; /* condition raised when there is data */ \
/* Read only Data */ \ /* Read only Data */ \
M_BUFF3R_IF_CTE_SIZE(m_size)( ,size_t size;) /* Size of the buffer */ \ M_BUFF3R_IF_CTE_SIZE(m_size)( ,size_t capacity;) /* Capacity of the buffer */ \
/* Data for a consummer */ \ /* Data for a consummer */ \
m_cond_t there_is_room_for_data; /* Cond. raised when there is room */ \ m_cond_t there_is_room_for_data; /* Cond. raised when there is room */ \
m_mutex_t mutexPop; /* MUTEX used for popping elements */ \ m_mutex_t mutexPop; /* MUTEX used for popping elements */ \
@@ -303,8 +303,8 @@ m_buff3r_number_dec(m_buff3r_number_ct n, unsigned int policy)
M_INLINE void \ M_INLINE void \
M_F(name, _init)(buffer_t v, size_t size) \ M_F(name, _init)(buffer_t v, size_t size) \
{ \ { \
M_BUFF3R_IF_CTE_SIZE(m_size)(M_ASSERT(size == m_size), v->size = size); \
M_ASSERT(size <= UINT_MAX); \ M_ASSERT(size <= UINT_MAX); \
M_BUFF3R_IF_CTE_SIZE(m_size)(M_ASSERT(size == m_size), v->capacity = size); \
v->idx_prod = v->idx_cons = v->overwrite = 0; \ v->idx_prod = v->idx_cons = v->overwrite = 0; \
m_buff3r_number_init (v->number[0], policy); \ m_buff3r_number_init (v->number[0], policy); \
if (M_BUFF3R_POLICY_P(policy, M_BUFFER_DEFERRED_POP)) \ if (M_BUFF3R_POLICY_P(policy, M_BUFFER_DEFERRED_POP)) \
@@ -320,7 +320,7 @@ M_F(name, _init)(buffer_t v, size_t size) \
\ \
M_BUFF3R_IF_CTE_SIZE(m_size)( /* Statically allocated */ , \ M_BUFF3R_IF_CTE_SIZE(m_size)( /* Statically allocated */ , \
v->data = M_CALL_REALLOC(oplist, M_F(name, _el_ct), NULL, M_BUFF3R_SIZE(m_size)); \ v->data = M_CALL_REALLOC(oplist, M_F(name, _el_ct), NULL, M_BUFF3R_SIZE(m_size)); \
if (M_UNLIKELY_NOMEM (v->data == NULL)) { \ if (M_UNLIKELY_NOMEM (v->data == NULL)) { \
M_MEMORY_FULL (M_BUFF3R_SIZE(m_size)*sizeof(M_F(name, _el_ct))); \ M_MEMORY_FULL (M_BUFF3R_SIZE(m_size)*sizeof(M_F(name, _el_ct))); \
return; \ return; \
} \ } \