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

Now that sx(9) locks support an interruptible lock acquire primitive,

Browse Source 
properly observe the SB_NOINTR flag in sblock.  This restores the
required behavior that lock acquisition be interruptible on the socket
buffer I/O serialization lock to allow threads waiting for I/O to be
signaled even if they aren't the thread currently holding the I/O lock.
With this change, the sblock regression test is again passed.

Reported by:		alfred
sx(9) handiwork:	attilio
This commit is contained in:
Robert Watson 2007-05-31 11:51:22 +00:00
parent 753bcb5c34
commit 049c3b6cdf
1 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
sys/kern/uipc_sockbuf.c
View File

@ -138,8 +138,11 @@ sblock(struct sockbuf *sb, int flags)
{ {
if (flags == M_WAITOK) { if (flags == M_WAITOK) {
sx_xlock(&sb->sb_sx); if (sb->sb_flags & SB_NOINTR) {
return (0); sx_xlock(&sb->sb_sx);
return (0);
}
return (sx_xlock_sig(&sb->sb_sx));
} else { } else {
if (sx_try_xlock(&sb->sb_sx) == 0) if (sx_try_xlock(&sb->sb_sx) == 0)
return (EWOULDBLOCK); return (EWOULDBLOCK);