From ef8135a609f5b8ff15b095acb3a589f5d66b8ee4 Mon Sep 17 00:00:00 2001
From: Shengliang Guan <slguan@taosdata.com>
Date: Sat, 8 Aug 2020 16:38:44 +0800
Subject: [PATCH] TD-1057

---
 src/common/src/tglobal.c          | 1 +
 src/os/inc/osSocket.h             | 6 +++++-
 src/os/inc/osWindows.h            | 3 +++
 src/os/src/windows/w64Env.c       | 3 +++
 src/plugins/http/src/httpServer.c | 1 +
 src/rpc/src/rpcTcp.c              | 3 ++-
 src/sync/src/taosTcpPool.c        | 3 ++-
 7 files changed, 17 insertions(+), 3 deletions(-)

diff --git a/src/common/src/tglobal.c b/src/common/src/tglobal.c
index c20061d11b..386ea2f9a7 100644
--- a/src/common/src/tglobal.c
+++ b/src/common/src/tglobal.c
@@ -295,6 +295,7 @@ bool taosCfgDynamicOptions(char *msg) {
 }
 
 static void doInitGlobalConfig(void) {
+  osInit();
   SGlobalCfg cfg = {0};
   
   // ip address
diff --git a/src/os/inc/osSocket.h b/src/os/inc/osSocket.h
index b9be39307c..58f95c3c2d 100644
--- a/src/os/inc/osSocket.h
+++ b/src/os/inc/osSocket.h
@@ -33,7 +33,11 @@ extern "C" {
       }                      \
     }
   typedef int SOCKET;
-#endif    
+#endif
+
+#ifndef TAOS_OS_DEF_EPOLL
+  #define TAOS_EPOLL_WAIT_TIME -1
+#endif  
 
 #define taosClose(x) taosCloseSocket(x)
 
diff --git a/src/os/inc/osWindows.h b/src/os/inc/osWindows.h
index dcf087beeb..caab61536e 100644
--- a/src/os/inc/osWindows.h
+++ b/src/os/inc/osWindows.h
@@ -94,6 +94,9 @@ extern "C" {
 typedef SOCKET eventfd_t; 
 #define eventfd(a, b) -1
 
+#define TAOS_OS_DEF_EPOLL
+  #define TAOS_EPOLL_WAIT_TIME 100
+
 #define TAOS_OS_FUNC_STRING_WCHAR
   int twcslen(const wchar_t *wcs);
 #define TAOS_OS_FUNC_STRING_GETLINE
diff --git a/src/os/src/windows/w64Env.c b/src/os/src/windows/w64Env.c
index 840a8d9f7a..333871e96c 100644
--- a/src/os/src/windows/w64Env.c
+++ b/src/os/src/windows/w64Env.c
@@ -18,6 +18,8 @@
 #include "tglobal.h"
 #include "tulog.h"
 
+extern void taosWinSocketInit();
+
 void osInit() {
   strcpy(configDir, "C:/TDengine/cfg");
   strcpy(tsVnodeDir, "C:/TDengine/data");
@@ -27,4 +29,5 @@ void osInit() {
   strcpy(tsLogDir, "C:/TDengine/log");
   strcpy(tsScriptDir, "C:/TDengine/script");
   strcpy(tsOsName, "Windows");
+  taosWinSocketInit();
 }
\ No newline at end of file
diff --git a/src/plugins/http/src/httpServer.c b/src/plugins/http/src/httpServer.c
index 5c910a3311..8ee92be31c 100644
--- a/src/plugins/http/src/httpServer.c
+++ b/src/plugins/http/src/httpServer.c
@@ -38,6 +38,7 @@ static void httpStopThread(HttpThread* pThread) {
   eventfd_t fd = eventfd(1, 0);
   if (fd == -1) {
     httpError("%s, failed to create eventfd, will call pthread_cancel instead, which may result in data corruption: %s", pThread->label, strerror(errno));
+    pThread->stop = true;
     pthread_cancel(pThread->thread);
   } else if (epoll_ctl(pThread->pollFd, EPOLL_CTL_ADD, fd, &event) < 0) {
     httpError("%s, failed to call epoll_ctl, will call pthread_cancel instead, which may result in data corruption: %s", pThread->label, strerror(errno));
diff --git a/src/rpc/src/rpcTcp.c b/src/rpc/src/rpcTcp.c
index ac617edfc3..9da11831e5 100644
--- a/src/rpc/src/rpcTcp.c
+++ b/src/rpc/src/rpcTcp.c
@@ -174,6 +174,7 @@ static void taosStopTcpThread(SThreadObj* pThreadObj) {
     if (fd == -1) {
       // failed to create eventfd, call pthread_cancel instead, which may result in data corruption:
       tError("%s, failed to create eventfd(%s)", pThreadObj->label, strerror(errno));
+      pThreadObj->stop = true;
       pthread_cancel(pThreadObj->thread);
     } else if (epoll_ctl(pThreadObj->pollFd, EPOLL_CTL_ADD, fd, &event) < 0) {
       // failed to call epoll_ctl, call pthread_cancel instead, which may result in data corruption:
@@ -464,7 +465,7 @@ static void *taosProcessTcpData(void *param) {
   SRecvInfo          recvInfo;
  
   while (1) {
-    int fdNum = epoll_wait(pThreadObj->pollFd, events, maxEvents, -1);
+    int fdNum = epoll_wait(pThreadObj->pollFd, events, maxEvents, TAOS_EPOLL_WAIT_TIME);
     if (pThreadObj->stop) {
       tDebug("%s TCP thread get stop event, exiting...", pThreadObj->label);
       break;
diff --git a/src/sync/src/taosTcpPool.c b/src/sync/src/taosTcpPool.c
index 88c2c53be4..b523728bf9 100644
--- a/src/sync/src/taosTcpPool.c
+++ b/src/sync/src/taosTcpPool.c
@@ -184,7 +184,7 @@ static void *taosProcessTcpData(void *param) {
 
   while (1) {
     if (pThread->stop) break; 
-    int fdNum = epoll_wait(pThread->pollFd, events, maxEvents, -1);
+    int fdNum = epoll_wait(pThread->pollFd, events, maxEvents, TAOS_EPOLL_WAIT_TIME);
     if (pThread->stop) {
       uDebug("%p TCP epoll thread is exiting...", pThread);
       break;
@@ -313,6 +313,7 @@ static void taosStopPoolThread(SThreadObj* pThread) {
     // failed to create eventfd, call pthread_cancel instead, which may result in data corruption
     uError("failed to create eventfd(%s)", strerror(errno));
     pthread_cancel(pThread->thread);
+    pThread->stop = true;
   } else if (epoll_ctl(pThread->pollFd, EPOLL_CTL_ADD, fd, &event) < 0) {
     // failed to call epoll_ctl, call pthread_cancel instead, which may result in data corruption
     uError("failed to call epoll_ctl(%s)", strerror(errno));
-- 
GitLab