Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
小楼昨夜-听风雨
TDengine
提交
02d1d6c5
T
TDengine
项目概览
小楼昨夜-听风雨
/
TDengine
与 Fork 源项目一致
Fork自
taosdata / TDengine
通知
1
Star
0
Fork
0
代码
文件
提交
分支
Tags
贡献者
分支图
Diff
Issue
0
列表
看板
标记
里程碑
合并请求
0
Wiki
0
Wiki
分析
仓库
DevOps
项目成员
Pages
T
TDengine
项目概览
项目概览
详情
发布
仓库
仓库
文件
提交
分支
标签
贡献者
分支图
比较
Issue
0
Issue
0
列表
看板
标记
里程碑
合并请求
0
合并请求
0
Pages
分析
分析
仓库分析
DevOps
Wiki
0
Wiki
成员
成员
收起侧边栏
关闭侧边栏
动态
分支图
创建新Issue
提交
Issue看板
体验新版 GitCode,发现更多精彩内容 >>
提交
02d1d6c5
编写于
7月 16, 2019
作者:
S
slguan
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
Fix the syntax error while EPOLLWAKEUP no defined in some systems
上级
75dabd02
变更
3
隐藏空白更改
内联
并排
Showing
3 changed file
with
11 addition
and
20 deletion
+11
-20
src/modules/http/src/httpServer.c
src/modules/http/src/httpServer.c
+4
-5
src/rpc/src/ttcpclient.c
src/rpc/src/ttcpclient.c
+4
-5
src/rpc/src/ttcpserver.c
src/rpc/src/ttcpserver.c
+3
-10
未找到文件。
src/modules/http/src/httpServer.c
浏览文件 @
02d1d6c5
...
...
@@ -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
)
{
...
...
src/rpc/src/ttcpclient.c
浏览文件 @
02d1d6c5
...
...
@@ -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
));
...
...
src/rpc/src/ttcpserver.c
浏览文件 @
02d1d6c5
...
...
@@ -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
));
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录