fix: add check future object valid before wait on it

alibaba · Dec 23, 2024 · 77c2fb4 · 77c2fb4
1 parent f0ec524
commit 77c2fb4
Show file tree

Hide file tree

Showing 4 changed files with 12 additions and 3 deletions.
diff --git a/core/common/http/AsynCurlRunner.cpp b/core/common/http/AsynCurlRunner.cpp
@@ -39,6 +39,9 @@ bool AsynCurlRunner::Init() {
 void AsynCurlRunner::Stop() {
     mIsFlush = true;
     future_status s = mThreadRes.wait_for(chrono::seconds(1));
+    if (!mThreadRes.valid()) {
+        return;
+    }
     if (s == future_status::ready) {
         LOG_INFO(sLogger, ("async curl runner", "stopped successfully"));
     } else {

diff --git a/core/common/timer/Timer.cpp b/core/common/timer/Timer.cpp
@@ -34,6 +34,9 @@ void Timer::Stop() {
         mIsThreadRunning = false;
     }
     mCV.notify_one();
+    if (!mThreadRes.valid()) {
+        return;
+    }
     future_status s = mThreadRes.wait_for(chrono::seconds(1));
     if (s == future_status::ready) {
         LOG_INFO(sLogger, ("timer", "stopped successfully"));

diff --git a/core/monitor/SelfMonitorServer.cpp b/core/monitor/SelfMonitorServer.cpp
@@ -64,6 +64,9 @@ void SelfMonitorServer::Stop() {
         mIsThreadRunning = false;
     }
     mStopCV.notify_one();
+    if (!mThreadRes.valid()) {
+        return;
+    }
     future_status s = mThreadRes.wait_for(chrono::seconds(1));
     if (s == future_status::ready) {
         LOG_INFO(sLogger, ("self-monitor", "stopped successfully"));

diff --git a/core/unittest/polling/CMakeLists.txt b/core/unittest/polling/CMakeLists.txt
@@ -18,8 +18,8 @@ project(polling_unittest)
 # add_executable(polling_unittest PollingUnittest.cpp)
 # target_link_libraries(polling_unittest ${UT_BASE_TARGET})
 
-# add_executable(polling_preserved_dir_depth_unittest PollingPreservedDirDepthUnittest.cpp)
-# target_link_libraries(polling_preserved_dir_depth_unittest ${UT_BASE_TARGET})
+add_executable(polling_preserved_dir_depth_unittest PollingPreservedDirDepthUnittest.cpp)
+target_link_libraries(polling_preserved_dir_depth_unittest ${UT_BASE_TARGET})
 
 include(GoogleTest)
-# gtest_discover_tests(polling_preserved_dir_depth_unittest)
+gtest_discover_tests(polling_preserved_dir_depth_unittest)