diff --git a/include/libs/sync/sync.h b/include/libs/sync/sync.h index 3d875a4be8..0ec741ec3e 100644 --- a/include/libs/sync/sync.h +++ b/include/libs/sync/sync.h @@ -153,8 +153,6 @@ int32_t syncForwardToPeer(int64_t rid, const SSyncBuffer* pBuf, bool isWeak); ESyncState syncGetMyRole(int64_t rid); void syncGetNodesRole(int64_t rid, SNodesRole* pNodeRole); -int32_t syncStartEnv(); - extern int32_t sDebugFlag; #ifdef __cplusplus diff --git a/source/libs/sync/inc/syncEnv.h b/source/libs/sync/inc/syncEnv.h index a6ab03e1ee..f1c4327b69 100644 --- a/source/libs/sync/inc/syncEnv.h +++ b/source/libs/sync/inc/syncEnv.h @@ -23,9 +23,23 @@ extern "C" { #include #include #include +#include "syncInt.h" #include "taosdef.h" #include "trpc.h" +typedef struct SSyncEnv { + void *pTimer; + void *pTimerManager; +} SSyncEnv; + +int32_t syncEnvStart(); + +int32_t syncEnvStop(); + +static int32_t doSyncEnvStart(SSyncEnv *pSyncEnv); + +static int32_t doSyncEnvStop(SSyncEnv *pSyncEnv); + #ifdef __cplusplus } #endif diff --git a/source/libs/sync/src/syncEnv.c b/source/libs/sync/src/syncEnv.c index a11ed86dc0..b314e89b44 100644 --- a/source/libs/sync/src/syncEnv.c +++ b/source/libs/sync/src/syncEnv.c @@ -14,13 +14,25 @@ */ #include "syncEnv.h" +#include #include "sync.h" #include "syncInt.h" -int32_t syncStartEnv() { - sInfo("log: syncStartEnv \n"); +SSyncEnv *gSyncEnv = NULL; - if (rpcInit() != 0) { - return -1; - } -} \ No newline at end of file +int32_t syncEnvStart() { + int32_t ret; + gSyncEnv = (SSyncEnv *)malloc(sizeof(SSyncEnv)); + assert(gSyncEnv != NULL); + ret = doSyncEnvStart(gSyncEnv); + return ret; +} + +int32_t syncEnvStop() { + int32_t ret = doSyncEnvStop(gSyncEnv); + return ret; +} + +static int32_t doSyncEnvStart(SSyncEnv *pSyncEnv) { return 0; } + +static int32_t doSyncEnvStop(SSyncEnv *pSyncEnv) { return 0; } diff --git a/source/libs/sync/src/syncMain.c b/source/libs/sync/src/syncMain.c index fbb969eb1c..9b5a7a0a38 100644 --- a/source/libs/sync/src/syncMain.c +++ b/source/libs/sync/src/syncMain.c @@ -15,9 +15,13 @@ #include #include "sync.h" +#include "syncEnv.h" #include "syncInt.h" -int32_t syncInit() { return 0; } +int32_t syncInit() { + int32_t ret = syncEnvStart(); + return ret; +} void syncCleanUp() {} diff --git a/source/libs/sync/test/syncTest.cpp b/source/libs/sync/test/syncTest.cpp index 6930faa5b9..f247be2711 100644 --- a/source/libs/sync/test/syncTest.cpp +++ b/source/libs/sync/test/syncTest.cpp @@ -30,13 +30,11 @@ int main() { raftStorePersist(pRaftStore); - - tsAsyncLog = 0; taosInitLog((char *)"syncTest.log", 100000, 10); sDebug("sync test"); - syncStartEnv(); + SSyncIO *syncIO = syncIOCreate(); assert(syncIO != NULL);