diff options
Diffstat (limited to 'src/svm')
| -rw-r--r-- | src/svm/message_queue.c | 4 | ||||
| -rw-r--r-- | src/svm/svm_fifo.h | 10 |
2 files changed, 9 insertions, 5 deletions
diff --git a/src/svm/message_queue.c b/src/svm/message_queue.c index d6a77e783e3..a73a56d8044 100644 --- a/src/svm/message_queue.c +++ b/src/svm/message_queue.c @@ -173,8 +173,7 @@ svm_msg_q_free_msg (svm_msg_q_t * mq, svm_msg_q_msg_t * msg) { svm_msg_q_ring_t *ring; - if (vec_len (mq->rings) <= msg->ring_index) - return; + ASSERT (vec_len (mq->rings) > msg->ring_index); ring = &mq->rings[msg->ring_index]; if (msg->elt_index == ring->head) { @@ -182,6 +181,7 @@ svm_msg_q_free_msg (svm_msg_q_t * mq, svm_msg_q_msg_t * msg) } else { + clib_warning ("message out of order"); /* for now, expect messages to be processed in order */ ASSERT (0); } diff --git a/src/svm/svm_fifo.h b/src/svm/svm_fifo.h index 40242614829..a8aea00996e 100644 --- a/src/svm/svm_fifo.h +++ b/src/svm/svm_fifo.h @@ -140,22 +140,26 @@ svm_fifo_has_ooo_data (svm_fifo_t * f) /** * Sets fifo event flag. * + * Also acts as a release barrier. + * * @return 1 if flag was not set. */ always_inline u8 svm_fifo_set_event (svm_fifo_t * f) { - /* Probably doesn't need to be atomic. Still, better avoid surprises */ - return __sync_lock_test_and_set (&f->has_event, 1) == 0; +// return __sync_lock_test_and_set (&f->has_event, 1) == 0; +// return __sync_bool_compare_and_swap (&f->has_event, 0, 1); + return !__atomic_exchange_n (&f->has_event, 1, __ATOMIC_RELEASE); } /** * Unsets fifo event flag. + * + * Also acts as a release barrier. */ always_inline void svm_fifo_unset_event (svm_fifo_t * f) { - /* Probably doesn't need to be atomic. Still, better avoid surprises */ __sync_lock_release (&f->has_event); } |