i2p/haiku-beta6
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

freebsd_network: Be lenient, do not assert if the callout mutex is &Giant.

Browse Source 
Same as FreeBSD. Should fix #18356.
This commit is contained in:
Augustin Cavalier
2023-04-17 22:47:14 -04:00
parent 97d55ad49d
commit c4737dcb22
1 changed files with 13 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/libs/compat/freebsd_network/callout.cpp
+13 -6
View File
@@ -195,18 +195,25 @@ _callout_stop(struct callout *c, bool drain, bool locked = false)
if (!locked) if (!locked)
locker.SetTo(sLock, false); locker.SetTo(sLock, false);
bool lockHeld = false;
if (!drain && c->c_mtx != NULL) { if (!drain && c->c_mtx != NULL) {
// The documentation for callout_stop() confirms any associated locks if (c->c_mtx != &Giant) {
// must be held when invoking it. We depend on this behavior for // The documentation for callout_stop() confirms any associated locks
// synchronization with the callout thread, which can modify c_due // must be held when invoking it. We depend on this behavior for
// with only the callout's lock held. // synchronization with the callout thread, which can modify c_due
mtx_assert(c->c_mtx, MA_OWNED); // with only the callout's lock held.
mtx_assert(c->c_mtx, MA_OWNED);
lockHeld = true;
} else {
// FreeBSD is lenient and does not assert if the callout mutex is &Giant.
lockHeld = mtx_owned(&Giant);
}
} }
int ret = -1; int ret = -1;
if (callout_active(c)) { if (callout_active(c)) {
ret = 0; ret = 0;
if (!drain && c->c_mtx != NULL && c->c_due == 0) { if (!drain && lockHeld && c->c_due == 0) {
// The callout is active, but c_due == 0 and we hold the locks: this // The callout is active, but c_due == 0 and we hold the locks: this
// means the callout thread has dequeued it and is waiting for c_mtx. // means the callout thread has dequeued it and is waiting for c_mtx.
// Clear c_due to signal the callout thread. // Clear c_due to signal the callout thread.