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

opt transport

This commit is contained in:
yihaoDeng 2024-09-10 19:03:27 +08:00
parent 46a79c0be3
commit 2fa083c82f
2 changed files with 7 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
source/libs/transport/src/transCli.c
View File

@ -2426,7 +2426,6 @@ static void destroyThrdObj(SCliThrd* pThrd) {
taosMemoryFree(timer); taosMemoryFree(timer);
} }
(void)uv_loop_close(pThrd->loop);
taosArrayDestroy(pThrd->timerList); taosArrayDestroy(pThrd->timerList);
taosMemoryFree(pThrd->loop); taosMemoryFree(pThrd->loop);
taosHashCleanup(pThrd->fqdn2ipCache); taosHashCleanup(pThrd->fqdn2ipCache);

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

@ -190,9 +190,11 @@ static int32_t addHandleToAcceptloop(void* arg);
#define SRV_RELEASE_UV(loop) \ #define SRV_RELEASE_UV(loop) \
do { \ do { \
if (loop && uv_loop_alive(loop)) { \
(void)uv_walk(loop, uvWalkCb, NULL); \ (void)uv_walk(loop, uvWalkCb, NULL); \
(void)uv_run(loop, UV_RUN_DEFAULT); \ (void)uv_run(loop, UV_RUN_DEFAULT); \
(void)uv_loop_close(loop); \ (void)uv_loop_close(loop); \
} \
} while (0); } while (0);
#define ASYNC_ERR_JRET(thrd) \ #define ASYNC_ERR_JRET(thrd) \
@ -1615,7 +1617,6 @@ void destroyWorkThrdObj(SWorkThrd* pThrd) {
} }
transAsyncPoolDestroy(pThrd->asyncPool); transAsyncPoolDestroy(pThrd->asyncPool);
uvWhiteListDestroy(pThrd->pWhiteList); uvWhiteListDestroy(pThrd->pWhiteList);
(void)uv_loop_close(pThrd->loop);
taosMemoryFree(pThrd->loop); taosMemoryFree(pThrd->loop);
taosMemoryFree(pThrd); taosMemoryFree(pThrd);
} }
@ -1648,14 +1649,11 @@ void transCloseServer(void* arg) {
(void)taosThreadJoin(srv->thread, NULL); (void)taosThreadJoin(srv->thread, NULL);
SRV_RELEASE_UV(srv->loop); SRV_RELEASE_UV(srv->loop);
(void)uv_loop_close(srv->loop);
for (int i = 0; i < srv->numOfThreads; i++) { for (int i = 0; i < srv->numOfThreads; i++) {
destroyWorkThrd(srv->pThreadObj[i]); destroyWorkThrd(srv->pThreadObj[i]);
} }
} else { } else {
SRV_RELEASE_UV(srv->loop); SRV_RELEASE_UV(srv->loop);
(void)uv_loop_close(srv->loop);
} }
taosMemoryFree(srv->pThreadObj); taosMemoryFree(srv->pThreadObj);