eden-emu/eden
24
3
Fork 15
Code Issues 138 Pull requests 56 Projects 1 Releases Packages Wiki Activity Actions

[common] use libc++ provided jthread instead of in-house one (which deadlocks on FBSD 14) #351

Merged
MaranBr merged 4 commits from liz-use-libcpp-jthread into master 2025-10-01 06:59:36 +02:00
Conversation 11 Commits 4 Files changed 14 +5 -1
1 changed files with 5 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files
Showing only changes of commit 9afce1b6d7 - Show all commits

6
src/common/threadsafe_queue.h
View file

@ -102,7 +102,11 @@ public:
T PopWait(std::stop_token stop_token) {
if (Empty()) {
std::unique_lock lock{cv_mutex};
cv.wait(lock, stop_token, [this] { return !Empty(); });
if constexpr (with_stop_token) {
cv.wait(lock, stop_token, [this] { return !Empty(); });
} else {
cv.wait(lock, [this] { return !Empty(); });
}
}
if (stop_token.stop_requested()) {
return T{};