From 0081f2e7fa797f47f07134e6813d4251930172bf Mon Sep 17 00:00:00 2001
From: yihaoDeng <luomoxyz@126.com>
Date: Wed, 25 Nov 2020 05:45:20 +0000
Subject: [PATCH] fix mem cost

---
 src/os/inc/osSocket.h |  2 +-
 src/rpc/src/rpcTcp.c  | 36 +++++++-----------------------------
 2 files changed, 8 insertions(+), 30 deletions(-)

diff --git a/src/os/inc/osSocket.h b/src/os/inc/osSocket.h
index cbfdedef48..baf7687dd0 100644
--- a/src/os/inc/osSocket.h
+++ b/src/os/inc/osSocket.h
@@ -37,7 +37,7 @@ extern "C" {
 #endif
 
 #ifndef TAOS_OS_DEF_EPOLL
-  #define TAOS_EPOLL_WAIT_TIME -1
+  #define TAOS_EPOLL_WAIT_TIME 500 
 #endif  
 
 #ifdef TAOS_RANDOM_NETWORK_FAIL
diff --git a/src/rpc/src/rpcTcp.c b/src/rpc/src/rpcTcp.c
index 7b32d3416d..ae9af8e95f 100644
--- a/src/rpc/src/rpcTcp.c
+++ b/src/rpc/src/rpcTcp.c
@@ -171,40 +171,18 @@ void *taosInitTcpServer(uint32_t ip, uint16_t port, char *label, int numOfThread
 }
 
 static void taosStopTcpThread(SThreadObj* pThreadObj) {
-  pThreadObj->stop = true;
-  eventfd_t fd = -1;
-
-  // save thread into local variable since pThreadObj is freed when thread exits
+  // save thread into local variable
   pthread_t thread = pThreadObj->thread; 
 
-  if (taosComparePthread(pThreadObj->thread, pthread_self())) {
-    pthread_detach(pthread_self());
+  if (!taosCheckPthreadValid(thread)) {
     return;
   }
-
-  if (taosCheckPthreadValid(pThreadObj->thread)) {
-    // signal the thread to stop, try graceful method first,
-    // and use pthread_cancel when failed
-    struct epoll_event event = { .events = EPOLLIN };
-    fd = eventfd(1, 0);
-    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:
-      tError("%s, failed to call epoll_ctl(%s)", pThreadObj->label, strerror(errno));
-      pthread_cancel(pThreadObj->thread);
-    }
-  }
-
-  // at this step, pThreadObj has already been released
-  if (taosCheckPthreadValid(thread)) {
-     pthread_join(thread, NULL);
+  pThreadObj->stop = true;
+  if (taosComparePthread(thread, pthread_self())) {
+    pthread_detach(pthread_self());
+    return;
   }
-
-  if (fd != -1) taosCloseSocket(fd);
+  pthread_join(thread, NULL);
 }
 
 void taosStopTcpServer(void *handle) {
-- 
GitLab