d/freebsd-nq
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix aio+kq... I've been running ambrisko's test program for much longer

Browse Source 
w/o problems than I was before...  This simply brings back the knote_delete
as knlist_delete which will also drop the knote's, instead of just clearing
the list and seeing _ONESHOT...

Fix a race where if a note was _INFLUX and _DETACHED, it could end up being
modified... whoopse..

MFC after:	1 week
Prodded by:	ambrisko and dwhite
This commit is contained in:
John-Mark Gurney 2005-03-18 01:11:39 +00:00
parent 912faad0ea
commit c4c44d2935
3 changed files with 18 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
sys/kern/kern_event.c
View File

@ -1630,7 +1630,7 @@ knlist_destroy(struct knlist *knl)
* knotes time to "settle".
*/
void
knlist_clear(struct knlist *knl, int islocked)
knlist_cleardel(struct knlist *knl, struct thread *td, int islocked, int killkn)
{
struct knote *kn;
struct kqueue *kq;
@ -1646,15 +1646,20 @@ knlist_clear(struct knlist *knl, int islocked)
SLIST_FOREACH(kn, &knl->kl_list, kn_selnext) {
kq = kn->kn_kq;
KQ_LOCK(kq);
if ((kn->kn_status & KN_INFLUX) &&
(kn->kn_status & KN_DETACHED) != KN_DETACHED) {
if ((kn->kn_status & KN_INFLUX)) {
KQ_UNLOCK(kq);
continue;
}
/* Make sure cleared knotes disappear soon */
kn->kn_flags |= (EV_EOF | EV_ONESHOT);
knlist_remove_kq(knl, kn, 1, 1);
KQ_UNLOCK(kq);
if (killkn) {
kn->kn_status |= KN_INFLUX | KN_DETACHED;
KQ_UNLOCK(kq);
knote_drop(kn, td);
} else {
/* Make sure cleared knotes disappear soon */
kn->kn_flags |= (EV_EOF | EV_ONESHOT);
KQ_UNLOCK(kq);
}
kq = NULL;
}
@ -1672,8 +1677,6 @@ knlist_clear(struct knlist *knl, int islocked)
goto again;
}
SLIST_INIT(&knl->kl_list);
if (islocked)
mtx_assert(knl->kl_lock, MA_OWNED);
else {

2
sys/kern/vfs_aio.c
View File

@ -488,7 +488,7 @@ aio_free_entry(struct aiocblist *aiocbe)
* OWNING thread? (or maybe the running thread?)
* There is a semantic problem here...
*/
knlist_clear(&aiocbe->klist, 0); /* XXXKSE */
knlist_delete(&aiocbe->klist, FIRST_THREAD_IN_PROC(p), 0); /* XXXKSE */
if ((ki->kaio_flags & KAIO_WAKEUP) || ((ki->kaio_flags & KAIO_RUNDOWN)
&& ((ki->kaio_buffer_count == 0) && (ki->kaio_queue_count == 0)))) {

7
sys/sys/event.h
View File

@ -207,7 +207,12 @@ extern void knlist_remove_inevent(struct knlist *knl, struct knote *kn);
extern int knlist_empty(struct knlist *knl);
extern void knlist_init(struct knlist *knl, struct mtx *mtx);
extern void knlist_destroy(struct knlist *knl);
extern void knlist_clear(struct knlist *knl, int islocked);
extern void knlist_cleardel(struct knlist *knl, struct thread *td,
int islocked, int killkn);
#define knlist_clear(knl, islocked) \
knlist_cleardel((knl), NULL, (islocked), 0)
#define knlist_delete(knl, td, islocked) \
knlist_cleardel((knl), (td), (islocked), 1)
extern void knote_fdclose(struct thread *p, int fd);
extern int kqueue_register(struct kqueue *kq,
struct kevent *kev, struct thread *p, int waitok);