Skip to content

libutil: Template SyncBase over condition_variable implementation #15371

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

Merged
xokdvium merged 1 commit into from
Mar 2, 2026
Merged

libutil: Template SyncBase over condition_variable implementation #15371

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
29 changes: 20 additions & 9 deletions src/libutil/include/nix/util/sync.hh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ namespace nix {
* Here, "data" is automatically unlocked when "data_" goes out of
* scope.
*/
template<class T, class M, class WL, class RL>
template<class T, class M, class WL, class RL, class CV>
class SyncBase
{
private:
Expand Down Expand Up @@ -76,29 +76,35 @@ public:

~Lock() {}

void wait(std::condition_variable & cv)
void wait(CV & cv)
{
assert(s);
cv.wait(lk);
}

template<class Predicate>
void wait(CV & cv, Predicate pred)
{
assert(s);
cv.wait(lk, std::move(pred));
}

template<class Rep, class Period>
std::cv_status wait_for(std::condition_variable & cv, const std::chrono::duration<Rep, Period> & duration)
std::cv_status wait_for(CV & cv, const std::chrono::duration<Rep, Period> & duration)
{
assert(s);
return cv.wait_for(lk, duration);
}

template<class Rep, class Period, class Predicate>
bool wait_for(std::condition_variable & cv, const std::chrono::duration<Rep, Period> & duration, Predicate pred)
bool wait_for(CV & cv, const std::chrono::duration<Rep, Period> & duration, Predicate pred)
{
assert(s);
return cv.wait_for(lk, duration, pred);
}

template<class Clock, class Duration>
std::cv_status
wait_until(std::condition_variable & cv, const std::chrono::time_point<Clock, Duration> & duration)
std::cv_status wait_until(CV & cv, const std::chrono::time_point<Clock, Duration> & duration)
{
assert(s);
return cv.wait_until(lk, duration);
Expand Down Expand Up @@ -154,10 +160,15 @@ public:
};

template<class T>
using Sync = SyncBase<T, std::mutex, std::unique_lock<std::mutex>, std::unique_lock<std::mutex>>;
using Sync =
SyncBase<T, std::mutex, std::unique_lock<std::mutex>, std::unique_lock<std::mutex>, std::condition_variable>;

template<class T>
using SharedSync =
SyncBase<T, std::shared_mutex, std::unique_lock<std::shared_mutex>, std::shared_lock<std::shared_mutex>>;
using SharedSync = SyncBase<
T,
std::shared_mutex,
std::unique_lock<std::shared_mutex>,
std::shared_lock<std::shared_mutex>,
std::condition_variable>;

} // namespace nix
Loading