xxq250
/
homework-jianmu
1
0
Fork 0
Code Issues Pull Requests 1 Actions Packages Projects Releases Wiki Activity

Fix the syntax error while EPOLLWAKEUP no defined in some systems

This commit is contained in:
slguan 2019-07-16 13:32:29 +08:00
parent 75dabd02d1
commit 02d1d6c525
3 changed files with 11 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/modules/http/src/httpServer.c
View File

@ -42,6 +42,10 @@
#include "httpHandle.h" #include "httpHandle.h"
#include "httpResp.h" #include "httpResp.h"
#ifndef EPOLLWAKEUP
#define EPOLLWAKEUP (1u << 29)
#endif
void httpFreeContext(HttpServer *pServer, HttpContext *pContext); void httpFreeContext(HttpServer *pServer, HttpContext *pContext);
/** /**
@ -441,12 +445,7 @@ void httpAcceptHttpConnection(void *arg) {
pContext->pThread = pThread; pContext->pThread = pThread;
struct epoll_event event; struct epoll_event event;
// add this new FD into epoll
#ifndef _NINGSI_VERSION
event.events = EPOLLIN | EPOLLPRI | EPOLLWAKEUP | EPOLLERR | EPOLLHUP | EPOLLRDHUP; event.events = EPOLLIN | EPOLLPRI | EPOLLWAKEUP | EPOLLERR | EPOLLHUP | EPOLLRDHUP;
#else
event.events = EPOLLIN | EPOLLPRI | EPOLLERR | EPOLLHUP | EPOLLRDHUP;
#endif
event.data.ptr = pContext; event.data.ptr = pContext;
if (epoll_ctl(pThread->pollFd, EPOLL_CTL_ADD, connFd, &event) < 0) { if (epoll_ctl(pThread->pollFd, EPOLL_CTL_ADD, connFd, &event) < 0) {

9
src/rpc/src/ttcpclient.c
View File

@ -37,6 +37,10 @@
#include "ttcpclient.h" #include "ttcpclient.h"
#include "tutil.h" #include "tutil.h"
#ifndef EPOLLWAKEUP
#define EPOLLWAKEUP (1u << 29)
#endif
typedef struct _tcp_fd { typedef struct _tcp_fd {
int fd; // TCP socket FD int fd; // TCP socket FD
void * thandle; void * thandle;
@ -271,12 +275,7 @@ void *taosOpenTcpClientConnection(void *shandle, void *thandle, char *ip, short
pFdObj->pTcp = pTcp; pFdObj->pTcp = pTcp;
pFdObj->thandle = thandle; pFdObj->thandle = thandle;
// add this new FD into epoll
#ifndef _NINGSI_VERSION
event.events = EPOLLIN | EPOLLPRI | EPOLLWAKEUP; event.events = EPOLLIN | EPOLLPRI | EPOLLWAKEUP;
#else
event.events = EPOLLIN | EPOLLPRI;
#endif
event.data.ptr = pFdObj; event.data.ptr = pFdObj;
if (epoll_ctl(pTcp->pollFd, EPOLL_CTL_ADD, fd, &event) < 0) { 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)); tError("%s failed to add TCP FD for epoll, error:%s", pTcp->label, strerror(errno));

13
src/rpc/src/ttcpserver.c
View File

@ -38,6 +38,9 @@
#include "tutil.h" #include "tutil.h"
#define TAOS_IPv4ADDR_LEN 16 #define TAOS_IPv4ADDR_LEN 16
#ifndef EPOLLWAKEUP
#define EPOLLWAKEUP (1u << 29)
#endif
typedef struct _fd_obj { typedef struct _fd_obj {
int fd; // TCP socket FD int fd; // TCP socket FD
@ -278,12 +281,7 @@ void taosAcceptTcpConnection(void *arg) {
pFdObj->port = htons(clientAddr.sin_port); pFdObj->port = htons(clientAddr.sin_port);
pFdObj->pThreadObj = pThreadObj; pFdObj->pThreadObj = pThreadObj;
// add this new FD into epoll
#ifndef _NINGSI_VERSION
event.events = EPOLLIN | EPOLLPRI | EPOLLWAKEUP; event.events = EPOLLIN | EPOLLPRI | EPOLLWAKEUP;
#else
event.events = EPOLLIN | EPOLLPRI;
#endif
event.data.ptr = pFdObj; event.data.ptr = pFdObj;
if (epoll_ctl(pThreadObj->pollFd, EPOLL_CTL_ADD, connFd, &event) < 0) { 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)); 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->fd = connFd;
pFdObj->pThreadObj = pThreadObj; pFdObj->pThreadObj = pThreadObj;
// add this new FD into epoll
#ifndef _NINGSI_VERSION
event.events = EPOLLIN | EPOLLPRI | EPOLLWAKEUP; event.events = EPOLLIN | EPOLLPRI | EPOLLWAKEUP;
#else
event.events = EPOLLIN | EPOLLPRI;
#endif
event.data.ptr = pFdObj; event.data.ptr = pFdObj;
if (epoll_ctl(pThreadObj->pollFd, EPOLL_CTL_ADD, connFd, &event) < 0) { 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)); tError("%s failed to add UD FD for epoll, error:%s", pServerObj->label, strerror(errno));