diff --git a/source/dnode/mgmt/mgmt_bnode/src/bmInt.c b/source/dnode/mgmt/mgmt_bnode/src/bmInt.c index 2920d12eb4..fe66e25ec9 100644 --- a/source/dnode/mgmt/mgmt_bnode/src/bmInt.c +++ b/source/dnode/mgmt/mgmt_bnode/src/bmInt.c @@ -73,7 +73,7 @@ int32_t bmOpen(SMgmtWrapper *pWrapper) { return 0; } -void bmSetMgmtFp(SMgmtWrapper *pWrapper) { +void bmInitWrapper(SMgmtWrapper *pWrapper) { SMgmtFp mgmtFp = {0}; mgmtFp.openFp = bmOpen; mgmtFp.closeFp = bmClose; diff --git a/source/dnode/mgmt/mgmt_mnode/src/mmInt.c b/source/dnode/mgmt/mgmt_mnode/src/mmInt.c index 0bf846b7fc..0f9158971b 100644 --- a/source/dnode/mgmt/mgmt_mnode/src/mmInt.c +++ b/source/dnode/mgmt/mgmt_mnode/src/mmInt.c @@ -209,7 +209,7 @@ static void mmStop(SMgmtWrapper *pWrapper) { } } -void mmSetMgmtFp(SMgmtWrapper *pWrapper) { +void mmInitWrapper(SMgmtWrapper *pWrapper) { SMgmtFp mgmtFp = {0}; mgmtFp.openFp = mmOpen; mgmtFp.closeFp = mmClose; diff --git a/source/dnode/mgmt/mgmt_qnode/src/qmInt.c b/source/dnode/mgmt/mgmt_qnode/src/qmInt.c index d03f001a8d..6837acccd2 100644 --- a/source/dnode/mgmt/mgmt_qnode/src/qmInt.c +++ b/source/dnode/mgmt/mgmt_qnode/src/qmInt.c @@ -77,7 +77,7 @@ static int32_t qmOpen(SMgmtWrapper *pWrapper) { return 0; } -void qmSetMgmtFp(SMgmtWrapper *pWrapper) { +void qmInitWrapper(SMgmtWrapper *pWrapper) { SMgmtFp mgmtFp = {0}; mgmtFp.openFp = qmOpen; mgmtFp.closeFp = qmClose; diff --git a/source/dnode/mgmt/mgmt_snode/src/smInt.c b/source/dnode/mgmt/mgmt_snode/src/smInt.c index 26300a9fe3..a3216ae373 100644 --- a/source/dnode/mgmt/mgmt_snode/src/smInt.c +++ b/source/dnode/mgmt/mgmt_snode/src/smInt.c @@ -79,7 +79,7 @@ int32_t smOpen(SMgmtWrapper *pWrapper) { return 0; } -void smSetMgmtFp(SMgmtWrapper *pWrapper) { +void smInitWrapper(SMgmtWrapper *pWrapper) { SMgmtFp mgmtFp = {0}; mgmtFp.openFp = smOpen; mgmtFp.closeFp = smClose; diff --git a/source/dnode/mgmt/mgmt_vnode/src/vmInt.c b/source/dnode/mgmt/mgmt_vnode/src/vmInt.c index af439fcc03..b0e0d79bde 100644 --- a/source/dnode/mgmt/mgmt_vnode/src/vmInt.c +++ b/source/dnode/mgmt/mgmt_vnode/src/vmInt.c @@ -371,7 +371,7 @@ static void vmStop(SMgmtWrapper *pWrapper) { // process inside the vnode } -void vmSetMgmtFp(SMgmtWrapper *pWrapper) { +void vmInitWrapper(SMgmtWrapper *pWrapper) { SMgmtFp mgmtFp = {0}; mgmtFp.openFp = vmInit; mgmtFp.closeFp = vmCleanup; diff --git a/source/dnode/mgmt/node_common/inc/dmDef.h b/source/dnode/mgmt/node_common/inc/dmDef.h index 5a0da2cf09..f91c582fa9 100644 --- a/source/dnode/mgmt/node_common/inc/dmDef.h +++ b/source/dnode/mgmt/node_common/inc/dmDef.h @@ -80,13 +80,13 @@ typedef enum { } EDndProcType; typedef int32_t (*NodeMsgFp)(struct SMgmtWrapper *pWrapper, SNodeMsg *pMsg); -typedef int32_t (*OpenNodeFp)(struct SMgmtWrapper *pWrapper); -typedef void (*CloseNodeFp)(struct SMgmtWrapper *pWrapper); -typedef int32_t (*StartNodeFp)(struct SMgmtWrapper *pWrapper); -typedef void (*StopNodeFp)(struct SMgmtWrapper *pWrapper); -typedef int32_t (*CreateNodeFp)(struct SMgmtWrapper *pWrapper, SNodeMsg *pMsg); -typedef int32_t (*DropNodeFp)(struct SMgmtWrapper *pWrapper, SNodeMsg *pMsg); -typedef int32_t (*RequireNodeFp)(struct SMgmtWrapper *pWrapper, bool *required); +typedef int32_t (*NodeOpenFp)(struct SMgmtWrapper *pWrapper); +typedef void (*NodeCloseFp)(struct SMgmtWrapper *pWrapper); +typedef int32_t (*NodeStartFp)(struct SMgmtWrapper *pWrapper); +typedef void (*NodeStopFp)(struct SMgmtWrapper *pWrapper); +typedef int32_t (*NodeCreateFp)(struct SMgmtWrapper *pWrapper, SNodeMsg *pMsg); +typedef int32_t (*NodeDropFp)(struct SMgmtWrapper *pWrapper, SNodeMsg *pMsg); +typedef int32_t (*NodeRequireFp)(struct SMgmtWrapper *pWrapper, bool *required); typedef struct { EDndNodeType defaultNtype; @@ -94,13 +94,13 @@ typedef struct { } SMsgHandle; typedef struct { - OpenNodeFp openFp; - CloseNodeFp closeFp; - StartNodeFp startFp; - StopNodeFp stopFp; - CreateNodeFp createFp; - DropNodeFp dropFp; - RequireNodeFp requiredFp; + NodeOpenFp openFp; + NodeCloseFp closeFp; + NodeStartFp startFp; + NodeStopFp stopFp; + NodeCreateFp createFp; + NodeDropFp dropFp; + NodeRequireFp requiredFp; } SMgmtFp; typedef struct SMgmtWrapper { diff --git a/source/dnode/mgmt/node_mgmt/inc/dmImp.h b/source/dnode/mgmt/node_mgmt/inc/dmImp.h index 8a1a116ab3..de2c156bd6 100644 --- a/source/dnode/mgmt/node_mgmt/inc/dmImp.h +++ b/source/dnode/mgmt/node_mgmt/inc/dmImp.h @@ -65,12 +65,12 @@ int32_t dmProcessMgmtMsg(SMgmtWrapper *pWrapper, SNodeMsg *pMsg); int32_t dmProcessStatusMsg(SMgmtWrapper *pWrapper, SNodeMsg *pMsg); // mgmt nodes -void dmSetMgmtFp(SMgmtWrapper *pWrapper); -void bmSetMgmtFp(SMgmtWrapper *pWrapper); -void qmSetMgmtFp(SMgmtWrapper *pWrapper); -void smSetMgmtFp(SMgmtWrapper *pWrapper); -void vmSetMgmtFp(SMgmtWrapper *pWrapper); -void mmSetMgmtFp(SMgmtWrapper *pWrapper); +void dmInitWrapper(SMgmtWrapper *pWrapper); +void bmInitWrapper(SMgmtWrapper *pWrapper); +void qmInitWrapper(SMgmtWrapper *pWrapper); +void smInitWrapper(SMgmtWrapper *pWrapper); +void vmInitWrapper(SMgmtWrapper *pWrapper); +void mmInitWrapper(SMgmtWrapper *pWrapper); void vmGetVnodeLoads(SMgmtWrapper *pWrapper, SMonVloadInfo *pInfo); void mmGetMnodeLoads(SMgmtWrapper *pWrapper, SMonMloadInfo *pInfo); diff --git a/source/dnode/mgmt/node_mgmt/src/dmHandle.c b/source/dnode/mgmt/node_mgmt/src/dmHandle.c index 7e28b1b038..308c9a1e68 100644 --- a/source/dnode/mgmt/node_mgmt/src/dmHandle.c +++ b/source/dnode/mgmt/node_mgmt/src/dmHandle.c @@ -295,7 +295,7 @@ static int32_t dmRequireMgmt(SMgmtWrapper *pWrapper, bool *required) { return 0; } -void dmSetMgmtFp(SMgmtWrapper *pWrapper) { +void dmInitWrapper(SMgmtWrapper *pWrapper) { SMgmtFp mgmtFp = {0}; mgmtFp.openFp = dmInitMgmt; mgmtFp.closeFp = dmCleanupMgmt; diff --git a/source/dnode/mgmt/node_mgmt/src/dmObj.c b/source/dnode/mgmt/node_mgmt/src/dmObj.c index 4578c9add0..16fafe0178 100644 --- a/source/dnode/mgmt/node_mgmt/src/dmObj.c +++ b/source/dnode/mgmt/node_mgmt/src/dmObj.c @@ -91,12 +91,12 @@ SDnode *dmCreate(const SDnodeOpt *pOption) { } dmSetStatus(pDnode, DND_STAT_INIT); - dmSetMgmtFp(&pDnode->wrappers[DNODE]); - mmSetMgmtFp(&pDnode->wrappers[MNODE]); - vmSetMgmtFp(&pDnode->wrappers[VNODE]); - qmSetMgmtFp(&pDnode->wrappers[QNODE]); - smSetMgmtFp(&pDnode->wrappers[SNODE]); - bmSetMgmtFp(&pDnode->wrappers[BNODE]); + dmInitWrapper(&pDnode->wrappers[DNODE]); + mmInitWrapper(&pDnode->wrappers[MNODE]); + vmInitWrapper(&pDnode->wrappers[VNODE]); + qmInitWrapper(&pDnode->wrappers[QNODE]); + smInitWrapper(&pDnode->wrappers[SNODE]); + bmInitWrapper(&pDnode->wrappers[BNODE]); for (EDndNodeType ntype = DNODE; ntype < NODE_END; ++ntype) { SMgmtWrapper *pWrapper = &pDnode->wrappers[ntype];