diff --git a/source/libs/tdb/src/inc/tdbOs.h b/source/libs/tdb/src/inc/tdbOs.h index bc610917f64d26ee23950e8296c5e1a4202b5a96..794d4c502a28bc46edb4ebc2507d8b1d2e32551c 100644 --- a/source/libs/tdb/src/inc/tdbOs.h +++ b/source/libs/tdb/src/inc/tdbOs.h @@ -23,30 +23,19 @@ extern "C" { // TODO: use cmake to control the option #define TDB_FOR_TDENGINE -// For memory ----------------- #ifdef TDB_FOR_TDENGINE +// For memory ----------------- #define tdbOsMalloc taosMemoryMalloc #define tdbOsCalloc taosMemoryCalloc #define tdbOsRealloc taosMemoryRealloc #define tdbOsFree taosMemoryFree -#else - -#define tdbOsMalloc malloc -#define tdbOsCalloc calloc -#define tdbOsRealloc realloc -#define tdbOsFree free - -#endif - // For file and directory ----------------- -#ifdef TDB_FOR_TDENGINE - /* file */ typedef TdFilePtr tdb_fd_t; -#define TDB_O_CREAT TD_FILE_CTEATE +#define TDB_O_CREAT TD_FILE_CTEATE #define TDB_O_WRITE TD_FILE_WRITE #define TDB_O_READ TD_FILE_READ #define TDB_O_TRUNC TD_FILE_TRUNC @@ -67,12 +56,37 @@ typedef TdFilePtr tdb_fd_t; #define tdbOsMkdir taosMkDir #define tdbOsRmdir taosRemoveDir +// For threads and lock ----------------- +/* spin lock */ +typedef TdThreadSpinlock tdb_spinlock_t; + +#define tdbSpinlockInit taosThreadSpinInit +#define tdbSpinlockDestroy taosThreadSpinDestroy +#define tdbSpinlockLock taosThreadSpinLock +#define tdbSpinlockUnlock taosThreadSpinUnlock +#define tdbSpinlockTrylock pthread_spin_trylock + +/* mutex lock */ +typedef TdThreadMutex tdb_mutex_t; + +#define tdbMutexInit taosThreadMutexInit +#define tdbMutexDestroy taosThreadMutexDestroy +#define tdbMutexLock taosThreadMutexLock +#define tdbMutexUnlock taosThreadMutexUnlock + #else +// For memory ----------------- +#define tdbOsMalloc malloc +#define tdbOsCalloc calloc +#define tdbOsRealloc realloc +#define tdbOsFree free + +// For file and directory ----------------- /* file */ typedef int tdb_fd_t; -#define TDB_O_CREAT O_CREAT +#define TDB_O_CREAT O_CREAT #define TDB_O_WRITE O_WRONLY #define TDB_O_READ O_RDONLY #define TDB_O_TRUNC O_TRUNC @@ -95,30 +109,7 @@ i64 tdbOsWrite(tdb_fd_t fd, const void *pData, i64 nBytes); #define tdbOsMkdir mkdir #define tdbOsRmdir rmdir -#endif - // For threads and lock ----------------- -#ifdef TDB_FOR_TDENGINE - -/* spin lock */ -typedef TdThreadSpinlock tdb_spinlock_t; - -#define tdbSpinlockInit taosThreadSpinInit -#define tdbSpinlockDestroy taosThreadSpinDestroy -#define tdbSpinlockLock taosThreadSpinLock -#define tdbSpinlockUnlock taosThreadSpinUnlock -#define tdbSpinlockTrylock pthread_spin_trylock - -/* mutex lock */ -typedef TdThreadMutex tdb_mutex_t; - -#define tdbMutexInit taosThreadMutexInit -#define tdbMutexDestroy taosThreadMutexDestroy -#define tdbMutexLock taosThreadMutexLock -#define tdbMutexUnlock taosThreadMutexUnlock - -#else - /* spin lock */ typedef pthread_spinlock_t tdb_spinlock_t;