From 539663c401b087e4576e41af35144e73e1907c9d Mon Sep 17 00:00:00 2001 From: Florin Coras Date: Fri, 28 Sep 2018 14:59:37 -0700 Subject: vcl: handle old events before blocking in epoll Change-Id: I3e62c787882d93c3bfb398ed0d04ef56b3a60b2b Signed-off-by: Florin Coras --- src/vcl/vppcom.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) (limited to 'src/vcl/vppcom.c') diff --git a/src/vcl/vppcom.c b/src/vcl/vppcom.c index 7274749a93d..5423bb62f9e 100644 --- a/src/vcl/vppcom.c +++ b/src/vcl/vppcom.c @@ -2421,6 +2421,9 @@ vcl_epoll_wait_handle_mq (vcl_worker_t * wrk, svm_msg_q_t * mq, session_event_t *e; int i; + if (vec_len (wrk->mq_msg_vector) && svm_msg_q_is_empty (mq)) + goto handle_dequeued; + svm_msg_q_lock (mq); if (svm_msg_q_is_empty (mq)) { @@ -2445,6 +2448,7 @@ vcl_epoll_wait_handle_mq (vcl_worker_t * wrk, svm_msg_q_t * mq, vcl_mq_dequeue_batch (wrk, mq); svm_msg_q_unlock (mq); +handle_dequeued: for (i = 0; i < vec_len (wrk->mq_msg_vector); i++) { msg = vec_elt_at_index (wrk->mq_msg_vector, i); @@ -2457,7 +2461,6 @@ vcl_epoll_wait_handle_mq (vcl_worker_t * wrk, svm_msg_q_t * mq, break; } } - vec_delete (wrk->mq_msg_vector, i, 0); return *num_ev; -- cgit 1.2.3-korg