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

As a result of kqueue locking work, socket buffer locks will always

Browse Source 
be held when entering a kqueue filter for fifos via a socket buffer
event: as such, assert the lock unconditionally rather than acquiring
it conditionall.

MFC after:	3 days
This commit is contained in:
Robert Watson 2005-09-13 10:39:24 +00:00
parent 51c1fa5c31
commit 8a22e151be
1 changed files with 6 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
sys/fs/fifofs/fifo_vnops.c
View File

@ -393,22 +393,16 @@ static int
filt_fiforead(struct knote *kn, long hint)
{
struct socket *so = (struct socket *)kn->kn_hook;
int need_lock, result;
need_lock = !SOCKBUF_OWNED(&so->so_rcv);
if (need_lock)
SOCKBUF_LOCK(&so->so_rcv);
SOCKBUF_LOCK_ASSERT(&so->so_rcv);
kn->kn_data = so->so_rcv.sb_cc;
if (so->so_rcv.sb_state & SBS_CANTRCVMORE) {
kn->kn_flags |= EV_EOF;
result = 1;
return (1);
} else {
kn->kn_flags &= ~EV_EOF;
result = (kn->kn_data > 0);
return (kn->kn_data > 0);
}
if (need_lock)
SOCKBUF_UNLOCK(&so->so_rcv);
return (result);
}
static void
@ -427,22 +421,16 @@ static int
filt_fifowrite(struct knote *kn, long hint)
{
struct socket *so = (struct socket *)kn->kn_hook;
int need_lock, result;
need_lock = !SOCKBUF_OWNED(&so->so_snd);
if (need_lock)
SOCKBUF_LOCK(&so->so_snd);
SOCKBUF_LOCK_ASSERT(&so->so_snd);
kn->kn_data = sbspace(&so->so_snd);
if (so->so_snd.sb_state & SBS_CANTSENDMORE) {
kn->kn_flags |= EV_EOF;
result = 1;
return (1);
} else {
kn->kn_flags &= ~EV_EOF;
result = (kn->kn_data >= so->so_snd.sb_lowat);
return (kn->kn_data >= so->so_snd.sb_lowat);
}
if (need_lock)
SOCKBUF_UNLOCK(&so->so_snd);
return (result);
}
static void