From 02d1d6c5254a6f1376a2de6768bfc026acfc04d3 Mon Sep 17 00:00:00 2001
From: slguan <slguan@taosdata.com>
Date: Tue, 16 Jul 2019 13:32:29 +0800
Subject: [PATCH] Fix the syntax error while EPOLLWAKEUP no defined in some
 systems

---
 src/modules/http/src/httpServer.c |  9 ++++-----
 src/rpc/src/ttcpclient.c          |  9 ++++-----
 src/rpc/src/ttcpserver.c          | 13 +++----------
 3 files changed, 11 insertions(+), 20 deletions(-)

diff --git a/src/modules/http/src/httpServer.c b/src/modules/http/src/httpServer.c
index 12d4174012..cca854f150 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 ba758dbf7f..3638e4e36e 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 aa236c9d22..0d6a36f1b2 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));
-- 
GitLab