ligang/vpp
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

vcl: EPOLLOUT should be generated when epoll_ctl called with EPOLLOUT

Browse Source 
event

Type: fix

When we call epoll_ctl to add or mod fd with EPOLLOUT event, mostly to
check if we can write. So we expect a EPOLLOUT event should be generated
immediately unless tx queue is full.

Signed-off-by: hanlin <hanlin_wang@163.com>
Change-Id: Ie99986a44dbb07b6ff2fba6512171056f79e77bd
This commit is contained in:
hanlin
2019-12-26 11:44:28 +08:00
committed by Florin Coras
parent 3f7b0f4a7c
commit 475c9d7bcd
1 changed files with 20 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
src/vcl/vppcom.c
View File

@ -2518,6 +2518,15 @@ vppcom_epoll_ctl (uint32_t vep_handle, int op, uint32_t session_handle,
svm_fifo_add_want_deq_ntf (session->tx_fifo, svm_fifo_add_want_deq_ntf (session->tx_fifo,
SVM_FIFO_WANT_DEQ_NOTIF_IF_FULL); SVM_FIFO_WANT_DEQ_NOTIF_IF_FULL);
/* Generate EPOLLOUT when tx_fifo/ct_tx_fifo not full */
if ((event->events & EPOLLOUT) &&
(vcl_session_write_ready (session) > 0))
{
session_event_t e = { 0 };
e.event_type = SESSION_IO_EVT_TX;
e.session_index = session->session_index;
vec_add1 (wrk->unhandled_evts_vector, e);
}
VDBG (1, "EPOLL_CTL_ADD: vep_sh %u, sh %u, events 0x%x, data 0x%llx!", VDBG (1, "EPOLL_CTL_ADD: vep_sh %u, sh %u, events 0x%x, data 0x%llx!",
vep_handle, session_handle, event->events, event->data.u64); vep_handle, session_handle, event->events, event->data.u64);
vcl_evt (VCL_EVT_EPOLL_CTLADD, session, event->events, event->data.u64); vcl_evt (VCL_EVT_EPOLL_CTLADD, session, event->events, event->data.u64);
@ -2543,6 +2552,17 @@ vppcom_epoll_ctl (uint32_t vep_handle, int op, uint32_t session_handle,
rv = VPPCOM_EINVAL; rv = VPPCOM_EINVAL;
goto done; goto done;
} }
/* Generate EPOLLOUT when tx_fifo/ct_tx_fifo not full */
if ((event->events & EPOLLOUT) &&
!(session->vep.ev.events & EPOLLOUT) &&
(vcl_session_write_ready (session) > 0))
{
session_event_t e = { 0 };
e.event_type = SESSION_IO_EVT_TX;
e.session_index = session->session_index;
vec_add1 (wrk->unhandled_evts_vector, e);
}
session->vep.et_mask = VEP_DEFAULT_ET_MASK; session->vep.et_mask = VEP_DEFAULT_ET_MASK;
session->vep.ev = *event; session->vep.ev = *event;
VDBG (1, "EPOLL_CTL_MOD: vep_sh %u, sh %u, events 0x%x, data 0x%llx!", VDBG (1, "EPOLL_CTL_MOD: vep_sh %u, sh %u, events 0x%x, data 0x%llx!",