darlinghq/darling-libkqueue
1
0
Fork 0
mirror of https://github.com/darlinghq/darling-libkqueue.git synced 2025-02-17 02:38:02 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Keep processing events after EV_RECEIPT and remove unnecessary race check

Browse Source 
I added that race check back when I was trying to use libkqueue with update-sources because launchd was segfaulting and libkqueue seemed to be the cause, but I can't reproduce this anymore. The way it was, it was actually causing issues with EPOLLET events.
This commit is contained in:
Ariel Abreu 2022-03-09 17:07:16 -05:00
parent ed45525ac4
commit f721a1d2d8
No known key found for this signature in database
GPG Key ID: D67AE16CCEA85B70
1 changed files with 8 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
src/common/kevent.c
View File

@ -332,6 +332,7 @@ kevent64_impl(int kqfd, const struct kevent64_s *changelist, int nchanges,
struct kqueue *kq;
struct timespec timeout_zero = { 0, 0 };
int rv = 0;
int ret = 0;
#ifndef NDEBUG
static unsigned int _kevent_counter = 0;
unsigned int myid = 0;
@ -368,9 +369,9 @@ kevent64_impl(int kqfd, const struct kevent64_s *changelist, int nchanges,
if (rv > 0) {
eventlist += rv;
nevents -= rv;
/* There are events to return, so let's return now */
goto out;
ret += rv;
// keep going to process more events (if we have room)
}
}
@ -389,16 +390,8 @@ again:
kqueue_lock(kq);
if (fastpath(rv > 0)) {
// we might have raced for an event...
// since we had to acquire the lock, we might have lost the race,
// so check again (non-blockingly) to see if we still have any events
rv = kqops.kevent_wait(kq, nevents, &timeout_zero);
if (fastpath(rv > 0)) {
rv = kqops.kevent_copyout(kq, rv, eventlist, nevents);
} else {
dbg_puts("lost the race!");
}
rv = kqops.kevent_copyout(kq, rv, eventlist, nevents);
ret += rv;
}
kqueue_cleanup(kq);
@ -427,7 +420,7 @@ again:
#endif
out:
dbg_printf("--- END kevent %u ret %d ---", myid, rv);
dbg_printf("--- END kevent %u ret %d ---", myid, (rv < 0) ? rv : ret);
kqueue_delref(kq);
return (rv);
return (rv < 0) ? rv : ret;
}