-
Notifications
You must be signed in to change notification settings - Fork 5.6k
Implement waitable_atomic for FreeBSD #1607
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.
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
Open
ronaldklop
wants to merge
3
commits into
mongodb:master
Choose a base branch
from
ronaldklop:master
base: master
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
Open
Changes from all commits
Commits
Show all changes
3 commits
Select commit
Hold shift + click to select a range
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -34,6 +34,9 @@ | |
#ifdef __linux__ | ||
#include <linux/futex.h> | ||
#include <sys/syscall.h> | ||
#elif defined(__FreeBSD__) | ||
#include <sys/types.h> | ||
#include <sys/umtx.h> | ||
#elif defined(_WIN32) | ||
#include <synchapi.h> | ||
#endif | ||
|
@@ -235,6 +238,45 @@ bool waitUntil(const void* uaddr, | |
return timeoutOverflow || errno != ETIMEDOUT; | ||
} | ||
|
||
#elif defined(__FreeBSD__) | ||
|
||
void notifyOne(const void* uaddr) { | ||
_umtx_op(const_cast<void*>(uaddr), UMTX_OP_WAKE_PRIVATE, 1, NULL, NULL); | ||
} | ||
|
||
void notifyMany(const void* uaddr, int nToWake) { | ||
_umtx_op(const_cast<void*>(uaddr), UMTX_OP_WAKE_PRIVATE, nToWake, NULL, NULL); | ||
} | ||
|
||
void notifyAll(const void* uaddr) { | ||
_umtx_op(const_cast<void*>(uaddr), UMTX_OP_WAKE_PRIVATE, INT_MAX, NULL, NULL); | ||
} | ||
|
||
bool waitUntil(const void* uaddr, | ||
uint32_t old, | ||
boost::optional<system_clock::time_point> deadline) { | ||
struct _umtx_time umtx_deadline; | ||
void* uaddr2 = nullptr; | ||
|
||
if (deadline) { | ||
umtx_deadline._timeout.tv_sec = durationCount<Seconds>(deadline->time_since_epoch()); | ||
umtx_deadline._timeout.tv_nsec = durationCount<Nanoseconds>( | ||
deadline->time_since_epoch() - stdx::chrono::seconds(umtx_deadline._timeout.tv_sec)); | ||
umtx_deadline._flags = UMTX_ABSTIME; | ||
umtx_deadline._clockid = CLOCK_REALTIME_FAST; | ||
uaddr2 = &umtx_deadline; | ||
} | ||
|
||
int umtxOpRet; | ||
if ((umtxOpRet = _umtx_op(const_cast<void*>(uaddr), UMTX_OP_WAIT_UINT_PRIVATE, old, (void*)sizeof(struct _umtx_time), uaddr2)) != 0) { | ||
if (errno == ETIMEDOUT) { | ||
Comment on lines
+270
to
+272
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. The |
||
return false; | ||
} | ||
invariant(umtxOpRet == 0, errorMessage(lastSystemError())); | ||
} | ||
return true; | ||
} | ||
|
||
#else | ||
#error "Need an implementation of waitUntil(), notifyOne(), notifyMany(), notifyAll() for this OS" | ||
#endif | ||
|
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
The
umtxOpRet
error check is incorrect. The function returns -1 on error and setserrno
, but the code checks ifumtxOpRet != 0
which will trigger the invariant even for expected errors.