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

refactor: node mgmt

This commit is contained in:
Shengliang 2022-05-10 23:53:42 +08:00
parent 1b15f93b6d
commit fe65524592
9 changed files with 32 additions and 32 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
source/dnode/mgmt/mgmt_bnode/src/bmInt.c
View File

@ -73,7 +73,7 @@ int32_t bmOpen(SMgmtWrapper *pWrapper) {
return 0; return 0;
} }
void bmSetMgmtFp(SMgmtWrapper *pWrapper) { void bmInitWrapper(SMgmtWrapper *pWrapper) {
SMgmtFp mgmtFp = {0}; SMgmtFp mgmtFp = {0};
mgmtFp.openFp = bmOpen; mgmtFp.openFp = bmOpen;
mgmtFp.closeFp = bmClose; mgmtFp.closeFp = bmClose;

2
source/dnode/mgmt/mgmt_mnode/src/mmInt.c
View File

@ -209,7 +209,7 @@ static void mmStop(SMgmtWrapper *pWrapper) {
} }
} }
void mmSetMgmtFp(SMgmtWrapper *pWrapper) { void mmInitWrapper(SMgmtWrapper *pWrapper) {
SMgmtFp mgmtFp = {0}; SMgmtFp mgmtFp = {0};
mgmtFp.openFp = mmOpen; mgmtFp.openFp = mmOpen;
mgmtFp.closeFp = mmClose; mgmtFp.closeFp = mmClose;

2
source/dnode/mgmt/mgmt_qnode/src/qmInt.c
View File

@ -77,7 +77,7 @@ static int32_t qmOpen(SMgmtWrapper *pWrapper) {
return 0; return 0;
} }
void qmSetMgmtFp(SMgmtWrapper *pWrapper) { void qmInitWrapper(SMgmtWrapper *pWrapper) {
SMgmtFp mgmtFp = {0}; SMgmtFp mgmtFp = {0};
mgmtFp.openFp = qmOpen; mgmtFp.openFp = qmOpen;
mgmtFp.closeFp = qmClose; mgmtFp.closeFp = qmClose;

2
source/dnode/mgmt/mgmt_snode/src/smInt.c
View File

@ -79,7 +79,7 @@ int32_t smOpen(SMgmtWrapper *pWrapper) {
return 0; return 0;
} }
void smSetMgmtFp(SMgmtWrapper *pWrapper) { void smInitWrapper(SMgmtWrapper *pWrapper) {
SMgmtFp mgmtFp = {0}; SMgmtFp mgmtFp = {0};
mgmtFp.openFp = smOpen; mgmtFp.openFp = smOpen;
mgmtFp.closeFp = smClose; mgmtFp.closeFp = smClose;

2
source/dnode/mgmt/mgmt_vnode/src/vmInt.c
View File

@ -371,7 +371,7 @@ static void vmStop(SMgmtWrapper *pWrapper) {
// process inside the vnode // process inside the vnode
} }
void vmSetMgmtFp(SMgmtWrapper *pWrapper) { void vmInitWrapper(SMgmtWrapper *pWrapper) {
SMgmtFp mgmtFp = {0}; SMgmtFp mgmtFp = {0};
mgmtFp.openFp = vmInit; mgmtFp.openFp = vmInit;
mgmtFp.closeFp = vmCleanup; mgmtFp.closeFp = vmCleanup;

28
source/dnode/mgmt/node_common/inc/dmDef.h
View File

@ -80,13 +80,13 @@ typedef enum {
} EDndProcType; } EDndProcType;
typedef int32_t (*NodeMsgFp)(struct SMgmtWrapper *pWrapper, SNodeMsg *pMsg); typedef int32_t (*NodeMsgFp)(struct SMgmtWrapper *pWrapper, SNodeMsg *pMsg);
typedef int32_t (*OpenNodeFp)(struct SMgmtWrapper *pWrapper); typedef int32_t (*NodeOpenFp)(struct SMgmtWrapper *pWrapper);
typedef void (*CloseNodeFp)(struct SMgmtWrapper *pWrapper); typedef void (*NodeCloseFp)(struct SMgmtWrapper *pWrapper);
typedef int32_t (*StartNodeFp)(struct SMgmtWrapper *pWrapper); typedef int32_t (*NodeStartFp)(struct SMgmtWrapper *pWrapper);
typedef void (*StopNodeFp)(struct SMgmtWrapper *pWrapper); typedef void (*NodeStopFp)(struct SMgmtWrapper *pWrapper);
typedef int32_t (*CreateNodeFp)(struct SMgmtWrapper *pWrapper, SNodeMsg *pMsg); typedef int32_t (*NodeCreateFp)(struct SMgmtWrapper *pWrapper, SNodeMsg *pMsg);
typedef int32_t (*DropNodeFp)(struct SMgmtWrapper *pWrapper, SNodeMsg *pMsg); typedef int32_t (*NodeDropFp)(struct SMgmtWrapper *pWrapper, SNodeMsg *pMsg);
typedef int32_t (*RequireNodeFp)(struct SMgmtWrapper *pWrapper, bool *required); typedef int32_t (*NodeRequireFp)(struct SMgmtWrapper *pWrapper, bool *required);
typedef struct { typedef struct {
EDndNodeType defaultNtype; EDndNodeType defaultNtype;
@ -94,13 +94,13 @@ typedef struct {
} SMsgHandle; } SMsgHandle;
typedef struct { typedef struct {
OpenNodeFp openFp; NodeOpenFp openFp;
CloseNodeFp closeFp; NodeCloseFp closeFp;
StartNodeFp startFp; NodeStartFp startFp;
StopNodeFp stopFp; NodeStopFp stopFp;
CreateNodeFp createFp; NodeCreateFp createFp;
DropNodeFp dropFp; NodeDropFp dropFp;
RequireNodeFp requiredFp; NodeRequireFp requiredFp;
} SMgmtFp; } SMgmtFp;
typedef struct SMgmtWrapper { typedef struct SMgmtWrapper {

12
source/dnode/mgmt/node_mgmt/inc/dmImp.h
View File

@ -65,12 +65,12 @@ int32_t dmProcessMgmtMsg(SMgmtWrapper *pWrapper, SNodeMsg *pMsg);
int32_t dmProcessStatusMsg(SMgmtWrapper *pWrapper, SNodeMsg *pMsg); int32_t dmProcessStatusMsg(SMgmtWrapper *pWrapper, SNodeMsg *pMsg);
// mgmt nodes // mgmt nodes
void dmSetMgmtFp(SMgmtWrapper *pWrapper); void dmInitWrapper(SMgmtWrapper *pWrapper);
void bmSetMgmtFp(SMgmtWrapper *pWrapper); void bmInitWrapper(SMgmtWrapper *pWrapper);
void qmSetMgmtFp(SMgmtWrapper *pWrapper); void qmInitWrapper(SMgmtWrapper *pWrapper);
void smSetMgmtFp(SMgmtWrapper *pWrapper); void smInitWrapper(SMgmtWrapper *pWrapper);
void vmSetMgmtFp(SMgmtWrapper *pWrapper); void vmInitWrapper(SMgmtWrapper *pWrapper);
void mmSetMgmtFp(SMgmtWrapper *pWrapper); void mmInitWrapper(SMgmtWrapper *pWrapper);
void vmGetVnodeLoads(SMgmtWrapper *pWrapper, SMonVloadInfo *pInfo); void vmGetVnodeLoads(SMgmtWrapper *pWrapper, SMonVloadInfo *pInfo);
void mmGetMnodeLoads(SMgmtWrapper *pWrapper, SMonMloadInfo *pInfo); void mmGetMnodeLoads(SMgmtWrapper *pWrapper, SMonMloadInfo *pInfo);

2
source/dnode/mgmt/node_mgmt/src/dmHandle.c
View File

@ -295,7 +295,7 @@ static int32_t dmRequireMgmt(SMgmtWrapper *pWrapper, bool *required) {
return 0; return 0;
} }
void dmSetMgmtFp(SMgmtWrapper *pWrapper) { void dmInitWrapper(SMgmtWrapper *pWrapper) {
SMgmtFp mgmtFp = {0}; SMgmtFp mgmtFp = {0};
mgmtFp.openFp = dmInitMgmt; mgmtFp.openFp = dmInitMgmt;
mgmtFp.closeFp = dmCleanupMgmt; mgmtFp.closeFp = dmCleanupMgmt;

12
source/dnode/mgmt/node_mgmt/src/dmObj.c
View File

@ -91,12 +91,12 @@ SDnode *dmCreate(const SDnodeOpt *pOption) {
} }
dmSetStatus(pDnode, DND_STAT_INIT); dmSetStatus(pDnode, DND_STAT_INIT);
dmSetMgmtFp(&pDnode->wrappers[DNODE]); dmInitWrapper(&pDnode->wrappers[DNODE]);
mmSetMgmtFp(&pDnode->wrappers[MNODE]); mmInitWrapper(&pDnode->wrappers[MNODE]);
vmSetMgmtFp(&pDnode->wrappers[VNODE]); vmInitWrapper(&pDnode->wrappers[VNODE]);
qmSetMgmtFp(&pDnode->wrappers[QNODE]); qmInitWrapper(&pDnode->wrappers[QNODE]);
smSetMgmtFp(&pDnode->wrappers[SNODE]); smInitWrapper(&pDnode->wrappers[SNODE]);
bmSetMgmtFp(&pDnode->wrappers[BNODE]); bmInitWrapper(&pDnode->wrappers[BNODE]);
for (EDndNodeType ntype = DNODE; ntype < NODE_END; ++ntype) { for (EDndNodeType ntype = DNODE; ntype < NODE_END; ++ntype) {
SMgmtWrapper *pWrapper = &pDnode->wrappers[ntype]; SMgmtWrapper *pWrapper = &pDnode->wrappers[ntype];