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

Rename internal types.

Browse Source
This commit is contained in:
Patrick Pelissier committed 2020-10-16 20:51:24 +02:00
1 parent 86f942ee5f
commit 9bb1957afa
2 files changed
+11 -11
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

m-concurrent.h
+1 -1
View File
@@ -721,7 +721,7 @@
typedef struct M_C(name, _s) *M_C(name, _ptr); \ typedef struct M_C(name, _s) *M_C(name, _ptr); \
typedef const struct M_C(name, _s) *M_C(name, _srcptr); \ typedef const struct M_C(name, _s) *M_C(name, _srcptr); \
\ \
typedef type M_C(name, _type_t); \ typedef type M_C(name, _subtype_ct); \
\ \
/* Define the lock strategy (multi lock) */ \ /* Define the lock strategy (multi lock) */ \
static inline void \ static inline void \
m-snapshot.h
+10 -10
View File
@@ -184,10 +184,10 @@ M_BEGIN_PROTECTED_CODE
typedef struct M_C(name, _aligned_type_s) { \ typedef struct M_C(name, _aligned_type_s) { \
type x; \ type x; \
M_CACHELINE_ALIGN(align, type); \ M_CACHELINE_ALIGN(align, type); \
} M_C(name, _aligned_type_t); \ } M_C(name, _aligned_type_ct); \
\ \
typedef struct M_C(name, _s) { \ typedef struct M_C(name, _s) { \
M_C(name, _aligned_type_t) data[SNAPSHOTI_SPSC_MAX_BUFFER]; \ M_C(name, _aligned_type_ct) data[SNAPSHOTI_SPSC_MAX_BUFFER]; \
atomic_uchar flags; \ atomic_uchar flags; \
} snapshot_t[1]; \ } snapshot_t[1]; \
typedef struct M_C(name, _s) *M_C(name, _ptr); \ typedef struct M_C(name, _s) *M_C(name, _ptr); \
@@ -619,10 +619,10 @@ snapshot_mrsw_int_read_end(snapshot_mrsw_int_ct s, unsigned int idx)
typedef struct M_C(name, _aligned_type_s) { \ typedef struct M_C(name, _aligned_type_s) { \
type x; \ type x; \
M_CACHELINE_ALIGN(align, type); \ M_CACHELINE_ALIGN(align, type); \
} M_C(name, _aligned_type_t); \ } M_C(name, _aligned_type_ct); \
\ \
typedef struct M_C(name, _s) { \ typedef struct M_C(name, _s) { \
M_C(name, _aligned_type_t) *data; \ M_C(name, _aligned_type_ct) *data; \
snapshot_mrsw_int_ct core; \ snapshot_mrsw_int_ct core; \
} snapshot_t[1]; \ } snapshot_t[1]; \
\ \
@@ -637,10 +637,10 @@ snapshot_mrsw_int_read_end(snapshot_mrsw_int_ct s, unsigned int idx)
{ \ { \
assert (snap != NULL); \ assert (snap != NULL); \
assert (nReader > 0 && nReader <= SNAPSHOTI_SPMC_MAX_READER); \ assert (nReader > 0 && nReader <= SNAPSHOTI_SPMC_MAX_READER); \
snap->data = M_CALL_REALLOC(oplist, M_C(name, _aligned_type_t), \ snap->data = M_CALL_REALLOC(oplist, M_C(name, _aligned_type_ct), \
NULL, nReader+SNAPSHOTI_SPMC_EXTRA_BUFFER); \ NULL, nReader+SNAPSHOTI_SPMC_EXTRA_BUFFER); \
if (M_UNLIKELY (snap->data == NULL)) { \ if (M_UNLIKELY (snap->data == NULL)) { \
M_MEMORY_FULL(sizeof(M_C(name, _aligned_type_t)) * \ M_MEMORY_FULL(sizeof(M_C(name, _aligned_type_ct)) * \
(nReader+SNAPSHOTI_SPMC_EXTRA_BUFFER)); \ (nReader+SNAPSHOTI_SPMC_EXTRA_BUFFER)); \
return; \ return; \
} \ } \
@@ -684,8 +684,8 @@ snapshot_mrsw_int_read_end(snapshot_mrsw_int_ct s, unsigned int idx)
{ \ { \
SNAPSHOTI_SPMC_CONTRACT(snap); \ SNAPSHOTI_SPMC_CONTRACT(snap); \
assert (old != NULL); \ assert (old != NULL); \
const M_C(name, _aligned_type_t) *oldx; \ const M_C(name, _aligned_type_ct) *oldx; \
oldx = M_CTYPE_FROM_FIELD(M_C(name, _aligned_type_t), old, type, x); \ oldx = M_CTYPE_FROM_FIELD(M_C(name, _aligned_type_ct), old, type, x); \
assert (oldx >= snap->data); \ assert (oldx >= snap->data); \
assert (oldx < snap->data + snap->core->n_reader + SNAPSHOTI_SPMC_EXTRA_BUFFER); \ assert (oldx < snap->data + snap->core->n_reader + SNAPSHOTI_SPMC_EXTRA_BUFFER); \
assert(snap->core->n_reader +SNAPSHOTI_SPMC_EXTRA_BUFFER < UINT_MAX); \ assert(snap->core->n_reader +SNAPSHOTI_SPMC_EXTRA_BUFFER < UINT_MAX); \
@@ -763,8 +763,8 @@ snapshot_mrsw_int_read_end(snapshot_mrsw_int_ct s, unsigned int idx)
M_C(name, _write_end)(snapshot_t snap, type *old) \ M_C(name, _write_end)(snapshot_t snap, type *old) \
{ \ { \
SNAPSHOTI_SPMC_CONTRACT(snap->core); \ SNAPSHOTI_SPMC_CONTRACT(snap->core); \
const M_C(name, _mrsw_aligned_type_t) *oldx; \ const M_C(name, _mrsw_aligned_type_ct) *oldx; \
oldx = M_CTYPE_FROM_FIELD(M_C(name, _mrsw_aligned_type_t), old, type, x); \ oldx = M_CTYPE_FROM_FIELD(M_C(name, _mrsw_aligned_type_ct), old, type, x); \
assert (oldx >= snap->core->data); \ assert (oldx >= snap->core->data); \
assert (oldx < snap->core->data + snap->core->core->n_reader + SNAPSHOTI_SPMC_EXTRA_BUFFER); \ assert (oldx < snap->core->data + snap->core->core->n_reader + SNAPSHOTI_SPMC_EXTRA_BUFFER); \
assert(snap->core->core->n_reader + SNAPSHOTI_SPMC_EXTRA_BUFFER < UINT_MAX); \ assert(snap->core->core->n_reader + SNAPSHOTI_SPMC_EXTRA_BUFFER < UINT_MAX); \