diff --git a/src/modules/http/src/httpServer.c b/src/modules/http/src/httpServer.c index 12d41740128be8beee5523bb250eaa755c5d62f5..cca854f150865ec3fbbcddcd7dbfe41fa0c9ebb6 100644 --- a/src/modules/http/src/httpServer.c +++ b/src/modules/http/src/httpServer.c @@ -42,6 +42,10 @@ #include "httpHandle.h" #include "httpResp.h" +#ifndef EPOLLWAKEUP + #define EPOLLWAKEUP (1u << 29) +#endif + void httpFreeContext(HttpServer *pServer, HttpContext *pContext); /** @@ -441,12 +445,7 @@ void httpAcceptHttpConnection(void *arg) { pContext->pThread = pThread; struct epoll_event event; -// add this new FD into epoll -#ifndef _NINGSI_VERSION event.events = EPOLLIN | EPOLLPRI | EPOLLWAKEUP | EPOLLERR | EPOLLHUP | EPOLLRDHUP; -#else - event.events = EPOLLIN | EPOLLPRI | EPOLLERR | EPOLLHUP | EPOLLRDHUP; -#endif event.data.ptr = pContext; if (epoll_ctl(pThread->pollFd, EPOLL_CTL_ADD, connFd, &event) < 0) { diff --git a/src/rpc/src/ttcpclient.c b/src/rpc/src/ttcpclient.c index ba758dbf7f256cb8850aef48e4a8f4b0a2166186..3638e4e36ecf07611acb8728a3464afd4cbf6af6 100644 --- a/src/rpc/src/ttcpclient.c +++ b/src/rpc/src/ttcpclient.c @@ -37,6 +37,10 @@ #include "ttcpclient.h" #include "tutil.h" +#ifndef EPOLLWAKEUP + #define EPOLLWAKEUP (1u << 29) +#endif + typedef struct _tcp_fd { int fd; // TCP socket FD void * thandle; @@ -271,12 +275,7 @@ void *taosOpenTcpClientConnection(void *shandle, void *thandle, char *ip, short pFdObj->pTcp = pTcp; pFdObj->thandle = thandle; -// add this new FD into epoll -#ifndef _NINGSI_VERSION event.events = EPOLLIN | EPOLLPRI | EPOLLWAKEUP; -#else - event.events = EPOLLIN | EPOLLPRI; -#endif event.data.ptr = pFdObj; if (epoll_ctl(pTcp->pollFd, EPOLL_CTL_ADD, fd, &event) < 0) { tError("%s failed to add TCP FD for epoll, error:%s", pTcp->label, strerror(errno)); diff --git a/src/rpc/src/ttcpserver.c b/src/rpc/src/ttcpserver.c index aa236c9d22214678fb86c893b619d2bfd749721a..0d6a36f1b25617fb22160df6f53cabfdf4d682f1 100644 --- a/src/rpc/src/ttcpserver.c +++ b/src/rpc/src/ttcpserver.c @@ -38,6 +38,9 @@ #include "tutil.h" #define TAOS_IPv4ADDR_LEN 16 +#ifndef EPOLLWAKEUP + #define EPOLLWAKEUP (1u << 29) +#endif typedef struct _fd_obj { int fd; // TCP socket FD @@ -278,12 +281,7 @@ void taosAcceptTcpConnection(void *arg) { pFdObj->port = htons(clientAddr.sin_port); pFdObj->pThreadObj = pThreadObj; -// add this new FD into epoll -#ifndef _NINGSI_VERSION event.events = EPOLLIN | EPOLLPRI | EPOLLWAKEUP; -#else - event.events = EPOLLIN | EPOLLPRI; -#endif event.data.ptr = pFdObj; if (epoll_ctl(pThreadObj->pollFd, EPOLL_CTL_ADD, connFd, &event) < 0) { tError("%s failed to add TCP FD for epoll, error:%s", pServerObj->label, strerror(errno)); @@ -356,12 +354,7 @@ void taosAcceptUDConnection(void *arg) { pFdObj->fd = connFd; pFdObj->pThreadObj = pThreadObj; -// add this new FD into epoll -#ifndef _NINGSI_VERSION event.events = EPOLLIN | EPOLLPRI | EPOLLWAKEUP; -#else - event.events = EPOLLIN | EPOLLPRI; -#endif event.data.ptr = pFdObj; if (epoll_ctl(pThreadObj->pollFd, EPOLL_CTL_ADD, connFd, &event) < 0) { tError("%s failed to add UD FD for epoll, error:%s", pServerObj->label, strerror(errno));