xxq250
/
homework-jianmu
1
0
Fork 0
Code Issues Pull Requests 1 Actions Packages Projects Releases Wiki Activity

refact

This commit is contained in:
Hongze Cheng 2021-11-12 13:29:48 +08:00
parent 2834b3a6ef
commit a37a59e1f1
2 changed files with 17 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

33
include/util/mallocator.h
View File

@ -24,31 +24,20 @@ extern "C" {
typedef struct SMemAllocator SMemAllocator; typedef struct SMemAllocator SMemAllocator;
#define MALLOCATOR_APIS \
void *impl; \
void *(*malloc)(SMemAllocator *, size_t size); \
void *(*calloc)(SMemAllocator *, size_t nmemb, size_t size); \
void *(*realloc)(SMemAllocator *, void *ptr, size_t size); \
void (*free)(SMemAllocator *, void *ptr); \
size_t (*usage)(SMemAllocator *);
struct SMemAllocator { struct SMemAllocator {
MALLOCATOR_APIS void *impl;
void *(*malloc)(SMemAllocator *, uint64_t size);
void *(*calloc)(SMemAllocator *, uint64_t nmemb, uint64_t size);
void *(*realloc)(SMemAllocator *, void *ptr, uint64_t size);
void (*free)(SMemAllocator *, void *ptr);
uint64_t (*usage)(SMemAllocator *);
}; };
// heap allocator typedef struct {
SMemAllocator *tdCreateHeapAllocator(); void *impl;
void tdDestroyHeapAllocator(SMemAllocator *pMemAllocator); SMemAllocator *(*create)();
void (*destroy)(SMemAllocator *);
// arena allocator } SMemAllocatorFactory;
SMemAllocator *tdCreateArenaAllocator(size_t size);
void tdDestroyArenaAllocator(SMemAllocator *);
#define mMalloc(pMemAllocator, size) (*(pMemAllocator->malloc))(pMemAllocator, size)
#define mCalloc(pMemAllocator, nmemb, size) (*(pMemAllocator->calloc))(pMemAllocator, nmemb, size)
#define mRealloc(pMemAllocator, ptr, size) (*(pMemAllocator->realloc))(pMemAllocator, ptr, size)
#define mFree(pMemAllocator, ptr) (*(pMemAllocator->free))(pMemAllocator, ptr)
#define mUsage(pMemAllocator) (*(pMemAllocator->usage))(pMemAllocator)
#ifdef __cplusplus #ifdef __cplusplus
} }

7
source/dnode/vnode/tsdb/inc/tsdbMemTable.h
View File

@ -16,11 +16,16 @@
#ifndef _TD_TSDB_MEM_TABLE_H_ #ifndef _TD_TSDB_MEM_TABLE_H_
#define _TD_TSDB_MEM_TABLE_H_ #define _TD_TSDB_MEM_TABLE_H_
#include "tsdb.h"
#ifdef __cplusplus #ifdef __cplusplus
extern "C" { extern "C" {
#endif #endif
typedef struct SMemTable SMemTable; typedef struct SMemTable {
/* TODO */
SMemAllocator *pma;
} SMemTable;
#ifdef __cplusplus #ifdef __cplusplus
} }