Skip to content

Commit

Permalink
Merge pull request #6672 from gwen2018/fix-rs5-7999
Browse files Browse the repository at this point in the history
temporary fix invoke_and_wait - revert back wait_for to sleep equivalent
  • Loading branch information
ev-mp committed Jun 23, 2020
2 parents 76fe540 + 0119aa8 commit c1e6515
Showing 1 changed file with 2 additions and 2 deletions.
4 changes: 2 additions & 2 deletions src/concurrency.h
Original file line number Diff line number Diff line change
Expand Up @@ -273,7 +273,7 @@ class dispatcher

//wait
std::unique_lock<std::mutex> lk(_blocking_invoke_mutex);
_blocking_invoke_cv.wait(lk, [&](){ return done || exit_condition(); });
while(_blocking_invoke_cv.wait_for(lk, std::chrono::milliseconds(10), [&](){ return !done && !exit_condition(); }));
}

void start()
Expand Down Expand Up @@ -443,4 +443,4 @@ class watchdog
bool _blocker = true;
std::function<void()> _operation;
std::shared_ptr<active_object<>> _watcher;
};
};

0 comments on commit c1e6515

Please sign in to comment.