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

[TD-2210] <fix>: use LWP pid. fix windows compile issue.

This commit is contained in:
Shuduo Sang 2021-02-26 19:16:32 +08:00
parent 89c74b8a6c
commit 100db8ff0a
4 changed files with 7 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/os/src/detail/osSemphone.c
View File

@ -13,8 +13,6 @@
* along with this program. If not, see <http://www.gnu.org/licenses/>. * along with this program. If not, see <http://www.gnu.org/licenses/>.
*/ */
#include <sys/syscall.h>
#define _DEFAULT_SOURCE #define _DEFAULT_SOURCE
#include "os.h" #include "os.h"

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

@ -181,8 +181,8 @@ static void taosStopTcpThread(SThreadObj* pThreadObj) {
return; return;
} }
pThreadObj->stop = true; pThreadObj->stop = true;
if (taosComparePthread(thread, taosGetSelfPthreadId())) { if (taosComparePthread(thread, pthread_self())) {
pthread_detach(taosGetSelfPthreadId()); pthread_detach(pthread_self());
return; return;
} }
pthread_join(thread, NULL); pthread_join(thread, NULL);
@ -207,8 +207,8 @@ void taosStopTcpServer(void *handle) {
#endif #endif
} }
if (taosCheckPthreadValid(pServerObj->thread)) { if (taosCheckPthreadValid(pServerObj->thread)) {
if (taosComparePthread(pServerObj->thread, taosGetSelfPthreadId())) { if (taosComparePthread(pServerObj->thread, pthread_self())) {
pthread_detach(taosGetSelfPthreadId()); pthread_detach(pthread_self());
} else { } else {
pthread_join(pServerObj->thread, NULL); pthread_join(pServerObj->thread, NULL);
} }

4
src/sync/src/syncTcp.c
View File

@ -327,8 +327,8 @@ static void syncStopPoolThread(SThreadObj *pThread) {
return; return;
} }
pThread->stop = true; pThread->stop = true;
if (taosComparePthread(thread, taosGetSelfPthreadId())) { if (taosComparePthread(thread, pthread_self())) {
pthread_detach(taosGetSelfPthreadId()); pthread_detach(pthread_self());
return; return;
} }
pthread_join(thread, NULL); pthread_join(thread, NULL);