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

freebsd_network: Always unset c_due after removing the callout from the list.

Browse Source 
Use 0 as the magic value instead of a positive one. This way, <= 0
consistently signals that the callout is not in the list, whereas > 0
signals that it is.
This commit is contained in:
Augustin Cavalier
2023-03-30 17:30:50 -04:00
parent 11e68e0c54
commit 673bc1087f
1 changed files with 3 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/libs/compat/freebsd_network/callout.cpp
+3 -4
View File
@@ -62,8 +62,7 @@ callout_thread(void* /*data*/)
// execute timer // execute timer
list_remove_item(&sTimers, c); list_remove_item(&sTimers, c);
struct mtx *c_mtx = c->c_mtx; struct mtx *c_mtx = c->c_mtx;
if (c_mtx == NULL) c->c_due = 0;
c->c_due = -1;
sCurrentCallout = c; sCurrentCallout = c;
mutex_unlock(&sLock); mutex_unlock(&sLock);
@@ -230,10 +229,10 @@ _callout_stop_safe(struct callout *c, int safe)
int ret = -1; int ret = -1;
if (callout_active(c)) { if (callout_active(c)) {
ret = 0; ret = 0;
if (!safe && c->c_mtx != NULL && c->c_due > 0) { if (!safe && c->c_mtx != NULL && c->c_due == 0) {
mtx_assert(c->c_mtx, MA_OWNED); mtx_assert(c->c_mtx, MA_OWNED);
// 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.
c->c_due = -1; c->c_due = -1;