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

[TD-1785]<fix>: taos_close may fail

This commit is contained in:
yihaoDeng 2020-11-14 16:35:23 +00:00
parent db1ae55860
commit a8b7c1e512
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/rpc/src/rpcTcp.c
View File

@ -173,11 +173,11 @@ void *taosInitTcpServer(uint32_t ip, uint16_t port, char *label, int numOfThread
static void taosStopTcpThread(SThreadObj* pThreadObj) { static void taosStopTcpThread(SThreadObj* pThreadObj) {
// save thread into local variable and signal thread to stop // save thread into local variable and signal thread to stop
pthread_t thread = pThreadObj->thread; pthread_t thread = pThreadObj->thread;
pThreadObj->stop = true;
if (taosComparePthread(thread, pthread_self())) { if (taosComparePthread(thread, pthread_self())) {
pthread_detach(pthread_self()); pthread_detach(pthread_self());
return; return;
} }
pThreadObj->stop = true;
pthread_join(thread, NULL); pthread_join(thread, NULL);
} }

2
src/sync/src/taosTcpPool.c
View File

@ -302,10 +302,10 @@ static SThreadObj *taosGetTcpThread(SPoolObj *pPool) {
static void taosStopPoolThread(SThreadObj *pThread) { static void taosStopPoolThread(SThreadObj *pThread) {
pthread_t thread = pThread->thread; pthread_t thread = pThread->thread;
pThread->stop = true;
if (taosComparePthread(thread, pthread_self())) { if (taosComparePthread(thread, pthread_self())) {
pthread_detach(pthread_self()); pthread_detach(pthread_self());
return; return;
} }
pThread->stop = true;
pthread_join(thread, NULL); pthread_join(thread, NULL);
} }