From ae18e4c390487507668f1b7e20204e9a47df1337 Mon Sep 17 00:00:00 2001
From: Hongze Cheng <hzcheng@taosdata.com>
Date: Sat, 11 Dec 2021 17:28:31 +0800
Subject: [PATCH] more work

---
 CMakeLists.txt                                |  2 +-
 source/dnode/vnode/impl/inc/vnodeBufferPool.h |  1 +
 source/dnode/vnode/impl/inc/vnodeCommit.h     |  4 ++--
 source/dnode/vnode/impl/src/vnodeBufferPool.c | 22 +++++++++++++++++--
 source/dnode/vnode/impl/src/vnodeCommit.c     |  2 --
 5 files changed, 24 insertions(+), 7 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index b626977588..9762a466b1 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -10,7 +10,7 @@ set(CMAKE_SUPPORT_DIR "${CMAKE_SOURCE_DIR}/cmake")
 set(CMAKE_CONTRIB_DIR "${CMAKE_SOURCE_DIR}/contrib")
 include(${CMAKE_SUPPORT_DIR}/cmake.options)
 
-SET(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -fPIC -gdwarf-2 -msse4.2 -mfma")
+SET(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -fPIC -gdwarf-2 -msse4.2 -mfma -g3")
 
 # contrib
 add_subdirectory(contrib)
diff --git a/source/dnode/vnode/impl/inc/vnodeBufferPool.h b/source/dnode/vnode/impl/inc/vnodeBufferPool.h
index d64dc93847..bfc4de9e12 100644
--- a/source/dnode/vnode/impl/inc/vnodeBufferPool.h
+++ b/source/dnode/vnode/impl/inc/vnodeBufferPool.h
@@ -28,6 +28,7 @@ typedef struct SVBufPool SVBufPool;
 int   vnodeOpenBufPool(SVnode *pVnode);
 void  vnodeCloseBufPool(SVnode *pVnode);
 void *vnodeMalloc(SVnode *pVnode, uint64_t size);
+bool  vnodeBufPoolIsFull(SVnode *pVnode);
 
 #ifdef __cplusplus
 }
diff --git a/source/dnode/vnode/impl/inc/vnodeCommit.h b/source/dnode/vnode/impl/inc/vnodeCommit.h
index c8ff4947aa..a60e8feac2 100644
--- a/source/dnode/vnode/impl/inc/vnodeCommit.h
+++ b/source/dnode/vnode/impl/inc/vnodeCommit.h
@@ -22,8 +22,8 @@
 extern "C" {
 #endif
 
-bool vnodeShouldCommit(SVnode *pVnode);
-int  vnodeAsyncCommit(SVnode *pVnode);
+#define vnodeShouldCommit vnodeBufPoolIsFull
+int vnodeAsyncCommit(SVnode *pVnode);
 
 #ifdef __cplusplus
 }
diff --git a/source/dnode/vnode/impl/src/vnodeBufferPool.c b/source/dnode/vnode/impl/src/vnodeBufferPool.c
index 00203ed9b6..7415033f02 100644
--- a/source/dnode/vnode/impl/src/vnodeBufferPool.c
+++ b/source/dnode/vnode/impl/src/vnodeBufferPool.c
@@ -148,6 +148,24 @@ void *vnodeMalloc(SVnode *pVnode, uint64_t size) {
   return vBufPoolMalloc(pvma, size);
 }
 
+bool vnodeBufPoolIsFull(SVnode *pVnode) {
+  SVBufPool *     pBufPool = pVnode->pBufPool;
+  SVMemAllocator *pvma;
+
+  if (pBufPool->inuse == NULL) return false;
+
+  pvma = (SVMemAllocator *)(pBufPool->inuse->data);
+  if (pvma->type == E_V_HEAP_ALLOCATOR) {
+    ASSERT(0);
+  } else {
+    SVArenaNode *pNode = pvma->vaa.inuse;
+    bool         ret =
+        (pNode != &(pvma->vaa.node)) || ((pNode->size - POINTER_DISTANCE(pNode->ptr, pNode->data)) <= pvma->vaa.lsize);
+
+    return ret;
+  }
+}
+
 /* ------------------------ STATIC METHODS ------------------------ */
 static void vArenaAllocatorInit(SVArenaAllocator *pvaa, uint64_t capacity, uint64_t ssize, uint64_t lsize) { /* TODO */
   pvaa->ssize = ssize;
@@ -171,8 +189,8 @@ static SListNode *vBufPoolNewNode(uint64_t capacity, EVMemAllocatorT type) {
   SListNode *     pNode;
   SVMemAllocator *pvma;
   uint64_t        msize;
-  uint64_t        ssize = 0;  // TODO
-  uint64_t        lsize = 0;  // TODO
+  uint64_t        ssize = 4096;  // TODO
+  uint64_t        lsize = 1024;  // TODO
 
   msize = sizeof(SListNode) + sizeof(SVMemAllocator);
   if (type == E_V_ARENA_ALLOCATOR) {
diff --git a/source/dnode/vnode/impl/src/vnodeCommit.c b/source/dnode/vnode/impl/src/vnodeCommit.c
index 18a0c6d91d..cac7999f59 100644
--- a/source/dnode/vnode/impl/src/vnodeCommit.c
+++ b/source/dnode/vnode/impl/src/vnodeCommit.c
@@ -18,8 +18,6 @@
 static int vnodeStartCommit(SVnode *pVnode);
 static int vnodeEndCommit(SVnode *pVnode);
 
-bool vnodeShouldCommit(SVnode *pVnode) { return false; }
-
 int vnodeAsyncCommit(SVnode *pVnode) {
 #if 0
   if (vnodeStartCommit(pVnode) < 0) {