This commit is contained in:
Minghao Li 2022-03-02 15:20:49 +08:00
parent 5a4fbcf262
commit 3e591a022c
6 changed files with 20 additions and 22 deletions

View File

@ -31,11 +31,11 @@ extern "C" {
typedef struct SSyncIO { typedef struct SSyncIO {
STaosQueue *pMsgQ; STaosQueue *pMsgQ;
STaosQset *pQset; STaosQset * pQset;
pthread_t consumerTid; pthread_t consumerTid;
void *serverRpc; void * serverRpc;
void *clientRpc; void * clientRpc;
SEpSet myAddr; SEpSet myAddr;
void *ioTimerTickQ; void *ioTimerTickQ;

View File

@ -188,7 +188,7 @@ static void *syncIOConsumerFunc(void *param) {
SSyncIO *io = param; SSyncIO *io = param;
STaosQall *qall; STaosQall *qall;
SRpcMsg *pRpcMsg, rpcMsg; SRpcMsg * pRpcMsg, rpcMsg;
int type; int type;
qall = taosAllocateQall(); qall = taosAllocateQall();

View File

@ -2,8 +2,8 @@ add_executable(syncTest "")
add_executable(syncEnvTest "") add_executable(syncEnvTest "")
add_executable(syncPingTest "") add_executable(syncPingTest "")
add_executable(syncEncodeTest "") add_executable(syncEncodeTest "")
add_executable(syncIOTickQ "") add_executable(syncIOTickQTest "")
add_executable(syncIOTickPing "") add_executable(syncIOTickPingTest "")
target_sources(syncTest target_sources(syncTest
@ -22,13 +22,13 @@ target_sources(syncEncodeTest
PRIVATE PRIVATE
"syncEncodeTest.cpp" "syncEncodeTest.cpp"
) )
target_sources(syncIOTickQ target_sources(syncIOTickQTest
PRIVATE PRIVATE
"syncIOTickQ.cpp" "syncIOTickQTest.cpp"
) )
target_sources(syncIOTickPing target_sources(syncIOTickPingTest
PRIVATE PRIVATE
"syncIOTickPing.cpp" "syncIOTickPingTest.cpp"
) )
@ -52,12 +52,12 @@ target_include_directories(syncEncodeTest
"${CMAKE_SOURCE_DIR}/include/libs/sync" "${CMAKE_SOURCE_DIR}/include/libs/sync"
"${CMAKE_CURRENT_SOURCE_DIR}/../inc" "${CMAKE_CURRENT_SOURCE_DIR}/../inc"
) )
target_include_directories(syncIOTickQ target_include_directories(syncIOTickQTest
PUBLIC PUBLIC
"${CMAKE_SOURCE_DIR}/include/libs/sync" "${CMAKE_SOURCE_DIR}/include/libs/sync"
"${CMAKE_CURRENT_SOURCE_DIR}/../inc" "${CMAKE_CURRENT_SOURCE_DIR}/../inc"
) )
target_include_directories(syncIOTickPing target_include_directories(syncIOTickPingTest
PUBLIC PUBLIC
"${CMAKE_SOURCE_DIR}/include/libs/sync" "${CMAKE_SOURCE_DIR}/include/libs/sync"
"${CMAKE_CURRENT_SOURCE_DIR}/../inc" "${CMAKE_CURRENT_SOURCE_DIR}/../inc"
@ -80,11 +80,11 @@ target_link_libraries(syncEncodeTest
sync sync
gtest_main gtest_main
) )
target_link_libraries(syncIOTickQ target_link_libraries(syncIOTickQTest
sync sync
gtest_main gtest_main
) )
target_link_libraries(syncIOTickPing target_link_libraries(syncIOTickPingTest
sync sync
gtest_main gtest_main
) )

View File

@ -63,7 +63,6 @@ int main() {
ret = syncEnvStart(); ret = syncEnvStart();
assert(ret == 0); assert(ret == 0);
/*
SSyncNode* pSyncNode = doSync(); SSyncNode* pSyncNode = doSync();
ret = syncNodeStartPingTimer(pSyncNode); ret = syncNodeStartPingTimer(pSyncNode);
@ -73,7 +72,6 @@ int main() {
ret = syncNodeStopPingTimer(pSyncNode); ret = syncNodeStopPingTimer(pSyncNode);
assert(ret == 0); assert(ret == 0);
*/
while (1) { while (1) {
taosMsleep(1000); taosMsleep(1000);