darlinghq/darling-libkqueue
1
0
Fork 0
mirror of https://github.com/darlinghq/darling-libkqueue.git synced 2024-11-23 11:49:50 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Make sure we don't 'return' non-initialized events when running with KQUEUE_DEBUG by initializing rv properly (it would generate incorrect debug logs if nevents == 0), tuning debug output slightly.

Browse Source 
git-svn-id: svn://svn.code.sf.net/p/libkqueue/code/trunk@443 fb4e3144-bc1c-4b72-a658-5bcd248dd7f7
This commit is contained in:
jocke 2011-02-28 14:45:20 +00:00
parent e558ed245c
commit 96365c3031
1 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/common/kevent.c
View File

@ -131,7 +131,7 @@ kevent_copyin_one(struct kqueue *kq, const struct kevent *src)
if (filter_lookup(&filt, kq, src->filter) < 0)
return (-1);
dbg_printf("src=%s\n", kevent_dump(src));
dbg_printf("src=%s", kevent_dump(src));
kn = knote_lookup(filt, src->ident);
dbg_printf("knote_lookup: ident %d == %p", (int)src->ident, kn);
@ -151,7 +151,7 @@ kevent_copyin_one(struct kqueue *kq, const struct kevent *src)
return (-1);
}
knote_insert(filt, kn);
dbg_printf("created kevent %s\n", kevent_dump(src));
dbg_printf("created kevent %s", kevent_dump(src));
/* XXX- FIXME Needs to be handled in kn_create() to prevent races */
@ -250,7 +250,7 @@ kevent(int kqfd, const struct kevent *changelist, int nchanges,
if (KQUEUE_DEBUG) {
myid = atomic_inc(&_kevent_counter);
dbg_printf("--- kevent %u ---", myid);
dbg_printf("--- kevent %u --- (nchanges = %d, nevents = %d)", myid, nchanges, nevents);
} else {
myid = 0;
}
@ -269,6 +269,8 @@ kevent(int kqfd, const struct kevent *changelist, int nchanges,
}
}
rv = 0;
/*
* Wait for events and copy them to the eventlist
*/
@ -276,6 +278,7 @@ kevent(int kqfd, const struct kevent *changelist, int nchanges,
nevents = MAX_KEVENT;
if (nevents > 0) {
rv = kqops.kevent_wait(kq, nevents, timeout);
dbg_printf("kqops.kevent_wait returned %d", rv);
if (fastpath(rv > 0)) {
rv = kqops.kevent_copyout(kq, rv, eventlist, nevents);
} else if (rv == 0) {