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

more

This commit is contained in:
Hongze Cheng 2021-11-12 17:50:46 +08:00
parent 6010516f58
commit baac49c75b
3 changed files with 8 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
include/dnode/vnode/vnode.h
View File

@ -45,7 +45,7 @@ SVnode *vnodeOpen(const char *path, const SVnodeOptions *pVnodeOptions);
/** /**
* @brief Close a VNODE * @brief Close a VNODE
* *
* @param pVnode The vnode object * @param pVnode The vnode object to close
*/ */
void vnodeClose(SVnode *pVnode); void vnodeClose(SVnode *pVnode);

1
include/util/mallocator.h
View File

@ -25,6 +25,7 @@ extern "C" {
typedef struct SMemAllocator SMemAllocator; typedef struct SMemAllocator SMemAllocator;
struct SMemAllocator { struct SMemAllocator {
char name[16];
void *impl; void *impl;
void *(*malloc)(SMemAllocator *, uint64_t size); void *(*malloc)(SMemAllocator *, uint64_t size);
void *(*calloc)(SMemAllocator *, uint64_t nmemb, uint64_t size); void *(*calloc)(SMemAllocator *, uint64_t nmemb, uint64_t size);

7
source/dnode/vnode/impl/src/vnodeMain.c
View File

@ -87,6 +87,11 @@ static void vnodeFree(SVnode *pVnode) {
static int vnodeOpenImpl(SVnode *pVnode) { static int vnodeOpenImpl(SVnode *pVnode) {
char dir[TSDB_FILENAME_LEN]; char dir[TSDB_FILENAME_LEN];
if (vnodeOpenBufPool(pVnode) < 0) {
// TODO: handle error
return -1;
}
// Open meta // Open meta
sprintf(dir, "%s/meta", pVnode->path); sprintf(dir, "%s/meta", pVnode->path);
pVnode->pMeta = metaOpen(dir, &(pVnode->options.metaOptions)); pVnode->pMeta = metaOpen(dir, &(pVnode->options.metaOptions));
@ -111,7 +116,7 @@ static int vnodeOpenImpl(SVnode *pVnode) {
static void vnodeCloseImpl(SVnode *pVnode) { static void vnodeCloseImpl(SVnode *pVnode) {
if (pVnode) { if (pVnode) {
// TODO: Close TQ vnodeCloseBufPool(pVnode);
tsdbClose(pVnode->pTsdb); tsdbClose(pVnode->pTsdb);
metaClose(pVnode->pMeta); metaClose(pVnode->pMeta);
} }