opt transport
This commit is contained in:
parent
46a79c0be3
commit
2fa083c82f
|
@ -2426,7 +2426,6 @@ static void destroyThrdObj(SCliThrd* pThrd) {
|
|||
taosMemoryFree(timer);
|
||||
}
|
||||
|
||||
(void)uv_loop_close(pThrd->loop);
|
||||
taosArrayDestroy(pThrd->timerList);
|
||||
taosMemoryFree(pThrd->loop);
|
||||
taosHashCleanup(pThrd->fqdn2ipCache);
|
||||
|
|
|
@ -188,11 +188,13 @@ static void sendQuitToWorkThrd(SWorkThrd* pThrd);
|
|||
static int32_t addHandleToWorkloop(SWorkThrd* pThrd, char* pipeName);
|
||||
static int32_t addHandleToAcceptloop(void* arg);
|
||||
|
||||
#define SRV_RELEASE_UV(loop) \
|
||||
do { \
|
||||
(void)uv_walk(loop, uvWalkCb, NULL); \
|
||||
(void)uv_run(loop, UV_RUN_DEFAULT); \
|
||||
(void)uv_loop_close(loop); \
|
||||
#define SRV_RELEASE_UV(loop) \
|
||||
do { \
|
||||
if (loop && uv_loop_alive(loop)) { \
|
||||
(void)uv_walk(loop, uvWalkCb, NULL); \
|
||||
(void)uv_run(loop, UV_RUN_DEFAULT); \
|
||||
(void)uv_loop_close(loop); \
|
||||
} \
|
||||
} while (0);
|
||||
|
||||
#define ASYNC_ERR_JRET(thrd) \
|
||||
|
@ -1615,7 +1617,6 @@ void destroyWorkThrdObj(SWorkThrd* pThrd) {
|
|||
}
|
||||
transAsyncPoolDestroy(pThrd->asyncPool);
|
||||
uvWhiteListDestroy(pThrd->pWhiteList);
|
||||
(void)uv_loop_close(pThrd->loop);
|
||||
taosMemoryFree(pThrd->loop);
|
||||
taosMemoryFree(pThrd);
|
||||
}
|
||||
|
@ -1648,14 +1649,11 @@ void transCloseServer(void* arg) {
|
|||
(void)taosThreadJoin(srv->thread, NULL);
|
||||
|
||||
SRV_RELEASE_UV(srv->loop);
|
||||
(void)uv_loop_close(srv->loop);
|
||||
|
||||
for (int i = 0; i < srv->numOfThreads; i++) {
|
||||
destroyWorkThrd(srv->pThreadObj[i]);
|
||||
}
|
||||
} else {
|
||||
SRV_RELEASE_UV(srv->loop);
|
||||
(void)uv_loop_close(srv->loop);
|
||||
}
|
||||
|
||||
taosMemoryFree(srv->pThreadObj);
|
||||
|
|
Loading…
Reference in New Issue