Code Review
/
vpp.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
hsa: fix vpp_echo mq locking
[vpp.git]
/
src
/
svm
/
message_queue.c
diff --git
a/src/svm/message_queue.c
b/src/svm/message_queue.c
index
d6a77e7
..
6113450
100644
(file)
--- a/
src/svm/message_queue.c
+++ b/
src/svm/message_queue.c
@@
-72,7
+72,7
@@
svm_msg_q_alloc (svm_msg_q_cfg_t * cfg)
vh = (vec_header_t *) ((u8 *) mq->q + q_sz);
vh->len = cfg->n_rings;
mq->rings = (svm_msg_q_ring_t *) (vh + 1);
vh = (vec_header_t *) ((u8 *) mq->q + q_sz);
vh->len = cfg->n_rings;
mq->rings = (svm_msg_q_ring_t *) (vh + 1);
- rings_ptr = (u8 *) mq->rings +
vec_sz
;
+ rings_ptr = (u8 *) mq->rings +
sizeof (svm_msg_q_ring_t) * cfg->n_rings
;
for (i = 0; i < cfg->n_rings; i++)
{
ring = &mq->rings[i];
for (i = 0; i < cfg->n_rings; i++)
{
ring = &mq->rings[i];
@@
-108,7
+108,7
@@
svm_msg_q_alloc_msg_w_ring (svm_msg_q_t * mq, u32 ring_index)
msg.ring_index = ring - mq->rings;
msg.elt_index = ring->tail;
ring->tail = (ring->tail + 1) % ring->nitems;
msg.ring_index = ring - mq->rings;
msg.elt_index = ring->tail;
ring->tail = (ring->tail + 1) % ring->nitems;
-
__sync_fetch_and
_add (&ring->cursize, 1);
+
clib_atomic_fetch
_add (&ring->cursize, 1);
return msg;
}
return msg;
}
@@
-120,22
+120,19
@@
svm_msg_q_lock_and_alloc_msg_w_ring (svm_msg_q_t * mq, u32 ring_index,
{
if (svm_msg_q_try_lock (mq))
return -1;
{
if (svm_msg_q_try_lock (mq))
return -1;
- if (PREDICT_FALSE (svm_msg_q_ring_is_full (mq, ring_index)))
+ if (PREDICT_FALSE (svm_msg_q_is_full (mq)
+ || svm_msg_q_ring_is_full (mq, ring_index)))
{
svm_msg_q_unlock (mq);
return -2;
}
*msg = svm_msg_q_alloc_msg_w_ring (mq, ring_index);
{
svm_msg_q_unlock (mq);
return -2;
}
*msg = svm_msg_q_alloc_msg_w_ring (mq, ring_index);
- if (PREDICT_FALSE (svm_msg_q_msg_is_invalid (msg)))
- {
- svm_msg_q_unlock (mq);
- return -2;
- }
}
else
{
svm_msg_q_lock (mq);
}
else
{
svm_msg_q_lock (mq);
- while (svm_msg_q_ring_is_full (mq, ring_index))
+ while (svm_msg_q_is_full (mq)
+ || svm_msg_q_ring_is_full (mq, ring_index))
svm_msg_q_wait (mq);
*msg = svm_msg_q_alloc_msg_w_ring (mq, ring_index);
}
svm_msg_q_wait (mq);
*msg = svm_msg_q_alloc_msg_w_ring (mq, ring_index);
}
@@
-155,7
+152,7
@@
svm_msg_q_alloc_msg (svm_msg_q_t * mq, u32 nbytes)
msg.ring_index = ring - mq->rings;
msg.elt_index = ring->tail;
ring->tail = (ring->tail + 1) % ring->nitems;
msg.ring_index = ring - mq->rings;
msg.elt_index = ring->tail;
ring->tail = (ring->tail + 1) % ring->nitems;
-
__sync_fetch_and
_add (&ring->cursize, 1);
+
clib_atomic_fetch
_add (&ring->cursize, 1);
break;
}
return msg;
break;
}
return msg;
@@
-173,8
+170,7
@@
svm_msg_q_free_msg (svm_msg_q_t * mq, svm_msg_q_msg_t * msg)
{
svm_msg_q_ring_t *ring;
{
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)
{
ring = &mq->rings[msg->ring_index];
if (msg->elt_index == ring->head)
{
@@
-182,10
+178,11
@@
svm_msg_q_free_msg (svm_msg_q_t * mq, svm_msg_q_msg_t * msg)
}
else
{
}
else
{
+ clib_warning ("message out of order");
/* for now, expect messages to be processed in order */
ASSERT (0);
}
/* for now, expect messages to be processed in order */
ASSERT (0);
}
-
__sync_fetch_and
_sub (&ring->cursize, 1);
+
clib_atomic_fetch
_sub (&ring->cursize, 1);
}
static int
}
static int