rename file

include/util/mallocator.h → include/util/tmallocator.h

@@ -13,8 +13,8 @@
  * along with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
-#ifndef _TD_MALLOCATOR_H_
-#define _TD_MALLOCATOR_H_
+#ifndef _TD_UTIL_MALLOCATOR_H_
+#define _TD_UTIL_MALLOCATOR_H_
 
 #include "os.h"
 
@@ -29,10 +29,10 @@ extern "C" {
     void (*free_)(struct TYPE *, void *ptr);        \
   }
 #define TD_MA_MALLOC_FUNC(TMA) (TMA)->malloc_
-#define TD_MA_FREE_FUNC(TMA) (TMA)->free_
+#define TD_MA_FREE_FUNC(TMA)   (TMA)->free_
 
 #define TD_MA_MALLOC(TMA, SIZE) (*((TMA)->malloc_))(TMA, (SIZE))
-#define TD_MA_FREE(TMA, PTR) (*((TMA)->free_))(TMA, (PTR))
+#define TD_MA_FREE(TMA, PTR)    (*((TMA)->free_))(TMA, (PTR))
 
 typedef struct SMemAllocator {
   void *impl;
@@ -40,7 +40,7 @@ typedef struct SMemAllocator {
 } SMemAllocator;
 
 #define tMalloc(pMA, SIZE) TD_MA_MALLOC(PMA, SIZE)
-#define tFree(pMA, PTR) TD_MA_FREE(PMA, PTR)
+#define tFree(pMA, PTR)    TD_MA_FREE(PMA, PTR)
 
 typedef struct SMemAllocatorFactory {
   void *impl;
@@ -52,4 +52,4 @@ typedef struct SMemAllocatorFactory {
 }
 #endif
 
-#endif /*_TD_MALLOCATOR_H_*/
+#endif /*_TD_UTIL_MALLOCATOR_H_*/
\ No newline at end of file

source/dnode/vnode/inc/meta.h

@@ -16,8 +16,7 @@
 #ifndef _TD_META_H_
 #define _TD_META_H_
 
-#include "mallocator.h"
-#include "os.h"
+#include "tmallocator.h"
 #include "tmsg.h"
 #include "trow.h"
 

source/dnode/vnode/inc/tq.h

@@ -18,9 +18,8 @@
 
 #include "common.h"
 #include "executor.h"
-#include "mallocator.h"
+#include "tmallocator.h"
 #include "meta.h"
-#include "os.h"
 #include "scheduler.h"
 #include "taoserror.h"
 #include "tlist.h"

source/dnode/vnode/inc/tsdb.h

@@ -16,7 +16,7 @@
 #ifndef _TD_TSDB_H_
 #define _TD_TSDB_H_
 
-#include "mallocator.h"
+#include "tmallocator.h"
 #include "meta.h"
 #include "common.h"
 #include "tfs.h"

source/dnode/vnode/src/inc/metaDef.h

@@ -16,7 +16,7 @@
 #ifndef _TD_META_DEF_H_
 #define _TD_META_DEF_H_
 
-#include "mallocator.h"
+#include "tmallocator.h"
 
 #include "meta.h"
 

source/dnode/vnode/src/inc/tsdbDef.h

@@ -16,7 +16,7 @@
 #ifndef _TD_TSDB_DEF_H_
 #define _TD_TSDB_DEF_H_
 
-#include "mallocator.h"
+#include "tmallocator.h"
 #include "meta.h"
 #include "tcompression.h"
 #include "tglobal.h"

source/dnode/vnode/src/inc/vnd.h

@@ -16,7 +16,7 @@
 #ifndef _TD_VNODE_DEF_H_
 #define _TD_VNODE_DEF_H_
 
-#include "mallocator.h"
+#include "tmallocator.h"
 // #include "sync.h"
 #include "tcoding.h"
 #include "tfs.h"

source/util/src/mallocator.c → source/util/src/tmallocator.c

@@ -13,7 +13,8 @@
  * along with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include "mallocator.h"
+#define _DEFAULT_SOURCE
+#include "tmallocator.h"
 
 /* ------------------------ HEAP ALLOCATOR ------------------------ */
 #if 0