sanchayanmaity/minix
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

. minor fix in select() logic on pipes

Browse source 
. fix in pipe_check when 'notouch' is on - we touched something!
This commit is contained in:
Ben Gras 2006-03-24 20:53:10 +00:00
parent 9f6b2666e1
commit df9f4f4369
1 changed files with 12 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

19
servers/fs/pipe.c
View file

@ -158,6 +158,7 @@ int notouch; /* check only */
/* Do a partial write. Need to wakeup reader /* Do a partial write. Need to wakeup reader
* since we'll suspend ourself in read_write() * since we'll suspend ourself in read_write()
*/ */
if (!notouch)
release(rip, READ, susp_count); release(rip, READ, susp_count);
return(1); return(1);
} }
@ -386,24 +387,26 @@ PUBLIC int select_request_pipe(struct filp *f, int *ops, int block)
{ {
int orig_ops, r = 0, err, canwrite; int orig_ops, r = 0, err, canwrite;
orig_ops = *ops; orig_ops = *ops;
if ((*ops & SEL_RD)) { if ((*ops & (SEL_RD|SEL_ERR))) {
if ((err = pipe_check(f->filp_ino, READING, 0, if ((err = pipe_check(f->filp_ino, READING, 0,
1, f->filp_pos, &canwrite, 1)) != SUSPEND) 1, f->filp_pos, &canwrite, 1)) != SUSPEND && err > 0)
r |= SEL_RD; r |= SEL_RD;
if (err < 0 && err != SUSPEND && (*ops & SEL_ERR)) if (err < 0 && err != SUSPEND)
r |= SEL_ERR; r |= SEL_ERR;
} }
if ((*ops & SEL_WR)) { if ((*ops & (SEL_WR|SEL_ERR))) {
if ((err = pipe_check(f->filp_ino, WRITING, 0, if ((err = pipe_check(f->filp_ino, WRITING, 0,
1, f->filp_pos, &canwrite, 1)) != SUSPEND) 1, f->filp_pos, &canwrite, 1)) != SUSPEND &&
err > 0 && canwrite > 0)
r |= SEL_WR; r |= SEL_WR;
if (err < 0 && err != SUSPEND && (*ops & SEL_ERR)) if (err < 0 && err != SUSPEND)
r |= SEL_ERR; r |= SEL_ERR;
} }
*ops = r; /* Some options we collected might not be requested. */
*ops = r & orig_ops;
if (!r && block) { if (!*ops && block) {
f->filp_pipe_select_ops |= orig_ops; f->filp_pipe_select_ops |= orig_ops;
} }