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

Merge branch 'enh/stopquery' of github.com:taosdata/TDengine into enh/stopquery

This commit is contained in:
dapan1121 2022-06-28 09:29:19 +08:00
parent c9d9c3ffd0 1ab7e3a90b
commit 62d0c04e0c
2 changed files with 9 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
source/libs/transport/src/trans.c
View File

@ -165,11 +165,9 @@ void rpcSetDefaultAddr(void* thandle, const char* ip, const char* fqdn) {
int32_t rpcInit() { int32_t rpcInit() {
transInit(); transInit();
// impl later
return 0; return 0;
} }
void rpcCleanup(void) { void rpcCleanup(void) {
// impl later
transCleanup(); transCleanup();
return; return;
} }

26
source/libs/transport/src/transSvr.c
View File

@ -140,17 +140,6 @@ static void uvHandleRegister(SSvrMsg* msg, SWorkThrd* thrd);
static void (*transAsyncHandle[])(SSvrMsg* msg, SWorkThrd* thrd) = {uvHandleResp, uvHandleQuit, uvHandleRelease, static void (*transAsyncHandle[])(SSvrMsg* msg, SWorkThrd* thrd) = {uvHandleResp, uvHandleQuit, uvHandleRelease,
uvHandleRegister, NULL}; uvHandleRegister, NULL};
static int32_t exHandlesMgt;
// void uvInitEnv();
// void uvOpenExHandleMgt(int size);
// void uvCloseExHandleMgt();
// int64_t uvAddExHandle(void* p);
// int32_t uvRemoveExHandle(int64_t refId);
// int32_t uvReleaseExHandle(int64_t refId);
// void uvDestoryExHandle(void* handle);
// SExHandle* uvAcquireExHandle(int64_t refId);
static void uvDestroyConn(uv_handle_t* handle); static void uvDestroyConn(uv_handle_t* handle);
// server and worker thread // server and worker thread
@ -787,11 +776,15 @@ static void destroyConn(SSvrConn* conn, bool clear) {
transDestroyBuffer(&conn->readBuf); transDestroyBuffer(&conn->readBuf);
if (clear) { if (clear) {
tTrace("conn %p to be destroyed", conn); if (uv_is_active((uv_handle_t*)conn->pTcp)) {
// uv_shutdown_t* req = taosMemoryMalloc(sizeof(uv_shutdown_t)); tTrace("conn %p to be destroyed", conn);
uv_close((uv_handle_t*)conn->pTcp, uvDestroyConn); // uv_shutdown_t* req = taosMemoryMalloc(sizeof(uv_shutdown_t));
// uv_close(conn->pTcp) uv_close((uv_handle_t*)conn->pTcp, uvDestroyConn);
// uv_shutdown(req, (uv_stream_t*)conn->pTcp, uvShutDownCb); // uv_close(conn->pTcp)
// uv_shutdown(req, (uv_stream_t*)conn->pTcp, uvShutDownCb);
} else {
uvDestroyConn((uv_handle_t*)conn->pTcp);
}
} }
} }
static void destroyConnRegArg(SSvrConn* conn) { static void destroyConnRegArg(SSvrConn* conn) {
@ -824,7 +817,6 @@ static void uvDestroyConn(uv_handle_t* handle) {
transRemoveExHandle(conn->refId); transRemoveExHandle(conn->refId);
tDebug("%s conn %p destroy", transLabel(thrd->pTransInst), conn); tDebug("%s conn %p destroy", transLabel(thrd->pTransInst), conn);
// uv_timer_stop(&conn->pTimer);
transQueueDestroy(&conn->srvMsgs); transQueueDestroy(&conn->srvMsgs);
QUEUE_REMOVE(&conn->queue); QUEUE_REMOVE(&conn->queue);