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

Port to new memory model

Browse Source
This commit is contained in:
Patrick Pelissier committed 2025-05-07 21:02:23 +02:00
1 parent 57e7510ae7
commit 7617048073
1 file changed
+23 -29
Download Patch File Download Diff File Expand all files Collapse all files
m-snapshot.h
+23 -29
View File
@@ -150,6 +150,7 @@ M_BEGIN_PROTECTED_CODE
#define M_SNAPSH0T_SPSC_CONTRACT(snap) do { \ #define M_SNAPSH0T_SPSC_CONTRACT(snap) do { \
M_ASSERT((snap) != NULL); \ M_ASSERT((snap) != NULL); \
unsigned char f = atomic_load (&(snap)->flags); \ unsigned char f = atomic_load (&(snap)->flags); \
(void) f; \
M_SNAPSH0T_SPSC_FLAGS_CONTRACT(f); \ M_SNAPSH0T_SPSC_FLAGS_CONTRACT(f); \
} while (0) } while (0)
@@ -197,10 +198,10 @@ M_BEGIN_PROTECTED_CODE
/* Define the core functions */ /* Define the core functions */
#define M_SNAPSH0T_SPSC_DEF_CORE(name, type, oplist, snapshot_t) \ #define M_SNAPSH0T_SPSC_DEF_CORE(name, type, oplist, snapshot_t) \
\ \
M_INLINE void \ M_P(void, name, _init, snapshot_t snap) \
M_F(name, _init)(snapshot_t snap) \
{ \ { \
M_ASSERT(snap != NULL); \ M_ASSERT(snap != NULL); \
M_ASSERT_POOL(); \
for(int i = 0; i < M_SNAPSH0T_SPSC_MAX_BUFFER; i++) { \ for(int i = 0; i < M_SNAPSH0T_SPSC_MAX_BUFFER; i++) { \
M_CALL_INIT(oplist, snap->data[i].x); \ M_CALL_INIT(oplist, snap->data[i].x); \
} \ } \
@@ -208,20 +209,20 @@ M_BEGIN_PROTECTED_CODE
M_SNAPSH0T_SPSC_CONTRACT(snap); \ M_SNAPSH0T_SPSC_CONTRACT(snap); \
} \ } \
\ \
M_INLINE void \ M_P(void, name, _clear, snapshot_t snap) \
M_F(name, _clear)(snapshot_t snap) \
{ \ { \
M_SNAPSH0T_SPSC_CONTRACT(snap); \ M_SNAPSH0T_SPSC_CONTRACT(snap); \
M_ASSERT_POOL(); \
for(int i = 0; i < M_SNAPSH0T_SPSC_MAX_BUFFER; i++) { \ for(int i = 0; i < M_SNAPSH0T_SPSC_MAX_BUFFER; i++) { \
M_CALL_CLEAR(oplist, snap->data[i].x); \ M_CALL_CLEAR(oplist, snap->data[i].x); \
} \ } \
} \ } \
\ \
/* const is missing for org due to use of atomic_load of org */ \ /* const is missing for org due to use of atomic_load of org */ \
M_INLINE void \ M_P(void, name, _init_set, snapshot_t snap, snapshot_t org) \
M_F(name, _init_set)(snapshot_t snap, snapshot_t org) \
{ \ { \
M_SNAPSH0T_SPSC_CONTRACT(org); \ M_SNAPSH0T_SPSC_CONTRACT(org); \
M_ASSERT_POOL(); \
M_ASSERT(snap != NULL && snap != org); \ M_ASSERT(snap != NULL && snap != org); \
for(int i = 0; i < M_SNAPSH0T_SPSC_MAX_BUFFER; i++) { \ for(int i = 0; i < M_SNAPSH0T_SPSC_MAX_BUFFER; i++) { \
M_CALL_INIT_SET(oplist, snap->data[i].x, org->data[i].x); \ M_CALL_INIT_SET(oplist, snap->data[i].x, org->data[i].x); \
@@ -231,11 +232,11 @@ M_BEGIN_PROTECTED_CODE
} \ } \
\ \
/* const is missing for org due to use of atomic_load of org */ \ /* const is missing for org due to use of atomic_load of org */ \
M_INLINE void \ M_P(void, name, _set, snapshot_t snap, snapshot_t org) \
M_F(name, _set)(snapshot_t snap, snapshot_t org) \
{ \ { \
M_SNAPSH0T_SPSC_CONTRACT(snap); \ M_SNAPSH0T_SPSC_CONTRACT(snap); \
M_SNAPSH0T_SPSC_CONTRACT(org); \ M_SNAPSH0T_SPSC_CONTRACT(org); \
M_ASSERT_POOL(); \
for(int i = 0; i < M_SNAPSH0T_SPSC_MAX_BUFFER; i++) { \ for(int i = 0; i < M_SNAPSH0T_SPSC_MAX_BUFFER; i++) { \
M_CALL_SET(oplist, snap->data[i].x, org->data[i].x); \ M_CALL_SET(oplist, snap->data[i].x, org->data[i].x); \
} \ } \
@@ -259,12 +260,11 @@ M_BEGIN_PROTECTED_CODE
,) /* IF_METHOD (INIT_MOVE) */ \ ,) /* IF_METHOD (INIT_MOVE) */ \
\ \
M_IF_METHOD(MOVE, oplist)( \ M_IF_METHOD(MOVE, oplist)( \
M_INLINE void \ M_P(void, name, _move, snapshot_t snap, snapshot_t org) \
M_F(name, _move)(snapshot_t snap, \
snapshot_t org) \
{ \ { \
M_SNAPSH0T_SPSC_CONTRACT(snap); \ M_SNAPSH0T_SPSC_CONTRACT(snap); \
M_SNAPSH0T_SPSC_CONTRACT(org); \ M_SNAPSH0T_SPSC_CONTRACT(org); \
M_ASSERT_POOL(); \
M_ASSERT(snap != org); \ M_ASSERT(snap != org); \
for(int i = 0; i < M_SNAPSH0T_SPSC_MAX_BUFFER; i++) { \ for(int i = 0; i < M_SNAPSH0T_SPSC_MAX_BUFFER; i++) { \
M_CALL_MOVE(oplist, snap->data[i].x, org->data[i].x); \ M_CALL_MOVE(oplist, snap->data[i].x, org->data[i].x); \
@@ -382,8 +382,7 @@ typedef struct m_snapsh0t_mrsw_s {
} while (0) } while (0)
/* Initialize m_snapsh0t_mrsw_ct for n readers (constructor) */ /* Initialize m_snapsh0t_mrsw_ct for n readers (constructor) */
M_INLINE void M_P(void, m_snapsh0t, _mrsw_init, m_snapsh0t_mrsw_ct s, size_t n)
m_snapsh0t_mrsw_init(m_snapsh0t_mrsw_ct s, size_t n)
{ {
M_ASSERT (s != NULL); M_ASSERT (s != NULL);
M_ASSERT (n >= 1 && n <= M_SNAPSH0T_SPMC_MAX_READER); M_ASSERT (n >= 1 && n <= M_SNAPSH0T_SPMC_MAX_READER);
@@ -398,7 +397,7 @@ m_snapsh0t_mrsw_init(m_snapsh0t_mrsw_ct s, size_t n)
s->cptTab = ptr; s->cptTab = ptr;
for(size_t i = 0; i < n; i++) for(size_t i = 0; i < n; i++)
atomic_init(&s->cptTab[i], 0U); atomic_init(&s->cptTab[i], 0U);
m_genint_init (s->freeList, (unsigned int) n); m_genint_init M_R(s->freeList, (unsigned int) n);
// Get a free buffer and set it as available for readers // Get a free buffer and set it as available for readers
unsigned int w = m_genint_pop(s->freeList); unsigned int w = m_genint_pop(s->freeList);
@@ -414,12 +413,11 @@ m_snapsh0t_mrsw_init(m_snapsh0t_mrsw_ct s, size_t n)
} }
/* Clear m_snapsh0t_mrsw_ct (destructor) */ /* Clear m_snapsh0t_mrsw_ct (destructor) */
M_INLINE void M_P(void, m_snapsh0t, _mrsw_clear, m_snapsh0t_mrsw_ct s)
m_snapsh0t_mrsw_clear(m_snapsh0t_mrsw_ct s)
{ {
M_SNAPSH0T_SPMC_INT_CONTRACT(s); M_SNAPSH0T_SPMC_INT_CONTRACT(s);
M_MEMORY_FREE (atomic_uint, s->cptTab, s->n_reader+M_SNAPSH0T_SPMC_EXTRA_BUFFER); M_MEMORY_FREE (atomic_uint, s->cptTab, s->n_reader+M_SNAPSH0T_SPMC_EXTRA_BUFFER);
m_genint_clear(s->freeList); m_genint_clear M_R(s->freeList);
s->cptTab = NULL; s->cptTab = NULL;
s->n_reader = 0; s->n_reader = 0;
} }
@@ -638,8 +636,7 @@ m_snapsh0t_mrsw_read_end(m_snapsh0t_mrsw_ct s, unsigned int idx)
/* Define the core functions */ /* Define the core functions */
#define M_SNAPSH0T_SPMC_DEF_CORE(name, type, oplist, snapshot_t) \ #define M_SNAPSH0T_SPMC_DEF_CORE(name, type, oplist, snapshot_t) \
\ \
M_INLINE void \ M_P(void, name, _init, snapshot_t snap, size_t nReader) \
M_F(name, _init)(snapshot_t snap, size_t nReader) \
{ \ { \
M_ASSERT (snap != NULL); \ M_ASSERT (snap != NULL); \
M_ASSERT (nReader > 0 && nReader <= M_SNAPSH0T_SPMC_MAX_READER); \ M_ASSERT (nReader > 0 && nReader <= M_SNAPSH0T_SPMC_MAX_READER); \
@@ -652,12 +649,11 @@ m_snapsh0t_mrsw_read_end(m_snapsh0t_mrsw_ct s, unsigned int idx)
for(size_t i = 0; i < nReader + M_SNAPSH0T_SPMC_EXTRA_BUFFER; i++) { \ for(size_t i = 0; i < nReader + M_SNAPSH0T_SPMC_EXTRA_BUFFER; i++) { \
M_CALL_INIT(oplist, snap->data[i].x); \ M_CALL_INIT(oplist, snap->data[i].x); \
} \ } \
m_snapsh0t_mrsw_init(snap->core, nReader); \ m_snapsh0t_mrsw_init M_R(snap->core, nReader); \
M_SNAPSH0T_SPMC_CONTRACT(snap); \ M_SNAPSH0T_SPMC_CONTRACT(snap); \
} \ } \
\ \
M_INLINE void \ M_P(void, name, _clear, snapshot_t snap) \
M_F(name, _clear)(snapshot_t snap) \
{ \ { \
M_SNAPSH0T_SPMC_CONTRACT(snap); \ M_SNAPSH0T_SPMC_CONTRACT(snap); \
size_t nReader = m_snapsh0t_mrsw_size(snap->core); \ size_t nReader = m_snapsh0t_mrsw_size(snap->core); \
@@ -665,7 +661,7 @@ m_snapsh0t_mrsw_read_end(m_snapsh0t_mrsw_ct s, unsigned int idx)
M_CALL_CLEAR(oplist, snap->data[i].x); \ M_CALL_CLEAR(oplist, snap->data[i].x); \
} \ } \
M_CALL_FREE(oplist, M_F(name, _aligned_type_ct), snap->data, nReader + M_SNAPSH0T_SPMC_EXTRA_BUFFER); \ M_CALL_FREE(oplist, M_F(name, _aligned_type_ct), snap->data, nReader + M_SNAPSH0T_SPMC_EXTRA_BUFFER); \
m_snapsh0t_mrsw_clear(snap->core); \ m_snapsh0t_mrsw_clear M_R(snap->core); \
} \ } \
\ \
M_INLINE type * \ M_INLINE type * \
@@ -744,19 +740,17 @@ m_snapsh0t_mrsw_read_end(m_snapsh0t_mrsw_ct s, unsigned int idx)
/* Define the core functions */ /* Define the core functions */
#define M_SNAPSH0T_MPMC_DEF_CORE(name, type, oplist, snapshot_t) \ #define M_SNAPSH0T_MPMC_DEF_CORE(name, type, oplist, snapshot_t) \
\ \
M_INLINE void \ M_P(void, name, _init, snapshot_t snap, size_t nReader, size_t nWriter) \
M_F(name, _init)(snapshot_t snap, size_t nReader, size_t nWriter) \
{ \ { \
M_F(name, _mrsw_init)(snap->core, nReader + nWriter -1 ); \ M_F(name, _mrsw_init)M_R(snap->core, nReader + nWriter -1 ); \
unsigned int idx = snap->core->core->currentWrite; \ unsigned int idx = snap->core->core->currentWrite; \
snap->core->core->currentWrite = M_GENINT_ERROR; \ snap->core->core->currentWrite = M_GENINT_ERROR; \
m_snapsh0t_mrsw_write_end(snap->core->core, idx); \ m_snapsh0t_mrsw_write_end(snap->core->core, idx); \
} \ } \
\ \
M_INLINE void \ M_P(void, name, _clear, snapshot_t snap) \
M_F(name, _clear)(snapshot_t snap) \
{ \ { \
M_F(name, _mrsw_clear)(snap->core); \ M_F(name, _mrsw_clear)M_R(snap->core); \
} \ } \
\ \
M_INLINE type * \ M_INLINE type * \