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

MFC r275260:

Browse Source 
Remove lock recursion for the pipe pair mutex, and disable the
recursion on mutex initialization.
This commit is contained in:
kib 2014-12-29 00:30:38 +00:00
parent 88c1adb417
commit 517ef2d351
1 changed files with 3 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
sys/kern/sys_pipe.c
View File

@ -315,7 +315,7 @@ pipe_zone_init(void *mem, int size, int flags)
pp = (struct pipepair *)mem; pp = (struct pipepair *)mem;
mtx_init(&pp->pp_mtx, "pipe mutex", NULL, MTX_DEF | MTX_RECURSE); mtx_init(&pp->pp_mtx, "pipe mutex", NULL, MTX_DEF);
return (0); return (0);
} }
@ -1770,7 +1770,7 @@ filt_piperead(struct knote *kn, long hint)
struct pipe *wpipe = rpipe->pipe_peer; struct pipe *wpipe = rpipe->pipe_peer;
int ret; int ret;
PIPE_LOCK(rpipe); PIPE_LOCK_ASSERT(rpipe, MA_OWNED);
kn->kn_data = rpipe->pipe_buffer.cnt; kn->kn_data = rpipe->pipe_buffer.cnt;
if ((kn->kn_data == 0) && (rpipe->pipe_state & PIPE_DIRECTW)) if ((kn->kn_data == 0) && (rpipe->pipe_state & PIPE_DIRECTW))
kn->kn_data = rpipe->pipe_map.cnt; kn->kn_data = rpipe->pipe_map.cnt;
@ -1779,11 +1779,9 @@ filt_piperead(struct knote *kn, long hint)
wpipe->pipe_present != PIPE_ACTIVE || wpipe->pipe_present != PIPE_ACTIVE ||
(wpipe->pipe_state & PIPE_EOF)) { (wpipe->pipe_state & PIPE_EOF)) {
kn->kn_flags |= EV_EOF; kn->kn_flags |= EV_EOF;
PIPE_UNLOCK(rpipe);
return (1); return (1);
} }
ret = kn->kn_data > 0; ret = kn->kn_data > 0;
PIPE_UNLOCK(rpipe);
return ret; return ret;
} }
@ -1794,12 +1792,11 @@ filt_pipewrite(struct knote *kn, long hint)
struct pipe *wpipe; struct pipe *wpipe;
wpipe = kn->kn_hook; wpipe = kn->kn_hook;
PIPE_LOCK(wpipe); PIPE_LOCK_ASSERT(wpipe, MA_OWNED);
if (wpipe->pipe_present != PIPE_ACTIVE || if (wpipe->pipe_present != PIPE_ACTIVE ||
(wpipe->pipe_state & PIPE_EOF)) { (wpipe->pipe_state & PIPE_EOF)) {
kn->kn_data = 0; kn->kn_data = 0;
kn->kn_flags |= EV_EOF; kn->kn_flags |= EV_EOF;
PIPE_UNLOCK(wpipe);
return (1); return (1);
} }
kn->kn_data = (wpipe->pipe_buffer.size > 0) ? kn->kn_data = (wpipe->pipe_buffer.size > 0) ?
@ -1807,7 +1804,6 @@ filt_pipewrite(struct knote *kn, long hint)
if (wpipe->pipe_state & PIPE_DIRECTW) if (wpipe->pipe_state & PIPE_DIRECTW)
kn->kn_data = 0; kn->kn_data = 0;
PIPE_UNLOCK(wpipe);
return (kn->kn_data >= PIPE_BUF); return (kn->kn_data >= PIPE_BUF);
} }