Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
dgr6878
TDengine
提交
cebd07db
T
TDengine
项目概览
dgr6878
/
TDengine
与 Fork 源项目一致
Fork自
taosdata / TDengine
通知
8
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,发现更多精彩内容 >>
提交
cebd07db
编写于
3月 07, 2020
作者:
陶建辉(Jeff)
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
new version for tqueue.c
上级
5049b99b
变更
6
显示空白变更内容
内联
并排
Showing
6 changed file
with
455 addition
and
225 deletion
+455
-225
src/inc/trpc.h
src/inc/trpc.h
+11
-3
src/rpc/inc/tqueue.h
src/rpc/inc/tqueue.h
+29
-13
src/rpc/src/rpcMain.c
src/rpc/src/rpcMain.c
+51
-39
src/rpc/src/tqueue.c
src/rpc/src/tqueue.c
+306
-125
src/rpc/test/rclient.c
src/rpc/test/rclient.c
+12
-9
src/rpc/test/rserver.c
src/rpc/test/rserver.c
+46
-36
未找到文件。
src/inc/trpc.h
浏览文件 @
cebd07db
...
...
@@ -42,6 +42,14 @@ typedef struct {
char
*
user
;
}
SRpcConnInfo
;
typedef
struct
{
char
msgType
;
void
*
pCont
;
int
contLen
;
int32_t
code
;
void
*
handle
;
}
SRpcMsg
;
typedef
struct
{
char
*
localIp
;
// local IP used
uint16_t
localPort
;
// local port
...
...
@@ -59,7 +67,7 @@ typedef struct {
char
*
ckey
;
// ciphering key
// call back to process incoming msg, code shall be ignored by server app
void
(
*
cfp
)(
char
type
,
void
*
pCont
,
int
contLen
,
void
*
handle
,
int32_t
code
);
void
(
*
cfp
)(
SRpcMsg
*
);
// call back to process notify the ipSet changes, for client app only
void
(
*
ufp
)(
void
*
ahandle
,
SRpcIpSet
*
pIpSet
);
...
...
@@ -73,8 +81,8 @@ void rpcClose(void *);
void
*
rpcMallocCont
(
int
contLen
);
void
rpcFreeCont
(
void
*
pCont
);
void
*
rpcReallocCont
(
void
*
ptr
,
int
contLen
);
void
rpcSendRequest
(
void
*
thandle
,
SRpcIpSet
*
pIpSet
,
char
msgType
,
void
*
pCont
,
int
contLen
,
void
*
ahandle
);
void
rpcSendResponse
(
void
*
pConn
,
int32_t
code
,
void
*
pCont
,
int
contLen
);
void
rpcSendRequest
(
void
*
thandle
,
SRpcIpSet
*
pIpSet
,
SRpcMsg
*
pMsg
);
void
rpcSendResponse
(
SRpcMsg
*
pMsg
);
void
rpcSendRedirectRsp
(
void
*
pConn
,
SRpcIpSet
*
pIpSet
);
void
rpcGetConnInfo
(
void
*
thandle
,
SRpcConnInfo
*
pInfo
);
...
...
src/rpc/inc/tqueue.h
浏览文件 @
cebd07db
...
...
@@ -13,27 +13,43 @@
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
#ifndef T
DENGINE_TSCHED
_H
#define T
DENGINE_TSCHED
_H
#ifndef T
AOS_QUEUE
_H
#define T
AOS_QUEUE
_H
#ifdef __cplusplus
extern
"C"
{
#endif
typedef
struct
_sched_msg
{
void
*
msg
;
int
msgLen
;
int8_t
type
;
int32_t
code
;
void
*
handle
;
}
SRpcMsg
;
typedef
void
*
taos_queue
;
typedef
void
*
taos_qset
;
typedef
void
*
taos_qall
;
void
*
taosInitMsgQueue
(
int
queueSize
,
void
(
*
fp
)(
int
num
,
SRpcMsg
*
),
const
char
*
label
);
int
taosPutIntoMsgQueue
(
void
*
qhandle
,
SRpcMsg
*
pMsg
);
void
taosCleanUpMsgQueue
(
void
*
param
);
taos_queue
taosOpenQueue
(
int
itemSize
);
void
taosCloseQueue
(
taos_queue
);
int
taosWriteQitem
(
taos_queue
,
void
*
item
);
int
taosReadQitem
(
taos_queue
,
void
*
item
);
int
taosReadAllQitems
(
taos_queue
,
taos_qall
*
);
int
taosGetQitem
(
taos_qall
,
void
*
item
);
void
taosResetQitems
(
taos_qall
);
void
taosFreeQitems
(
taos_qall
);
taos_qset
taosOpenQset
();
void
taosCloseQset
();
int
taosAddIntoQset
(
taos_qset
,
taos_queue
);
void
taosRemoveFromQset
(
taos_qset
,
taos_queue
);
int
taosGetQueueNumber
(
taos_qset
);
int
taosReadQitemFromQset
(
taos_qset
,
void
*
item
);
int
taosReadAllQitemsFromQset
(
taos_qset
,
taos_qall
*
);
int
taosGetQueueItemsNumber
(
taos_queue
param
);
int
taosGetQsetItemsNumber
(
taos_qset
param
);
#ifdef __cplusplus
}
#endif
#endif // TDENGINE_TSCHED_H
#endif
src/rpc/src/rpcMain.c
浏览文件 @
cebd07db
...
...
@@ -56,7 +56,7 @@ typedef struct {
char
secret
[
TSDB_KEY_LEN
];
// secret for the link
char
ckey
[
TSDB_KEY_LEN
];
// ciphering key
void
(
*
cfp
)(
char
type
,
void
*
pCont
,
int
contLen
,
void
*
ahandle
,
int32_t
code
);
void
(
*
cfp
)(
SRpcMsg
*
);
int
(
*
afp
)(
char
*
user
,
char
*
spi
,
char
*
encrypt
,
char
*
secret
,
char
*
ckey
);
void
(
*
ufp
)(
void
*
ahandle
,
SRpcIpSet
*
pIpSet
);
...
...
@@ -339,25 +339,27 @@ void *rpcReallocCont(void *ptr, int contLen) {
return
start
+
sizeof
(
SRpcReqContext
)
+
sizeof
(
SRpcHead
);
}
void
rpcSendRequest
(
void
*
shandle
,
SRpcIpSet
*
pIpSet
,
char
type
,
void
*
pCont
,
int
contLen
,
void
*
ahandle
)
{
void
rpcSendRequest
(
void
*
shandle
,
SRpcIpSet
*
pIpSet
,
SRpcMsg
*
pMsg
)
{
SRpcInfo
*
pRpc
=
(
SRpcInfo
*
)
shandle
;
SRpcReqContext
*
pContext
;
contLen
=
rpcCompressRpcMsg
(
pCont
,
contLen
);
pContext
=
(
SRpcReqContext
*
)
(
pCont
-
sizeof
(
SRpcHead
)
-
sizeof
(
SRpcReqContext
));
pContext
->
ahandle
=
a
handle
;
pMsg
->
contLen
=
rpcCompressRpcMsg
(
pMsg
->
pCont
,
pMsg
->
contLen
);
pContext
=
(
SRpcReqContext
*
)
(
p
Msg
->
p
Cont
-
sizeof
(
SRpcHead
)
-
sizeof
(
SRpcReqContext
));
pContext
->
ahandle
=
pMsg
->
handle
;
pContext
->
pRpc
=
(
SRpcInfo
*
)
shandle
;
pContext
->
ipSet
=
*
pIpSet
;
pContext
->
contLen
=
contLen
;
pContext
->
pCont
=
pCont
;
pContext
->
msgType
=
t
ype
;
pContext
->
contLen
=
pMsg
->
contLen
;
pContext
->
pCont
=
p
Msg
->
p
Cont
;
pContext
->
msgType
=
pMsg
->
msgT
ype
;
pContext
->
oldInUse
=
pIpSet
->
inUse
;
pContext
->
connType
=
RPC_CONN_UDPC
;
if
(
contLen
>
tsRpcMaxUdpSize
)
pContext
->
connType
=
RPC_CONN_TCPC
;
if
(
pMsg
->
contLen
>
tsRpcMaxUdpSize
)
pContext
->
connType
=
RPC_CONN_TCPC
;
// connection type is application specific.
// for TDengine, all the query, show commands shall have TCP connection
char
type
=
pMsg
->
msgType
;
if
(
type
==
TSDB_MSG_TYPE_DNODE_QUERY
||
type
==
TSDB_MSG_TYPE_DNODE_RETRIEVE
||
type
==
TSDB_MSG_TYPE_STABLE_META
||
type
==
TSDB_MSG_TYPE_MULTI_TABLE_META
||
type
==
TSDB_MSG_TYPE_SHOW
)
...
...
@@ -368,21 +370,21 @@ void rpcSendRequest(void *shandle, SRpcIpSet *pIpSet, char type, void *pCont, in
return
;
}
void
rpcSendResponse
(
void
*
handle
,
int32_t
code
,
void
*
pCont
,
int
contLen
)
{
void
rpcSendResponse
(
SRpcMsg
*
pMsg
)
{
int
msgLen
=
0
;
SRpcConn
*
pConn
=
(
SRpcConn
*
)
handle
;
SRpcConn
*
pConn
=
(
SRpcConn
*
)
pMsg
->
handle
;
SRpcInfo
*
pRpc
=
pConn
->
pRpc
;
if
(
pCont
==
NULL
)
{
pCont
=
rpcMallocCont
(
0
);
contLen
=
0
;
if
(
p
Msg
->
p
Cont
==
NULL
)
{
p
Msg
->
p
Cont
=
rpcMallocCont
(
0
);
pMsg
->
contLen
=
0
;
}
SRpcHead
*
pHead
=
rpcHeadFromCont
(
pCont
);
SRpcHead
*
pHead
=
rpcHeadFromCont
(
p
Msg
->
p
Cont
);
char
*
msg
=
(
char
*
)
pHead
;
contLen
=
rpcCompressRpcMsg
(
pCont
,
contLen
);
msgLen
=
rpcMsgLenFromCont
(
contLen
);
pMsg
->
contLen
=
rpcCompressRpcMsg
(
pMsg
->
pCont
,
pMsg
->
contLen
);
msgLen
=
rpcMsgLenFromCont
(
pMsg
->
contLen
);
rpcLockConn
(
pConn
);
...
...
@@ -402,7 +404,7 @@ void rpcSendResponse(void *handle, int32_t code, void *pCont, int contLen) {
pHead
->
destId
=
pConn
->
peerId
;
pHead
->
linkUid
=
pConn
->
linkUid
;
pHead
->
port
=
htons
(
pConn
->
localPort
);
pHead
->
code
=
htonl
(
code
);
pHead
->
code
=
htonl
(
pMsg
->
code
);
// set pConn parameters
pConn
->
inType
=
0
;
...
...
@@ -416,6 +418,7 @@ void rpcSendResponse(void *handle, int32_t code, void *pCont, int contLen) {
rpcUnlockConn
(
pConn
);
taosTmrStopA
(
&
pConn
->
pTimer
);
taosTmrReset
(
rpcProcessIdleTimer
,
pRpc
->
idleTime
,
pConn
,
pRpc
->
tmrCtrl
,
&
pConn
->
pIdleTimer
);
rpcSendMsgToPeer
(
pConn
,
msg
,
msgLen
);
pConn
->
secured
=
1
;
// connection shall be secured
...
...
@@ -423,15 +426,18 @@ void rpcSendResponse(void *handle, int32_t code, void *pCont, int contLen) {
}
void
rpcSendRedirectRsp
(
void
*
thandle
,
SRpcIpSet
*
pIpSet
)
{
char
*
pMsg
;
int
msgLen
=
sizeof
(
SRpcIpSet
);
SRpcMsg
rpcMsg
;
pMsg
=
rpcMallocCont
(
msgLen
);
if
(
pMsg
==
NULL
)
return
;
rpcMsg
.
contLen
=
sizeof
(
SRpcIpSet
);
rpcMsg
.
pCont
=
rpcMallocCont
(
rpcMsg
.
contLen
);
if
(
rpcMsg
.
pCont
==
NULL
)
return
;
memcpy
(
pMsg
,
pIpSet
,
sizeof
(
SRpcIpSet
));
memcpy
(
rpcMsg
.
pCont
,
pIpSet
,
sizeof
(
SRpcIpSet
));
rpcSendResponse
(
thandle
,
TSDB_CODE_REDIRECT
,
pMsg
,
msgLen
);
rpcMsg
.
code
=
TSDB_CODE_REDIRECT
;
rpcMsg
.
handle
=
thandle
;
rpcSendResponse
(
&
rpcMsg
);
return
;
}
...
...
@@ -813,11 +819,6 @@ static void *rpcProcessMsgFromPeer(SRecvInfo *pRecv) {
pRecv
->
msgLen
,
pHead
->
sourceId
,
pHead
->
destId
,
pHead
->
tranId
,
pHead
->
port
);
}
if
(
pRpc
->
connType
==
TAOS_CONN_SERVER
&&
pConn
&&
pRpc
->
idleTime
)
{
// only for server, starts the idle timer. For client, it is started by cache mgmt
taosTmrReset
(
rpcProcessIdleTimer
,
pRpc
->
idleTime
,
pConn
,
pRpc
->
tmrCtrl
,
&
pConn
->
pIdleTimer
);
}
if
(
terrno
!=
TSDB_CODE_ALREADY_PROCESSED
)
{
if
(
terrno
!=
0
)
{
// parsing error
if
(
rpcIsReq
(
pHead
->
msgType
)
)
{
...
...
@@ -835,24 +836,29 @@ static void *rpcProcessMsgFromPeer(SRecvInfo *pRecv) {
static
void
rpcProcessIncomingMsg
(
SRpcConn
*
pConn
,
SRpcHead
*
pHead
)
{
SRpcInfo
*
pRpc
=
pConn
->
pRpc
;
SRpcMsg
rpcMsg
;
pHead
=
rpcDecompressRpcMsg
(
pHead
);
int
contLen
=
rpcContLenFromMsg
(
pHead
->
msgLen
);
uint8_t
*
pCont
=
pHead
->
content
;
rpcMsg
.
contLen
=
rpcContLenFromMsg
(
pHead
->
msgLen
);
rpcMsg
.
pCont
=
pHead
->
content
;
rpcMsg
.
msgType
=
pHead
->
msgType
;
rpcMsg
.
code
=
pHead
->
code
;
if
(
rpcIsReq
(
pHead
->
msgType
)
)
{
rpcMsg
.
handle
=
pConn
;
pConn
->
destIp
=
pHead
->
destIp
;
taosTmrReset
(
rpcProcessProgressTimer
,
tsRpcTimer
/
2
,
pConn
,
pRpc
->
tmrCtrl
,
&
pConn
->
pTimer
);
(
*
(
pRpc
->
cfp
))(
pHead
->
msgType
,
pCont
,
contLen
,
pConn
,
0
);
(
*
(
pRpc
->
cfp
))(
&
rpcMsg
);
}
else
{
// it's a response
int32_t
code
=
pHead
->
code
;
SRpcReqContext
*
pContext
=
pConn
->
pContext
;
rpcMsg
.
handle
=
pContext
->
ahandle
;
pConn
->
pContext
=
NULL
;
// for UDP, port may be changed by server, the port in ipSet shall be used for cache
rpcAddConnIntoCache
(
pRpc
->
pCache
,
pConn
,
pConn
->
peerIp
,
pContext
->
ipSet
.
port
,
pConn
->
connType
);
if
(
code
==
TSDB_CODE_REDIRECT
)
{
if
(
pHead
->
code
==
TSDB_CODE_REDIRECT
)
{
pContext
->
redirect
=
1
;
pContext
->
numOfTry
=
0
;
memcpy
(
&
pContext
->
ipSet
,
pHead
->
content
,
sizeof
(
pContext
->
ipSet
));
...
...
@@ -861,7 +867,7 @@ static void rpcProcessIncomingMsg(SRpcConn *pConn, SRpcHead *pHead) {
}
else
{
if
(
pRpc
->
ufp
&&
(
pContext
->
ipSet
.
inUse
!=
pContext
->
oldInUse
||
pContext
->
redirect
)
)
(
*
pRpc
->
ufp
)(
pContext
->
ahandle
,
&
pContext
->
ipSet
);
// notify the update of ipSet
(
*
pRpc
->
cfp
)(
pHead
->
msgType
,
pCont
,
contLen
,
pContext
->
ahandle
,
code
);
(
*
pRpc
->
cfp
)(
&
rpcMsg
);
rpcFreeCont
(
pContext
->
pCont
);
// free the request msg
}
}
...
...
@@ -963,8 +969,8 @@ static void rpcSendReqToServer(SRpcInfo *pRpc, SRpcReqContext *pContext) {
rpcUnlockConn
(
pConn
);
rpcSendMsgToPeer
(
pConn
,
msg
,
msgLen
);
taosTmrReset
(
rpcProcessRetryTimer
,
tsRpcTimer
,
pConn
,
pRpc
->
tmrCtrl
,
&
pConn
->
pTimer
);
rpcSendMsgToPeer
(
pConn
,
msg
,
msgLen
);
}
static
void
rpcSendMsgToPeer
(
SRpcConn
*
pConn
,
void
*
msg
,
int
msgLen
)
{
...
...
@@ -999,11 +1005,17 @@ static void rpcSendMsgToPeer(SRpcConn *pConn, void *msg, int msgLen) {
static
void
rpcProcessConnError
(
void
*
param
,
void
*
id
)
{
SRpcReqContext
*
pContext
=
(
SRpcReqContext
*
)
param
;
SRpcInfo
*
pRpc
=
pContext
->
pRpc
;
SRpcMsg
rpcMsg
;
tTrace
(
"%s connection error happens"
,
pRpc
->
label
);
if
(
pContext
->
numOfTry
>=
pContext
->
ipSet
.
numOfIps
)
{
(
*
(
pRpc
->
cfp
))(
pContext
->
msgType
+
1
,
NULL
,
0
,
pContext
->
ahandle
,
pContext
->
code
);
rpcMsg
.
msgType
=
pContext
->
msgType
+
1
;
rpcMsg
.
handle
=
pContext
->
ahandle
;
rpcMsg
.
code
=
pContext
->
code
;
rpcMsg
.
pCont
=
NULL
;
rpcMsg
.
contLen
=
0
;
(
*
(
pRpc
->
cfp
))(
&
rpcMsg
);
rpcFreeCont
(
pContext
->
pCont
);
// free the request msg
}
else
{
// move to next IP
...
...
@@ -1070,7 +1082,7 @@ static void rpcProcessProgressTimer(void *param, void *tmrId) {
if
(
pConn
->
inType
&&
pConn
->
user
[
0
])
{
tTrace
(
"%s %p, progress timer expired, send progress"
,
pRpc
->
label
,
pConn
);
rpcSendQuickRsp
(
pConn
,
TSDB_CODE_ACTION_IN_PROGRESS
);
taosTmrReset
(
rpcProcessProgressTimer
,
tsRpcTimer
<<
pConn
->
retry
,
pConn
,
pRpc
->
tmrCtrl
,
&
pConn
->
pTimer
);
taosTmrReset
(
rpcProcessProgressTimer
,
tsRpcTimer
/
2
,
pConn
,
pRpc
->
tmrCtrl
,
&
pConn
->
pTimer
);
}
else
{
tTrace
(
"%s %p, progress timer:%p not processed"
,
pRpc
->
label
,
pConn
,
tmrId
);
}
...
...
src/rpc/src/tqueue.c
浏览文件 @
cebd07db
...
...
@@ -15,176 +15,357 @@
#include "os.h"
#include "tlog.h"
#include "taoserror.h"
#include "tqueue.h"
#define DUMP_SCHEDULER_TIME_WINDOW 30000 //every 30sec, take a snap shot of task queue.
typedef
struct
_taos_qnode
{
struct
_taos_qnode
*
next
;
char
item
[];
}
STaosQnode
;
typedef
struct
_taos_q
{
int
itemSize
;
int
numOfItems
;
struct
_taos_qnode
*
head
;
struct
_taos_qnode
*
tail
;
struct
_taos_q
*
next
;
// for queue set
struct
_taos_qset
*
qset
;
// for queue set
pthread_mutex_t
mutex
;
}
STaosQueue
;
typedef
struct
_taos_qset
{
STaosQueue
*
head
;
STaosQueue
*
current
;
pthread_mutex_t
mutex
;
int
numOfQueues
;
int
numOfItems
;
}
STaosQset
;
typedef
struct
_taos_qall
{
STaosQnode
*
current
;
STaosQnode
*
start
;
int
itemSize
;
int
numOfItems
;
}
STaosQall
;
taos_queue
taosOpenQueue
(
int
itemSize
)
{
STaosQueue
*
queue
=
(
STaosQueue
*
)
calloc
(
sizeof
(
STaosQueue
),
1
);
if
(
queue
==
NULL
)
{
terrno
=
TSDB_CODE_NO_RESOURCE
;
return
NULL
;
}
typedef
struct
{
char
label
[
16
];
int
num
;
tsem_t
emptySem
;
tsem_t
fullSem
;
pthread_mutex_t
queueMutex
;
int
fullSlot
;
int
emptySlot
;
int
queueSize
;
SRpcMsg
*
queue
;
SRpcMsg
*
oqueue
;
pthread_t
qthread
;
void
(
*
fp
)(
int
num
,
SRpcMsg
*
);
}
SRpcQueue
;
pthread_mutex_init
(
&
queue
->
mutex
,
NULL
);
queue
->
itemSize
=
itemSize
;
static
void
*
taosProcessMsgQueue
(
void
*
param
);
return
queue
;
}
void
*
taosInitMsgQueue
(
int
queueSize
,
void
(
*
fp
)(
int
num
,
SRpcMsg
*
),
const
char
*
label
)
{
pthread_attr_t
attr
;
SRpcQueue
*
pQueue
=
(
SRpcQueue
*
)
malloc
(
sizeof
(
SRpcQueue
));
if
(
pQueue
==
NULL
)
{
pError
(
"%s: no enough memory for pQueue, reason: %s"
,
label
,
strerror
(
errno
));
goto
_error
;
}
void
taosCloseQueue
(
taos_queue
param
)
{
STaosQueue
*
queue
=
(
STaosQueue
*
)
param
;
STaosQnode
*
pTemp
;
STaosQnode
*
pNode
=
queue
->
head
;
queue
->
head
=
NULL
;
memset
(
pQueue
,
0
,
sizeof
(
SRpcQueue
));
pQueue
->
queueSize
=
queueSize
;
strncpy
(
pQueue
->
label
,
label
,
sizeof
(
pQueue
->
label
));
// fix buffer overflow
pQueue
->
label
[
sizeof
(
pQueue
->
label
)
-
1
]
=
'\0'
;
pQueue
->
fp
=
fp
;
pthread_mutex_lock
(
&
queue
->
mutex
);
if
(
pthread_mutex_init
(
&
pQueue
->
queueMutex
,
NULL
)
<
0
)
{
pError
(
"init %s:queueMutex failed, reason:%s"
,
pQueue
->
label
,
strerror
(
errno
));
goto
_error
;
}
if
(
queue
->
qset
)
taosRemoveFromQset
(
queue
->
qset
,
queue
);
if
(
tsem_init
(
&
pQueue
->
emptySem
,
0
,
(
unsigned
int
)
pQueue
->
queueSize
)
!=
0
)
{
pError
(
"init %s:empty semaphore failed, reason:%s"
,
pQueue
->
label
,
strerror
(
errno
));
goto
_error
;
while
(
pNode
)
{
pTemp
=
pNode
;
pNode
=
pNode
->
next
;
free
(
pTemp
);
}
if
(
tsem_init
(
&
pQueue
->
fullSem
,
0
,
0
)
!=
0
)
{
pError
(
"init %s:full semaphore failed, reason:%s"
,
pQueue
->
label
,
strerror
(
errno
));
goto
_error
;
}
pthread_mutex_unlock
(
&
queue
->
mutex
);
if
((
pQueue
->
queue
=
(
SRpcMsg
*
)
malloc
((
size_t
)
pQueue
->
queueSize
*
sizeof
(
SRpcMsg
)))
==
NULL
)
{
pError
(
"%s: no enough memory for queue, reason:%s"
,
pQueue
->
label
,
strerror
(
errno
));
goto
_error
;
}
free
(
queue
);
}
memset
(
pQueue
->
queue
,
0
,
(
size_t
)
pQueue
->
queueSize
*
sizeof
(
SRpcMsg
));
int
taosWriteQitem
(
taos_queue
param
,
void
*
item
)
{
STaosQueue
*
queue
=
(
STaosQueue
*
)
param
;
if
((
pQueue
->
oqueue
=
(
SRpcMsg
*
)
malloc
((
size_t
)
pQueue
->
queueSize
*
sizeof
(
SRpcMsg
)))
==
NULL
)
{
pError
(
"%s: no enough memory for queue, reason:%s"
,
pQueue
->
label
,
strerror
(
errno
));
goto
_error
;
STaosQnode
*
pNode
=
(
STaosQnode
*
)
calloc
(
sizeof
(
STaosQnode
)
+
queue
->
itemSize
,
1
);
if
(
pNode
==
NULL
)
{
terrno
=
TSDB_CODE_NO_RESOURCE
;
return
-
1
;
}
memset
(
pQueue
->
oqueue
,
0
,
(
size_t
)
pQueue
->
queueSize
*
sizeof
(
SRpcMsg
));
memcpy
(
pNode
->
item
,
item
,
queue
->
itemSize
);
pthread_mutex_lock
(
&
queue
->
mutex
);
if
(
queue
->
tail
)
{
queue
->
tail
->
next
=
pNode
;
queue
->
tail
=
pNode
;
}
else
{
queue
->
head
=
pNode
;
queue
->
tail
=
pNode
;
}
pQueue
->
fullSlot
=
0
;
pQueue
->
fullSlot
=
0
;
pQueue
->
emptySlot
=
0
;
queue
->
numOfItems
++
;
if
(
queue
->
qset
)
atomic_add_fetch_32
(
&
queue
->
qset
->
numOfItems
,
1
);
pthread_
attr_init
(
&
attr
);
pthread_attr_setdetachstate
(
&
attr
,
PTHREAD_CREATE_JOINABLE
);
pthread_
mutex_unlock
(
&
queue
->
mutex
);
}
if
(
pthread_create
(
&
pQueue
->
qthread
,
&
attr
,
taosProcessMsgQueue
,
(
void
*
)
pQueue
)
!=
0
)
{
pError
(
"%s: failed to create taos thread, reason:%s"
,
pQueue
->
label
,
strerror
(
errno
));
goto
_error
;
int
taosReadQitem
(
taos_queue
param
,
void
*
item
)
{
STaosQueue
*
queue
=
(
STaosQueue
*
)
param
;
STaosQnode
*
pNode
=
NULL
;
int
code
=
0
;
pthread_mutex_lock
(
&
queue
->
mutex
);
if
(
queue
->
head
)
{
pNode
=
queue
->
head
;
memcpy
(
item
,
pNode
->
item
,
queue
->
itemSize
);
queue
->
head
=
pNode
->
next
;
if
(
queue
->
head
==
NULL
)
queue
->
tail
=
NULL
;
free
(
pNode
);
queue
->
numOfItems
--
;
if
(
queue
->
qset
)
atomic_sub_fetch_32
(
&
queue
->
qset
->
numOfItems
,
1
);
code
=
1
;
}
pTrace
(
"%s RPC msg queue is initialized"
,
pQueue
->
label
);
pthread_mutex_unlock
(
&
queue
->
mutex
);
return
code
;
}
return
(
void
*
)
pQueue
;
int
taosReadAllQitems
(
taos_queue
param
,
taos_qall
*
res
)
{
STaosQueue
*
queue
=
(
STaosQueue
*
)
param
;
STaosQall
*
qall
=
NULL
;
int
code
=
0
;
pthread_mutex_lock
(
&
queue
->
mutex
);
if
(
queue
->
head
)
{
qall
=
(
STaosQall
*
)
calloc
(
sizeof
(
STaosQall
),
1
);
if
(
qall
==
NULL
)
{
terrno
=
TSDB_CODE_NO_RESOURCE
;
code
=
-
1
;
}
else
{
qall
->
current
=
queue
->
head
;
qall
->
start
=
queue
->
head
;
qall
->
numOfItems
=
queue
->
numOfItems
;
qall
->
itemSize
=
queue
->
itemSize
;
code
=
qall
->
numOfItems
;
queue
->
head
=
NULL
;
queue
->
tail
=
NULL
;
queue
->
numOfItems
=
0
;
if
(
queue
->
qset
)
atomic_sub_fetch_32
(
&
queue
->
qset
->
numOfItems
,
qall
->
numOfItems
);
}
}
_error:
taosCleanUpMsgQueue
(
pQueue
);
return
NULL
;
pthread_mutex_unlock
(
&
queue
->
mutex
);
*
res
=
qall
;
return
code
;
}
void
*
taosProcessMsgQueue
(
void
*
param
)
{
SRpcQueue
*
pQueue
=
(
SRpcQueue
*
)
param
;
int
taosGetQitem
(
taos_qall
param
,
void
*
item
)
{
STaosQall
*
qall
=
(
STaosQall
*
)
param
;
STaosQnode
*
pNode
;
int
num
=
0
;
while
(
1
)
{
if
(
tsem_wait
(
&
pQueue
->
fullSem
)
!=
0
)
{
if
(
errno
==
EINTR
)
{
/* sem_wait is interrupted by interrupt, ignore and continue */
pTrace
(
"wait %s fullSem was interrupted"
,
pQueue
->
label
);
continue
;
}
pError
(
"wait %s fullSem failed, errno:%d, reason:%s"
,
pQueue
->
label
,
errno
,
strerror
(
errno
));
pNode
=
qall
->
current
;
if
(
pNode
)
qall
->
current
=
pNode
->
next
;
if
(
pNode
)
{
memcpy
(
item
,
pNode
->
item
,
qall
->
itemSize
);
num
=
1
;
}
if
(
pthread_mutex_lock
(
&
pQueue
->
queueMutex
)
!=
0
)
pError
(
"lock %s queueMutex failed, reason:%s"
,
pQueue
->
label
,
strerror
(
errno
));
return
num
;
}
num
=
0
;
do
{
pQueue
->
oqueue
[
num
]
=
pQueue
->
queue
[
pQueue
->
fullSlot
];
pQueue
->
fullSlot
=
(
pQueue
->
fullSlot
+
1
)
%
pQueue
->
queueSize
;
++
num
;
pQueue
->
num
--
;
}
while
(
pQueue
->
fullSlot
!=
pQueue
->
emptySlot
);
void
taosResetQitems
(
taos_qall
param
)
{
STaosQall
*
qall
=
(
STaosQall
*
)
param
;
qall
->
current
=
qall
->
start
;
}
if
(
pthread_mutex_unlock
(
&
pQueue
->
queueMutex
)
!=
0
)
pError
(
"unlock %s queueMutex failed, reason:%s
\n
"
,
pQueue
->
label
,
strerror
(
errno
));
void
taosFreeQitems
(
taos_qall
param
)
{
STaosQall
*
qall
=
(
STaosQall
*
)
param
;
STaosQnode
*
pNode
;
for
(
int
i
=
0
;
i
<
num
;
++
i
)
{
if
(
tsem_post
(
&
pQueue
->
emptySem
)
!=
0
)
pError
(
"post %s emptySem failed, reason:%s
\n
"
,
pQueue
->
label
,
strerror
(
errno
));
while
(
qall
->
current
)
{
pNode
=
qall
->
current
;
qall
->
current
=
pNode
->
next
;
free
(
pNode
);
}
for
(
int
i
=
0
;
i
<
num
-
1
;
++
i
)
{
if
(
tsem_wait
(
&
pQueue
->
fullSem
)
!=
0
)
pError
(
"wait %s fullSem failed, reason:%s
\n
"
,
pQueue
->
label
,
strerror
(
errno
));
}
free
(
qall
);
}
(
*
pQueue
->
fp
)(
num
,
pQueue
->
oqueue
);
taos_qset
taosOpenQset
()
{
STaosQset
*
qset
=
(
STaosQset
*
)
calloc
(
sizeof
(
STaosQset
),
1
);
if
(
qset
==
NULL
)
{
terrno
=
TSDB_CODE_NO_RESOURCE
;
return
NULL
;
}
return
NULL
;
pthread_mutex_init
(
&
qset
->
mutex
,
NULL
);
return
qset
;
}
void
taosCloseQset
(
taos_qset
param
)
{
STaosQset
*
qset
=
(
STaosQset
*
)
param
;
free
(
qset
);
}
int
taosPutIntoMsgQueue
(
void
*
qhandle
,
SRpcMsg
*
pMsg
)
{
SRpcQueue
*
pQueue
=
(
SRpcQueue
*
)
qhandle
;
if
(
pQueue
==
NULL
)
{
pError
(
"sched is not ready, msg:%p is dropped"
,
pMsg
);
int
taosAddIntoQset
(
taos_qset
p1
,
taos_queue
p2
)
{
STaosQueue
*
queue
=
(
STaosQueue
*
)
p2
;
STaosQset
*
qset
=
(
STaosQset
*
)
p1
;
if
(
queue
->
qset
)
return
-
1
;
pthread_mutex_lock
(
&
qset
->
mutex
);
queue
->
next
=
qset
->
head
;
qset
->
head
=
queue
;
qset
->
numOfQueues
++
;
pthread_mutex_lock
(
&
queue
->
mutex
);
atomic_add_fetch_32
(
&
qset
->
numOfItems
,
queue
->
numOfItems
);
queue
->
qset
=
qset
;
pthread_mutex_unlock
(
&
queue
->
mutex
);
pthread_mutex_unlock
(
&
qset
->
mutex
);
return
0
;
}
}
while
(
tsem_wait
(
&
pQueue
->
emptySem
)
!=
0
)
{
if
(
errno
!=
EINTR
)
{
pError
(
"wait %s emptySem failed, reason:%s"
,
pQueue
->
label
,
strerror
(
errno
));
break
;
void
taosRemoveFromQset
(
taos_qset
p1
,
taos_queue
p2
)
{
STaosQueue
*
queue
=
(
STaosQueue
*
)
p2
;
STaosQset
*
qset
=
(
STaosQset
*
)
p1
;
STaosQueue
*
tqueue
;
pthread_mutex_lock
(
&
qset
->
mutex
);
if
(
qset
->
head
)
{
if
(
qset
->
head
==
queue
)
{
qset
->
head
=
qset
->
head
->
next
;
qset
->
numOfQueues
--
;
}
else
{
STaosQueue
*
prev
=
qset
->
head
;
tqueue
=
qset
->
head
->
next
;
while
(
tqueue
)
{
if
(
tqueue
==
queue
)
{
prev
->
next
=
tqueue
->
next
;
if
(
qset
->
current
==
queue
)
qset
->
current
=
tqueue
->
next
;
qset
->
numOfQueues
--
;
pthread_mutex_lock
(
&
queue
->
mutex
);
atomic_sub_fetch_32
(
&
qset
->
numOfItems
,
queue
->
numOfItems
);
queue
->
qset
=
NULL
;
pthread_mutex_unlock
(
&
queue
->
mutex
);
}
else
{
prev
=
tqueue
;
tqueue
=
tqueue
->
next
;
}
}
}
}
if
(
pthread_mutex_lock
(
&
pQueue
->
queueMutex
)
!=
0
)
pError
(
"lock %s queueMutex failed, reason:%s"
,
pQueue
->
label
,
strerror
(
errno
));
pthread_mutex_unlock
(
&
qset
->
mutex
);
}
pQueue
->
queue
[
pQueue
->
emptySlot
]
=
*
pMsg
;
pQueue
->
emptySlot
=
(
pQueue
->
emptySlot
+
1
)
%
pQueue
->
queueSize
;
pQueue
->
num
++
;
int
taosGetQueueNumber
(
taos_qset
param
)
{
return
((
STaosQset
*
)
param
)
->
numOfQueues
;
}
if
(
pthread_mutex_unlock
(
&
pQueue
->
queueMutex
)
!=
0
)
pError
(
"unlock %s queueMutex failed, reason:%s"
,
pQueue
->
label
,
strerror
(
errno
));
int
taosReadQitemFromQset
(
taos_qset
param
,
void
*
item
)
{
STaosQset
*
qset
=
(
STaosQset
*
)
param
;
STaosQnode
*
pNode
=
NULL
;
int
code
=
0
;
for
(
int
i
=
0
;
i
<
qset
->
numOfQueues
;
++
i
)
{
pthread_mutex_lock
(
&
qset
->
mutex
);
if
(
qset
->
current
==
NULL
)
qset
->
current
=
qset
->
head
;
STaosQueue
*
queue
=
qset
->
current
;
qset
->
current
=
queue
->
next
;
pthread_mutex_unlock
(
&
qset
->
mutex
);
pthread_mutex_lock
(
&
queue
->
mutex
);
if
(
queue
->
head
)
{
pNode
=
queue
->
head
;
memcpy
(
item
,
pNode
->
item
,
queue
->
itemSize
);
queue
->
head
=
pNode
->
next
;
if
(
queue
->
head
==
NULL
)
queue
->
tail
=
NULL
;
free
(
pNode
);
queue
->
numOfItems
--
;
atomic_sub_fetch_32
(
&
qset
->
numOfItems
,
1
);
code
=
1
;
}
if
(
tsem_post
(
&
pQueue
->
fullSem
)
!=
0
)
pError
(
"post %s fullSem failed, reason:%s"
,
pQueue
->
label
,
strerror
(
errno
));
pthread_mutex_unlock
(
&
queue
->
mutex
);
if
(
pNode
)
break
;
}
return
0
;
return
code
;
}
void
taosCleanUpMsgQueue
(
void
*
param
)
{
SRpcQueue
*
pQueue
=
(
SRpcQueue
*
)
param
;
if
(
pQueue
==
NULL
)
return
;
int
taosReadAllQitemsFromQset
(
taos_qset
param
,
taos_qall
*
res
)
{
STaosQset
*
qset
=
(
STaosQset
*
)
param
;
STaosQueue
*
queue
;
STaosQall
*
qall
=
NULL
;
int
code
=
0
;
for
(
int
i
=
0
;
i
<
qset
->
numOfQueues
;
++
i
)
{
pthread_mutex_lock
(
&
qset
->
mutex
);
if
(
qset
->
current
==
NULL
)
qset
->
current
=
qset
->
head
;
queue
=
qset
->
current
;
qset
->
current
=
queue
->
next
;
pthread_mutex_unlock
(
&
qset
->
mutex
);
pthread_mutex_lock
(
&
queue
->
mutex
);
if
(
queue
->
head
)
{
qall
=
(
STaosQall
*
)
calloc
(
sizeof
(
STaosQall
),
1
);
if
(
qall
==
NULL
)
{
terrno
=
TSDB_CODE_NO_RESOURCE
;
code
=
-
1
;
}
else
{
qall
->
current
=
queue
->
head
;
qall
->
start
=
queue
->
head
;
qall
->
numOfItems
=
queue
->
numOfItems
;
qall
->
itemSize
=
queue
->
itemSize
;
code
=
qall
->
numOfItems
;
queue
->
head
=
NULL
;
queue
->
tail
=
NULL
;
queue
->
numOfItems
=
0
;
atomic_sub_fetch_32
(
&
qset
->
numOfItems
,
qall
->
numOfItems
);
}
}
pthread_mutex_unlock
(
&
queue
->
mutex
);
if
(
code
!=
0
)
break
;
}
pthread_cancel
(
pQueue
->
qthread
)
;
*
res
=
qall
;
tsem_destroy
(
&
pQueue
->
emptySem
);
tsem_destroy
(
&
pQueue
->
fullSem
);
pthread_mutex_destroy
(
&
pQueue
->
queueMutex
);
return
code
;
}
free
(
pQueue
->
queue
);
free
(
pQueue
);
int
taosGetQueueItemsNumber
(
taos_queue
param
)
{
STaosQueue
*
queue
=
(
STaosQueue
*
)
param
;
return
queue
->
numOfItems
;
}
int
taosGetQsetItemsNumber
(
taos_qset
param
)
{
STaosQset
*
qset
=
(
STaosQset
*
)
param
;
return
qset
->
numOfItems
;
}
src/rpc/test/rclient.c
浏览文件 @
cebd07db
...
...
@@ -20,6 +20,7 @@
#include <pthread.h>
#include <errno.h>
#include <signal.h>
#include <semaphore.h>
#include "os.h"
#include "tlog.h"
#include "trpc.h"
...
...
@@ -39,11 +40,11 @@ typedef struct {
void
*
pRpc
;
}
SInfo
;
void
processResponse
(
char
type
,
void
*
pCont
,
int
contLen
,
void
*
ahandle
,
int32_t
code
)
{
SInfo
*
pInfo
=
(
SInfo
*
)
a
handle
;
tTrace
(
"thread:%d, response is received, type:%d contLen:%d code:0x%x"
,
pInfo
->
index
,
type
,
contLen
,
code
);
void
processResponse
(
SRpcMsg
*
pMsg
)
{
SInfo
*
pInfo
=
(
SInfo
*
)
pMsg
->
handle
;
tTrace
(
"thread:%d, response is received, type:%d contLen:%d code:0x%x"
,
pInfo
->
index
,
pMsg
->
msgType
,
pMsg
->
contLen
,
pMsg
->
code
);
if
(
pCont
)
rpcFreeCont
(
pCont
);
rpcFreeCont
(
pMsg
->
pCont
);
sem_post
(
&
pInfo
->
rspSem
);
}
...
...
@@ -59,15 +60,18 @@ int tcount = 0;
void
*
sendRequest
(
void
*
param
)
{
SInfo
*
pInfo
=
(
SInfo
*
)
param
;
char
*
cont
;
SRpcMsg
rpcMsg
;
tTrace
(
"thread:%d, start to send request"
,
pInfo
->
index
);
while
(
pInfo
->
numOfReqs
==
0
||
pInfo
->
num
<
pInfo
->
numOfReqs
)
{
pInfo
->
num
++
;
cont
=
rpcMallocCont
(
pInfo
->
msgSize
);
rpcMsg
.
pCont
=
rpcMallocCont
(
pInfo
->
msgSize
);
rpcMsg
.
contLen
=
pInfo
->
msgSize
;
rpcMsg
.
handle
=
pInfo
;
rpcMsg
.
msgType
=
1
;
tTrace
(
"thread:%d, send request, contLen:%d num:%d"
,
pInfo
->
index
,
pInfo
->
msgSize
,
pInfo
->
num
);
rpcSendRequest
(
pInfo
->
pRpc
,
&
pInfo
->
ipSet
,
1
,
cont
,
pInfo
->
msgSize
,
pInfo
);
rpcSendRequest
(
pInfo
->
pRpc
,
&
pInfo
->
ipSet
,
&
rpcMsg
);
if
(
pInfo
->
num
%
20000
==
0
)
tPrint
(
"thread:%d, %d requests have been sent"
,
pInfo
->
index
,
pInfo
->
num
);
sem_wait
(
&
pInfo
->
rspSem
);
...
...
@@ -161,7 +165,6 @@ int main(int argc, char *argv[]) {
}
taosInitLog
(
"client.log"
,
100000
,
10
);
tPrint
(
"rpcDebugFlag:%d"
,
rpcDebugFlag
);
void
*
pRpc
=
rpcOpen
(
&
rpcInit
);
if
(
pRpc
==
NULL
)
{
...
...
src/rpc/test/rserver.c
浏览文件 @
cebd07db
...
...
@@ -25,23 +25,28 @@ int commit = 0;
int
dataFd
=
-
1
;
void
*
qhandle
=
NULL
;
void
processShellMsg
(
int
numOfMsgs
,
SRpcMsg
*
pMsg
)
{
void
processShellMsg
()
{
static
int
num
=
0
;
taos_qall
qall
;
SRpcMsg
rpcMsg
;
while
(
1
)
{
int
numOfMsgs
=
taosReadAllQitems
(
qhandle
,
&
qall
);
if
(
numOfMsgs
<=
0
)
{
usleep
(
1000
);
continue
;
}
tTrace
(
"%d shell msgs are received"
,
numOfMsgs
);
for
(
int
i
=
0
;
i
<
numOfMsgs
;
++
i
)
{
taosGetQitem
(
qall
,
&
rpcMsg
);
if
(
dataFd
>=
0
)
{
if
(
write
(
dataFd
,
pMsg
->
msg
,
pMsg
->
msg
Len
)
<
0
)
{
if
(
write
(
dataFd
,
rpcMsg
.
pCont
,
rpcMsg
.
cont
Len
)
<
0
)
{
tPrint
(
"failed to write data file, reason:%s"
,
strerror
(
errno
));
}
}
void
*
rsp
=
rpcMallocCont
(
msgSize
);
rpcSendResponse
(
pMsg
->
handle
,
1
,
rsp
,
msgSize
);
rpcFreeCont
(
pMsg
->
msg
);
pMsg
++
;
}
if
(
commit
>=
2
)
{
...
...
@@ -55,6 +60,20 @@ void processShellMsg(int numOfMsgs, SRpcMsg *pMsg) {
}
}
taosResetQitems
(
qall
);
for
(
int
i
=
0
;
i
<
numOfMsgs
;
++
i
)
{
taosGetQitem
(
qall
,
&
rpcMsg
);
rpcFreeCont
(
rpcMsg
.
pCont
);
rpcMsg
.
pCont
=
rpcMallocCont
(
msgSize
);
rpcMsg
.
contLen
=
msgSize
;
rpcMsg
.
handle
=
rpcMsg
.
handle
;
rpcMsg
.
code
=
1
;
rpcSendResponse
(
&
rpcMsg
);
}
taosFreeQitems
(
qall
);
}
/*
SRpcIpSet ipSet;
...
...
@@ -88,15 +107,9 @@ int retrieveAuthInfo(char *meterId, char *spi, char *encrypt, char *secret, char
return
ret
;
}
void
processRequestMsg
(
char
type
,
void
*
pCont
,
int
contLen
,
void
*
thandle
,
int32_t
code
)
{
tTrace
(
"request is received, type:%d, contLen:%d"
,
type
,
contLen
);
SRpcMsg
rpcMsg
;
rpcMsg
.
msg
=
pCont
;
rpcMsg
.
msgLen
=
contLen
;
rpcMsg
.
code
=
code
;
rpcMsg
.
handle
=
thandle
;
rpcMsg
.
type
=
type
;
taosPutIntoMsgQueue
(
qhandle
,
&
rpcMsg
);
void
processRequestMsg
(
SRpcMsg
*
pMsg
)
{
tTrace
(
"request is received, type:%d, contLen:%d"
,
pMsg
->
msgType
,
pMsg
->
contLen
);
taosWriteQitem
(
qhandle
,
pMsg
);
}
int
main
(
int
argc
,
char
*
argv
[])
{
...
...
@@ -165,12 +178,9 @@ int main(int argc, char *argv[]) {
tPrint
(
"failed to open data file, reason:%s"
,
strerror
(
errno
));
}
qhandle
=
taos
InitMsgQueue
(
1000
,
processShellMsg
,
"SER"
);
qhandle
=
taos
OpenQueue
(
sizeof
(
SRpcMsg
)
);
// loop forever
while
(
1
)
{
sleep
(
1
);
}
processShellMsg
();
if
(
dataFd
>=
0
)
{
close
(
dataFd
);
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录