From aaf9ca18c51ade1843dee8ab46fd38dfb8cf4ec9 Mon Sep 17 00:00:00 2001
From: Hongze Cheng <hzcheng@taosdata.com>
Date: Mon, 13 Dec 2021 21:18:43 +0800
Subject: [PATCH] more

---
 include/util/tdlist.h                         | 29 ++++++++++++-------
 .../dnode/vnode/impl/src/vnodeArenaMAImpl.c   |  2 +-
 source/dnode/vnode/impl/src/vnodeBufferPool.c |  4 +--
 3 files changed, 21 insertions(+), 14 deletions(-)

diff --git a/include/util/tdlist.h b/include/util/tdlist.h
index 4be1779c74..2be9ba3895 100644
--- a/include/util/tdlist.h
+++ b/include/util/tdlist.h
@@ -31,28 +31,35 @@ extern "C" {
     struct TYPE *sl_head_; \
   }
 
-#define TD_SLIST_NODE_NEXT(sln) (sln)->sl_next_
+#define TD_SLIST_HEAD(sl) ((sl)->sl_head_)
+#define TD_SLIST_NODE_NEXT(sln) ((sln)->sl_next_)
 
 #define tSListInit(sl)     \
   do {                     \
     (sl)->sl_head_ = NULL; \
   } while (0)
 
+#define tSListPrepend(sl, sln)                   \
+  do {                                           \
+    TD_SLIST_NODE_NEXT(sln) = TD_SLIST_HEAD(sl); \
+    TD_SLIST_HEAD(sl) = (sln);                   \
+  } while (0);
+
 // Double linked list
-#define TD_DLIST_NODE(S) \
-  struct {               \
-    S *prev_;            \
-    S *next_;            \
+#define TD_DLIST_NODE(TYPE) \
+  struct {                  \
+    TYPE *prev_;            \
+    TYPE *next_;            \
   }
 
-#define TD_DLIST(S) \
-  struct {          \
-    S * head_;      \
-    S * tail_;      \
-    int neles_;     \
+#define TD_DLIST(TYPE) \
+  struct {             \
+    TYPE *head_;       \
+    TYPE *tail_;       \
+    int   neles_;      \
   }
 
-#define tlistInit(l)              \
+#define tDListInit(l)             \
   (l)->head_ = (l)->tail_ = NULL; \
   (l)->neles_ = 0;
 
diff --git a/source/dnode/vnode/impl/src/vnodeArenaMAImpl.c b/source/dnode/vnode/impl/src/vnodeArenaMAImpl.c
index 748808a9fd..b5424894ca 100644
--- a/source/dnode/vnode/impl/src/vnodeArenaMAImpl.c
+++ b/source/dnode/vnode/impl/src/vnodeArenaMAImpl.c
@@ -27,7 +27,7 @@ SVMemAllocator *vmaCreate(uint64_t capacity, uint64_t ssize, uint64_t lsize) {
   pVMA->capacity = capacity;
   pVMA->ssize = ssize;
   pVMA->lsize = lsize;
-  tlistInit(&(pVMA->nlist));
+  tDListInit(&(pVMA->nlist));
 
   SVArenaNode *pNode = vArenaNodeNew(capacity);
   if (pNode == NULL) {
diff --git a/source/dnode/vnode/impl/src/vnodeBufferPool.c b/source/dnode/vnode/impl/src/vnodeBufferPool.c
index 347fe44e26..084a7d18a7 100644
--- a/source/dnode/vnode/impl/src/vnodeBufferPool.c
+++ b/source/dnode/vnode/impl/src/vnodeBufferPool.c
@@ -35,8 +35,8 @@ int vnodeOpenBufPool(SVnode *pVnode) {
     return -1;
   }
 
-  tlistInit(&(pVnode->pBufPool->free));
-  tlistInit(&(pVnode->pBufPool->incycle));
+  tDListInit(&(pVnode->pBufPool->free));
+  tDListInit(&(pVnode->pBufPool->incycle));
 
   pVnode->pBufPool->inuse = NULL;