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

TD-1645 fix compile error in windotws

This commit is contained in:
Shengliang Guan 2020-10-02 13:31:15 +08:00
parent aa6ff1f5dc
commit 38dc4f4d16
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -174,7 +174,7 @@ static void taosStopTcpThread(SThreadObj* pThreadObj) {
pThreadObj->stop = true; pThreadObj->stop = true;
eventfd_t fd = -1; eventfd_t fd = -1;
if (pThreadObj->thread == pthread_self()) { if (taosComparePthread(pThreadObj->thread, pthread_self())) {
pthread_detach(pthread_self()); pthread_detach(pthread_self());
return; return;
} }
@ -207,7 +207,7 @@ void taosStopTcpServer(void *handle) {
if(pServerObj->fd >=0) shutdown(pServerObj->fd, SHUT_RD); if(pServerObj->fd >=0) shutdown(pServerObj->fd, SHUT_RD);
if (taosCheckPthreadValid(pServerObj->thread)) { if (taosCheckPthreadValid(pServerObj->thread)) {
if (pServerObj->thread == pthread_self()) { if (taosComparePthread(pServerObj->thread, pthread_self())) {
pthread_detach(pthread_self()); pthread_detach(pthread_self());
} else { } else {
pthread_join(pServerObj->thread, NULL); pthread_join(pServerObj->thread, NULL);

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

@ -146,7 +146,7 @@ void taosStopUdpConnection(void *handle) {
for (int i = 0; i < pSet->threads; ++i) { for (int i = 0; i < pSet->threads; ++i) {
pConn = pSet->udpConn + i; pConn = pSet->udpConn + i;
if (taosCheckPthreadValid(pConn->thread)) { if (taosCheckPthreadValid(pConn->thread)) {
if (pConn->thread == pthread_self()) { if (taosComparePthread(pConn->thread, pthread_self())) {
pthread_detach(pthread_self()); pthread_detach(pthread_self());
} else { } else {
pthread_join(pConn->thread, NULL); pthread_join(pConn->thread, NULL);