From 3e591a022ce0775565642a855f7fcaf8874b1d53 Mon Sep 17 00:00:00 2001 From: Minghao Li Date: Wed, 2 Mar 2022 15:20:49 +0800 Subject: [PATCH] sync io --- source/libs/sync/inc/syncIO.h | 6 +++--- source/libs/sync/src/syncIO.c | 2 +- source/libs/sync/test/CMakeLists.txt | 20 +++++++++---------- ...cIOTickPing.cpp => syncIOTickPingTest.cpp} | 0 .../{syncIOTickQ.cpp => syncIOTickQTest.cpp} | 0 source/libs/sync/test/syncPingTest.cpp | 14 ++++++------- 6 files changed, 20 insertions(+), 22 deletions(-) rename source/libs/sync/test/{syncIOTickPing.cpp => syncIOTickPingTest.cpp} (100%) rename source/libs/sync/test/{syncIOTickQ.cpp => syncIOTickQTest.cpp} (100%) diff --git a/source/libs/sync/inc/syncIO.h b/source/libs/sync/inc/syncIO.h index e5c55baff4..238948b403 100644 --- a/source/libs/sync/inc/syncIO.h +++ b/source/libs/sync/inc/syncIO.h @@ -31,11 +31,11 @@ extern "C" { typedef struct SSyncIO { STaosQueue *pMsgQ; - STaosQset *pQset; + STaosQset * pQset; pthread_t consumerTid; - void *serverRpc; - void *clientRpc; + void * serverRpc; + void * clientRpc; SEpSet myAddr; void *ioTimerTickQ; diff --git a/source/libs/sync/src/syncIO.c b/source/libs/sync/src/syncIO.c index 932c27d64a..bb71b1e73d 100644 --- a/source/libs/sync/src/syncIO.c +++ b/source/libs/sync/src/syncIO.c @@ -188,7 +188,7 @@ static void *syncIOConsumerFunc(void *param) { SSyncIO *io = param; STaosQall *qall; - SRpcMsg *pRpcMsg, rpcMsg; + SRpcMsg * pRpcMsg, rpcMsg; int type; qall = taosAllocateQall(); diff --git a/source/libs/sync/test/CMakeLists.txt b/source/libs/sync/test/CMakeLists.txt index 9abe3f232e..c089987c19 100644 --- a/source/libs/sync/test/CMakeLists.txt +++ b/source/libs/sync/test/CMakeLists.txt @@ -2,8 +2,8 @@ add_executable(syncTest "") add_executable(syncEnvTest "") add_executable(syncPingTest "") add_executable(syncEncodeTest "") -add_executable(syncIOTickQ "") -add_executable(syncIOTickPing "") +add_executable(syncIOTickQTest "") +add_executable(syncIOTickPingTest "") target_sources(syncTest @@ -22,13 +22,13 @@ target_sources(syncEncodeTest PRIVATE "syncEncodeTest.cpp" ) -target_sources(syncIOTickQ +target_sources(syncIOTickQTest PRIVATE - "syncIOTickQ.cpp" + "syncIOTickQTest.cpp" ) -target_sources(syncIOTickPing +target_sources(syncIOTickPingTest PRIVATE - "syncIOTickPing.cpp" + "syncIOTickPingTest.cpp" ) @@ -52,12 +52,12 @@ target_include_directories(syncEncodeTest "${CMAKE_SOURCE_DIR}/include/libs/sync" "${CMAKE_CURRENT_SOURCE_DIR}/../inc" ) -target_include_directories(syncIOTickQ +target_include_directories(syncIOTickQTest PUBLIC "${CMAKE_SOURCE_DIR}/include/libs/sync" "${CMAKE_CURRENT_SOURCE_DIR}/../inc" ) -target_include_directories(syncIOTickPing +target_include_directories(syncIOTickPingTest PUBLIC "${CMAKE_SOURCE_DIR}/include/libs/sync" "${CMAKE_CURRENT_SOURCE_DIR}/../inc" @@ -80,11 +80,11 @@ target_link_libraries(syncEncodeTest sync gtest_main ) -target_link_libraries(syncIOTickQ +target_link_libraries(syncIOTickQTest sync gtest_main ) -target_link_libraries(syncIOTickPing +target_link_libraries(syncIOTickPingTest sync gtest_main ) diff --git a/source/libs/sync/test/syncIOTickPing.cpp b/source/libs/sync/test/syncIOTickPingTest.cpp similarity index 100% rename from source/libs/sync/test/syncIOTickPing.cpp rename to source/libs/sync/test/syncIOTickPingTest.cpp diff --git a/source/libs/sync/test/syncIOTickQ.cpp b/source/libs/sync/test/syncIOTickQTest.cpp similarity index 100% rename from source/libs/sync/test/syncIOTickQ.cpp rename to source/libs/sync/test/syncIOTickQTest.cpp diff --git a/source/libs/sync/test/syncPingTest.cpp b/source/libs/sync/test/syncPingTest.cpp index bca634765e..b80b0f2e20 100644 --- a/source/libs/sync/test/syncPingTest.cpp +++ b/source/libs/sync/test/syncPingTest.cpp @@ -63,17 +63,15 @@ int main() { ret = syncEnvStart(); assert(ret == 0); - /* - SSyncNode* pSyncNode = doSync(); + SSyncNode* pSyncNode = doSync(); - ret = syncNodeStartPingTimer(pSyncNode); - assert(ret == 0); + ret = syncNodeStartPingTimer(pSyncNode); + assert(ret == 0); - taosMsleep(5000); + taosMsleep(5000); - ret = syncNodeStopPingTimer(pSyncNode); - assert(ret == 0); - */ + ret = syncNodeStopPingTimer(pSyncNode); + assert(ret == 0); while (1) { taosMsleep(1000);