From a6c05e4a1b70552aef6155dd0301205cc0462181 Mon Sep 17 00:00:00 2001
From: Hongze Cheng <hzcheng@taosdata.com>
Date: Thu, 14 Apr 2022 07:05:57 +0000
Subject: [PATCH] refact vnode

---
 source/dnode/mgmt/vm/vmInt.c          |   2 +-
 source/dnode/vnode/src/vnd/vnodeMgr.c | 113 --------------------------
 2 files changed, 1 insertion(+), 114 deletions(-)
 delete mode 100644 source/dnode/vnode/src/vnd/vnodeMgr.c

diff --git a/source/dnode/mgmt/vm/vmInt.c b/source/dnode/mgmt/vm/vmInt.c
index 6a1a5c3987..e9a375688c 100644
--- a/source/dnode/mgmt/vm/vmInt.c
+++ b/source/dnode/mgmt/vm/vmInt.c
@@ -299,7 +299,7 @@ static int32_t vmInit(SMgmtWrapper *pWrapper) {
     goto _OVER;
   }
 
-  if (vnodeInit() != 0) {
+  if (vnodeInit(tsNumOfCommitThreads) != 0) {
     dError("failed to init vnode since %s", terrstr());
     goto _OVER;
   }
diff --git a/source/dnode/vnode/src/vnd/vnodeMgr.c b/source/dnode/vnode/src/vnd/vnodeMgr.c
deleted file mode 100644
index df5e2ceffa..0000000000
--- a/source/dnode/vnode/src/vnd/vnodeMgr.c
+++ /dev/null
@@ -1,113 +0,0 @@
-/*
- * Copyright (c) 2019 TAOS Data, Inc. <jhtao@taosdata.com>
- *
- * This program is free software: you can use, redistribute, and/or modify
- * it under the terms of the GNU Affero General Public License, version 3
- * or later ("AGPL"), as published by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE.
- *
- * You should have received a copy of the GNU Affero General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
- */
-
-#include "vnodeInt.h"
-
-SVnodeMgr vnodeMgr = {.vnodeInitFlag = TD_MOD_UNINITIALIZED};
-
-static void* loop(void* arg);
-
-int vnodeInit() {
-  if (TD_CHECK_AND_SET_MODE_INIT(&(vnodeMgr.vnodeInitFlag)) == TD_MOD_INITIALIZED) {
-    return 0;
-  }
-
-  vnodeMgr.stop = false;
-
-  // Start commit handers
-  vnodeMgr.nthreads = tsNumOfCommitThreads;
-  vnodeMgr.threads = taosMemoryCalloc(vnodeMgr.nthreads, sizeof(TdThread));
-  if (vnodeMgr.threads == NULL) {
-    return -1;
-  }
-
-  taosThreadMutexInit(&(vnodeMgr.mutex), NULL);
-  taosThreadCondInit(&(vnodeMgr.hasTask), NULL);
-  TD_DLIST_INIT(&(vnodeMgr.queue));
-
-  for (uint16_t i = 0; i < vnodeMgr.nthreads; i++) {
-    taosThreadCreate(&(vnodeMgr.threads[i]), NULL, loop, NULL);
-    // pthread_setname_np(vnodeMgr.threads[i], "VND Commit Thread");
-  }
-
-  if (walInit() < 0) {
-    return -1;
-  }
-
-  return 0;
-}
-
-void vnodeCleanup() {
-  if (TD_CHECK_AND_SET_MOD_CLEAR(&(vnodeMgr.vnodeInitFlag)) == TD_MOD_UNINITIALIZED) {
-    return;
-  }
-
-  // Stop commit handler
-  taosThreadMutexLock(&(vnodeMgr.mutex));
-  vnodeMgr.stop = true;
-  taosThreadCondBroadcast(&(vnodeMgr.hasTask));
-  taosThreadMutexUnlock(&(vnodeMgr.mutex));
-
-  for (uint16_t i = 0; i < vnodeMgr.nthreads; i++) {
-    taosThreadJoin(vnodeMgr.threads[i], NULL);
-  }
-
-  taosMemoryFreeClear(vnodeMgr.threads);
-  taosThreadCondDestroy(&(vnodeMgr.hasTask));
-  taosThreadMutexDestroy(&(vnodeMgr.mutex));
-}
-
-int vnodeScheduleTask(SVnodeTask* pTask) {
-  taosThreadMutexLock(&(vnodeMgr.mutex));
-
-  TD_DLIST_APPEND(&(vnodeMgr.queue), pTask);
-
-  taosThreadCondSignal(&(vnodeMgr.hasTask));
-
-  taosThreadMutexUnlock(&(vnodeMgr.mutex));
-
-  return 0;
-}
-
-/* ------------------------ STATIC METHODS ------------------------ */
-static void* loop(void* arg) {
-  setThreadName("vnode-commit");
-
-  SVnodeTask* pTask;
-  for (;;) {
-    taosThreadMutexLock(&(vnodeMgr.mutex));
-    for (;;) {
-      pTask = TD_DLIST_HEAD(&(vnodeMgr.queue));
-      if (pTask == NULL) {
-        if (vnodeMgr.stop) {
-          taosThreadMutexUnlock(&(vnodeMgr.mutex));
-          return NULL;
-        } else {
-          taosThreadCondWait(&(vnodeMgr.hasTask), &(vnodeMgr.mutex));
-        }
-      } else {
-        TD_DLIST_POP(&(vnodeMgr.queue), pTask);
-        break;
-      }
-    }
-
-    taosThreadMutexUnlock(&(vnodeMgr.mutex));
-
-    (*(pTask->execute))(pTask->arg);
-    taosMemoryFree(pTask);
-  }
-
-  return NULL;
-}
\ No newline at end of file
-- 
GitLab