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

remove the pollFd check

This commit is contained in:
Jeff Tao 2020-10-22 13:36:54 +00:00
parent 0057a138ee
commit 4bb83933b2
1 changed files with 4 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -174,16 +174,15 @@ static void taosStopTcpThread(SThreadObj* pThreadObj) {
pThreadObj->stop = true; pThreadObj->stop = true;
eventfd_t fd = -1; eventfd_t fd = -1;
// save thread and pollFd into local variable since pThreadObj will be freed when thread exits // save thread into local variable since pThreadObj is freed when thread exits
pthread_t thread = pThreadObj->thread; pthread_t thread = pThreadObj->thread;
SOCKET pollFd = pThreadObj->pollFd;
if (taosComparePthread(pThreadObj->thread, pthread_self())) { if (taosComparePthread(pThreadObj->thread, pthread_self())) {
pthread_detach(pthread_self()); pthread_detach(pthread_self());
return; return;
} }
if (taosCheckPthreadValid(pThreadObj->thread) && pThreadObj->pollFd >= 0) { if (taosCheckPthreadValid(pThreadObj->thread)) {
// signal the thread to stop, try graceful method first, // signal the thread to stop, try graceful method first,
// and use pthread_cancel when failed // and use pthread_cancel when failed
struct epoll_event event = { .events = EPOLLIN }; struct epoll_event event = { .events = EPOLLIN };
@ -200,8 +199,8 @@ static void taosStopTcpThread(SThreadObj* pThreadObj) {
} }
} }
// at this step, pThreadObj may have been released // at this step, pThreadObj has already been released
if (taosCheckPthreadValid(thread) && pollFd >= 0) { if (taosCheckPthreadValid(thread)) {
pthread_join(thread, NULL); pthread_join(thread, NULL);
} }