Added timeout to ConditionVariableNotifier::waitForNotification() function

This commit is contained in:
Nav
2022-04-15 23:30:57 +01:00
parent bd6a5d5051
commit a8c78dc86a
2 changed files with 14 additions and 5 deletions

View File

@@ -8,11 +8,18 @@ namespace Bloom
this->conditionalVariable.notify_all();
}
void ConditionVariableNotifier::waitForNotification() {
auto lock = std::unique_lock(this->mutex);
this->conditionalVariable.wait(lock, [this] {
void ConditionVariableNotifier::waitForNotification(std::optional<std::chrono::milliseconds> timeout) {
const auto predicate = [this] {
return this->notified;
});
};
auto lock = std::unique_lock(this->mutex);
if (timeout.has_value()) {
this->conditionalVariable.wait_for(lock, timeout.value(), predicate);
} else {
this->conditionalVariable.wait(lock, predicate);
}
this->notified = false;
}

View File

@@ -2,6 +2,8 @@
#include <mutex>
#include <condition_variable>
#include <chrono>
#include <optional>
#include "NotifierInterface.hpp"
@@ -34,7 +36,7 @@ namespace Bloom
/**
* Blocks until the contained std::conditional_variable is notified.
*/
void waitForNotification();
void waitForNotification(std::optional<std::chrono::milliseconds> timeout = std::nullopt);
private:
std::mutex mutex;