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

Remove use of atomic_uint_fast8_t:

Browse Source 
this type may not be available on all targets.
Use plain atomic_uchar instead.

Use of atomic_load to read an atomic_uchar.

Remove const from prototype since atomic_load
doesn't support const pointers.
This commit is contained in:
Patrick Pelissier committed 2017-04-08 11:21:30 +02:00
1 parent 6e19864d44
commit 7d6f1861c9
1 file changed
+9 -8
Download Patch File Download Diff File Expand all files Collapse all files
m-snapshot.h
+9 -8
View File
@@ -27,7 +27,6 @@
#include <assert.h> #include <assert.h>
#include <stdatomic.h> #include <stdatomic.h>
#include <stdint.h>
#include "m-core.h" #include "m-core.h"
@@ -78,20 +77,22 @@
#define SNAPSHOTI_B(flags) \ #define SNAPSHOTI_B(flags) \
(((flags) >> 6) & 0x01u) (((flags) >> 6) & 0x01u)
/* NOTE: Due to atomic_load only accepting non-const pointer,
we can't have any const in the interface. */
#define SNAPSHOTI_FLAGS_CONTRACT(flags) \ #define SNAPSHOTI_FLAGS_CONTRACT(flags) \
assert(SNAPSHOTI_R(flags) != SNAPSHOTI_W(flags) \ assert(SNAPSHOTI_R(flags) != SNAPSHOTI_W(flags) \
&& SNAPSHOTI_R(flags) != SNAPSHOTI_F(flags) \ && SNAPSHOTI_R(flags) != SNAPSHOTI_F(flags) \
&& SNAPSHOTI_W(flags) != SNAPSHOTI_F(flags)) && SNAPSHOTI_W(flags) != SNAPSHOTI_F(flags))
#define SNAPSHOTI_CONTRACT(snap) do { \ #define SNAPSHOTI_CONTRACT(snap) do { \
assert((snap) != NULL); \ assert((snap) != NULL); \
uint_fast8_t f = (snap)->flags; \ unsigned char f = atomic_load (&(snap)->flags); \
SNAPSHOTI_FLAGS_CONTRACT(f); \ SNAPSHOTI_FLAGS_CONTRACT(f); \
} while (0) } while (0)
#define SNAPSHOTI_DEF2(name, type, oplist) \ #define SNAPSHOTI_DEF2(name, type, oplist) \
typedef struct M_C3(snapshot_, name, _s) { \ typedef struct M_C3(snapshot_, name, _s) { \
type data[3]; \ type data[3]; \
atomic_uint_fast8_t flags; \ atomic_uchar flags; \
} M_C3(snapshot_, name, _t)[1]; \ } M_C3(snapshot_, name, _t)[1]; \
typedef type M_C3(snapshot_type_, name, _t); \ typedef type M_C3(snapshot_type_, name, _t); \
\ \
@@ -127,7 +128,7 @@
} \ } \
\ \
static inline void M_C3(snapshot_, name, _init_set)(M_C3(snapshot_, name, _t) snap, \ static inline void M_C3(snapshot_, name, _init_set)(M_C3(snapshot_, name, _t) snap, \
const M_C3(snapshot_, name, _t) org) \ M_C3(snapshot_, name, _t) org) \
{ \ { \
SNAPSHOTI_CONTRACT(org); \ SNAPSHOTI_CONTRACT(org); \
assert(snap != NULL && snap != org); \ assert(snap != NULL && snap != org); \
@@ -139,7 +140,7 @@
} \ } \
\ \
static inline void M_C3(snapshot_, name, _set)(M_C3(snapshot_, name, _t) snap, \ static inline void M_C3(snapshot_, name, _set)(M_C3(snapshot_, name, _t) snap, \
const M_C3(snapshot_, name, _t) org) \ M_C3(snapshot_, name, _t) org) \
{ \ { \
SNAPSHOTI_CONTRACT(snap); \ SNAPSHOTI_CONTRACT(snap); \
SNAPSHOTI_CONTRACT(org); \ SNAPSHOTI_CONTRACT(org); \
@@ -184,7 +185,7 @@
static inline type *M_C3(snapshot_, name, _take)(M_C3(snapshot_, name, _t) snap) \ static inline type *M_C3(snapshot_, name, _take)(M_C3(snapshot_, name, _t) snap) \
{ \ { \
SNAPSHOTI_CONTRACT(snap); \ SNAPSHOTI_CONTRACT(snap); \
uint_fast8_t nextFlags, origFlags = snap->flags; \ unsigned char nextFlags, origFlags = atomic_load (&snap->flags); \
do { \ do { \
nextFlags = SNAPSHOTI_FLAG(SNAPSHOTI_R(origFlags), \ nextFlags = SNAPSHOTI_FLAG(SNAPSHOTI_R(origFlags), \
SNAPSHOTI_F(origFlags), \ SNAPSHOTI_F(origFlags), \
@@ -197,7 +198,7 @@
static inline const type *M_C3(snapshot_, name, _look)(M_C3(snapshot_, name, _t) snap) \ static inline const type *M_C3(snapshot_, name, _look)(M_C3(snapshot_, name, _t) snap) \
{ \ { \
SNAPSHOTI_CONTRACT(snap); \ SNAPSHOTI_CONTRACT(snap); \
uint_fast8_t nextFlags, origFlags = snap->flags; \ unsigned char nextFlags, origFlags = atomic_load (&snap->flags); \
do { \ do { \
if (!SNAPSHOTI_B(origFlags)) \ if (!SNAPSHOTI_B(origFlags)) \
break; \ break; \
@@ -215,7 +216,7 @@
return &snap->data[SNAPSHOTI_W(snap->flags)]; \ return &snap->data[SNAPSHOTI_W(snap->flags)]; \
} \ } \
\ \
static inline const type *M_C3(snapshot_, name, _get_consummed)(const M_C3(snapshot_, name, _t) snap) \ static inline const type *M_C3(snapshot_, name, _get_consummed)(M_C3(snapshot_, name, _t) snap) \
{ \ { \
SNAPSHOTI_CONTRACT(snap); \ SNAPSHOTI_CONTRACT(snap); \
return &snap->data[SNAPSHOTI_R(snap->flags)]; \ return &snap->data[SNAPSHOTI_R(snap->flags)]; \