Aren/haiku
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

freebsd_network: Properly implement callout_drain().

Browse Source 
Also cleanup code a bit.

May help with #17634.
This commit is contained in:
Augustin Cavalier 2022-03-09 17:10:35 -05:00
parent 49fd143d15
commit 385fce1cde
1 changed files with 13 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
src/libs/compat/freebsd_network/callout.cpp
View File

@ -212,17 +212,24 @@ callout_schedule(struct callout *callout, int _ticks)
int int
_callout_stop_safe(struct callout *c, int safe) _callout_stop_safe(struct callout *c, int safe)
{ {
MutexLocker locker(sLock); if (c == NULL)
return -1;
if (c == NULL) {
printf("_callout_stop_safe called with NULL callout\n");
return 0;
}
TRACE("_callout_stop_safe %p, func %p, arg %p\n", c, c->c_func, c->c_arg); TRACE("_callout_stop_safe %p, func %p, arg %p\n", c, c->c_func, c->c_arg);
MutexLocker locker(sLock);
if (c->due <= 0) if (c->due <= 0)
return -1;
if (callout_active(c)) {
if (safe) {
locker.Unlock();
while (callout_active(c))
snooze(100);
}
return 0; return 0;
}
// this timer is scheduled, cancel it // this timer is scheduled, cancel it
list_remove_item(&sTimers, c); list_remove_item(&sTimers, c);