diff options
Diffstat (limited to 'src/vnet')
| -rw-r--r-- | src/vnet/session/application_interface.h | 2 | ||||
| -rw-r--r-- | src/vnet/session/session_node.c | 5 |
2 files changed, 3 insertions, 4 deletions
diff --git a/src/vnet/session/application_interface.h b/src/vnet/session/application_interface.h index b2e0ef9da84..87bcd902254 100644 --- a/src/vnet/session/application_interface.h +++ b/src/vnet/session/application_interface.h @@ -600,7 +600,7 @@ app_send_io_evt_to_vpp (svm_msg_q_t * mq, u32 session_index, u8 evt_type, svm_msg_q_lock (mq); while (svm_msg_q_ring_is_full (mq, SESSION_MQ_IO_EVT_RING) || svm_msg_q_is_full (mq)) - svm_msg_q_wait (mq); + svm_msg_q_wait (mq, SVM_MQ_WAIT_FULL); msg = svm_msg_q_alloc_msg_w_ring (mq, SESSION_MQ_IO_EVT_RING); evt = (session_event_t *) svm_msg_q_msg_data (mq, &msg); evt->session_index = session_index; diff --git a/src/vnet/session/session_node.c b/src/vnet/session/session_node.c index 37df0c450f8..2c91a2fe092 100644 --- a/src/vnet/session/session_node.c +++ b/src/vnet/session/session_node.c @@ -1425,16 +1425,15 @@ session_queue_node_fn (vlib_main_t * vm, vlib_node_runtime_t * node, * XXX: we may need priorities here */ mq = wrk->vpp_event_queue; n_to_dequeue = svm_msg_q_size (mq); - if (n_to_dequeue && svm_msg_q_try_lock (mq) == 0) + if (n_to_dequeue) { for (i = 0; i < n_to_dequeue; i++) { - svm_msg_q_sub_w_lock (mq, msg); + svm_msg_q_sub_raw (mq, msg); evt = svm_msg_q_msg_data (mq, msg); session_evt_add_to_list (wrk, evt); svm_msg_q_free_msg (mq, msg); } - svm_msg_q_unlock (mq); } SESSION_EVT (SESSION_EVT_DSP_CNTRS, MQ_DEQ, wrk, n_to_dequeue, !i); |