diff options
| -rw-r--r-- | lf_cas.h | 6 | ||||
| -rw-r--r-- | lf_fifo.c | 9 |
2 files changed, 8 insertions, 7 deletions
@@ -39,6 +39,12 @@ typedef struct lf_pointer { volatile unsigned int count; } lf_pointer_t; +union ptr_u { + lf_pointer_t ptr; + volatile long long concat; +}; + +#define lf_eql(ptra,ptrb) (((union ptr_u)(ptra)).concat == ((union ptr_u)(ptrb)).concat) /* CMPXCHG8B m64 Compare EDX:EAX with m64. If equal, set ZF and load ECX:EBX into m64. Else, clear ZF and load m64 into EDX:EAX. */ static inline unsigned int cas( volatile lf_pointer_t *mem, @@ -28,11 +28,6 @@ #include "lf_fifo.h" #include "stdlib.h" -union ptr_u { - lf_pointer_t ptr; - volatile long long concat; -}; - /* initialize an empty lf_fifo structure */ void lf_fifo_init( lf_fifo_t *q ) { q->head.ptr = q->tail.ptr = NULL; @@ -65,7 +60,7 @@ void lf_fifo_push( lf_fifo_t *q, lf_pointer_t *node ) { /* snapshot last through tail */ last = *tail.ptr; /* if tail is still consistant */ - if (((union ptr_u)tail).concat == ((union ptr_u)q->tail).concat) { + if lf_eql(tail,q->tail) { /* if last is the last node */ if (last.ptr == NULL) { tmp.count = last.count+1; @@ -105,7 +100,7 @@ lf_pointer_t* pop( lf_fifo_t *q ) { cas( &q->tail, tail, tmp ); } else { /* get the node ptr */ - node = (lf_pointer_t *)head.ptr; + node = (lf_pointer_t*)head.ptr; /* get the next head ready */ tmp.ptr = node->ptr; tmp.count = head.count+1; |