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

TD-1772 

pThreadObj is freed when thread exits
This commit is contained in:
Jeff Tao 2020-10-22 09:57:44 +00:00
parent 5c6bde8831
commit be142916e6
2 changed files with 8 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
src/dnode/src/dnodeVWrite.c
View File

@ -190,6 +190,7 @@ void dnodeFreeVnodeWqueue(void *wqueue) {
void dnodeSendRpcVnodeWriteRsp(void *pVnode, void *param, int32_t code) {
SWriteMsg *pWrite = (SWriteMsg *)param;
if (pWrite == NULL) return;
if (code < 0) pWrite->code = code;
int32_t count = atomic_add_fetch_32(&pWrite->processedCount, 1);

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

@ -174,6 +174,10 @@ static void taosStopTcpThread(SThreadObj* pThreadObj) {
pThreadObj->stop = true;
eventfd_t fd = -1;
// save thread and pollFd into local variable since pThreadObj will be freed when thread exits
pthread_t thread = pThreadObj->thread;
int pollFd = pThreadObj->pollFd;
if (taosComparePthread(pThreadObj->thread, pthread_self())) {
pthread_detach(pthread_self());
return;
@ -196,8 +200,9 @@ static void taosStopTcpThread(SThreadObj* pThreadObj) {
}
}
if (taosCheckPthreadValid(pThreadObj->thread) && pThreadObj->pollFd >= 0) {
pthread_join(pThreadObj->thread, NULL);
// at this step, pThreadObj may have been released
if (taosCheckPthreadValid(thread) && pollFd >= 0) {
pthread_join(thread, NULL);
}
if (fd != -1) taosCloseSocket(fd);