Skip to content

Use condition_variable for interruptible thread sleep in updateLoop #147

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
jslauthor wants to merge 3 commits into from
Closed

Use condition_variable for interruptible thread sleep in updateLoop #147

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
9b47134
Merge pull request #141 from Countly/staging
turtledreams Oct 8, 2025
16fbe18
Merge pull request #144 from Countly/staging
turtledreams Nov 4, 2025
bf6edf8
Use condition_variable for interruptible thread sleep
jslauthor Mar 17, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions include/countly.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@
#include "countly/countly_configuration.hpp"

#include <chrono>
#include <condition_variable>
#include <functional>
#include <iterator>
#include <map>
Expand Down Expand Up @@ -349,6 +350,7 @@ class Countly : public cly::CountlyDelegates {
bool enable_automatic_session = false;
bool stop_thread = false;
bool running = false;
std::condition_variable stop_cv; // Wakes updateLoop immediately on stop
size_t wait_milliseconds = COUNTLY_KEEPALIVE_INTERVAL;

size_t max_events = COUNTLY_MAX_EVENTS_DEFAULT;
Expand Down
19 changes: 11 additions & 8 deletions src/countly.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -479,6 +479,7 @@ void Countly::_deleteThread() {
mutex->lock();
stop_thread = true;
mutex->unlock();
stop_cv.notify_one();
if (thread && thread->joinable()) {
try {
thread->join();
Expand Down Expand Up @@ -1193,15 +1194,17 @@ void Countly::updateLoop() {
running = true;
mutex->unlock();
while (true) {
mutex->lock();
if (stop_thread) {
stop_thread = false;
mutex->unlock();
break;
{
std::unique_lock<std::mutex> lk(*mutex);
stop_cv.wait_for(lk, std::chrono::milliseconds(wait_milliseconds), [this] {
return stop_thread;
});
if (stop_thread) {
stop_thread = false;
running = false;
return;
}
}
size_t last_wait_milliseconds = wait_milliseconds;
mutex->unlock();
std::this_thread::sleep_for(std::chrono::milliseconds(last_wait_milliseconds));
if (enable_automatic_session == true && configuration->manualSessionControl == false) {
updateSession();
} else if (configuration->manualSessionControl == true) {
Expand Down
Loading