From fe286f7d17a41ee2c2bee8b93fe1dd1a3b6ba10e Mon Sep 17 00:00:00 2001 From: Florin Coras Date: Fri, 4 Jun 2021 10:07:55 -0700 Subject: vcl: basic support for epoll level-triggered evts Type: feature Signed-off-by: Florin Coras Change-Id: I2d5039cd35edd02ffa2439bcac119d0647234385 --- src/plugins/hs_apps/vcl/sock_test_server.c | 6 +++--- src/plugins/hs_apps/vcl/vcl_test_server.c | 6 +++--- 2 files changed, 6 insertions(+), 6 deletions(-) (limited to 'src/plugins') diff --git a/src/plugins/hs_apps/vcl/sock_test_server.c b/src/plugins/hs_apps/vcl/sock_test_server.c index 6e4d6ea17fd..d516c1722db 100644 --- a/src/plugins/hs_apps/vcl/sock_test_server.c +++ b/src/plugins/hs_apps/vcl/sock_test_server.c @@ -292,7 +292,7 @@ new_client (void) struct epoll_event ev; int rv; - ev.events = EPOLLIN; + ev.events = EPOLLET | EPOLLIN; ev.data.u64 = conn - ssm->conn_pool; rv = epoll_ctl (ssm->epfd, EPOLL_CTL_ADD, client_fd, &ev); @@ -329,7 +329,7 @@ socket_server_echo_af_unix_init (sock_server_main_t * ssm) if (rv < 0) stfail ("echo_af_unix_init listen()"); - ssm->af_unix_listen_ev.events = EPOLLIN; + ssm->af_unix_listen_ev.events = EPOLLET | EPOLLIN; ssm->af_unix_listen_ev.data.u32 = SOCK_TEST_AF_UNIX_ACCEPT_DATA; rv = epoll_ctl (ssm->epfd, EPOLL_CTL_ADD, ssm->af_unix_listen_fd, &ssm->af_unix_listen_ev); @@ -542,7 +542,7 @@ main (int argc, char **argv) if (ssm->epfd < 0) stfail ("main epoll_create()"); - ssm->listen_ev.events = EPOLLIN; + ssm->listen_ev.events = EPOLLET | EPOLLIN; ssm->listen_ev.data.u32 = ~0; rv = epoll_ctl (ssm->epfd, EPOLL_CTL_ADD, ssm->listen_fd, &ssm->listen_ev); diff --git a/src/plugins/hs_apps/vcl/vcl_test_server.c b/src/plugins/hs_apps/vcl/vcl_test_server.c index ca21a4bfe08..78d7752dd68 100644 --- a/src/plugins/hs_apps/vcl/vcl_test_server.c +++ b/src/plugins/hs_apps/vcl/vcl_test_server.c @@ -334,7 +334,7 @@ vts_accept_client (vcl_test_server_worker_t *wrk, int listen_fd) vtinf ("Got a connection -- fd = %d (0x%08x) on listener fd = %d (0x%08x)", conn->fd, conn->fd, listen_fd, listen_fd); - ev.events = EPOLLIN; + ev.events = EPOLLET | EPOLLIN; ev.data.u64 = conn - wrk->conn_pool; rv = vppcom_epoll_ctl (wrk->epfd, EPOLL_CTL_ADD, conn->fd, &ev); if (rv < 0) @@ -561,7 +561,7 @@ vts_worker_init (vcl_test_server_worker_t * wrk) vtfail ("vppcom_epoll_create()", wrk->epfd); } - listen_ev.events = EPOLLIN; + listen_ev.events = EPOLLET | EPOLLIN; listen_ev.data.u32 = VCL_TEST_DATA_LISTENER; rv = vppcom_epoll_ctl (wrk->epfd, EPOLL_CTL_ADD, wrk->listener.fd, &listen_ev); @@ -769,7 +769,7 @@ vts_ctrl_session_init (vcl_test_server_worker_t *wrk) if (wrk->epfd < 0) vtfail ("vppcom_epoll_create()", wrk->epfd); - listen_ev.events = EPOLLIN; + listen_ev.events = EPOLLET | EPOLLIN; listen_ev.data.u32 = VCL_TEST_CTRL_LISTENER; rv = vppcom_epoll_ctl (wrk->epfd, EPOLL_CTL_ADD, vsm->ctrl_listen_fd, &listen_ev); -- cgit 1.2.3-korg