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

Don't block for output in non-blocking mode if clists run out.

Browse Source 
Remove an unnecessary test (if the output queue is above high water
then it is nonempty).
This commit is contained in:
bde 1994-11-26 18:54:25 +00:00
parent e952b5fa16
commit 3ca2c6e60c
1 changed files with 11 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
sys/kern/tty.c
View File

@ -36,7 +36,7 @@
* SUCH DAMAGE.
*
* @(#)tty.c 8.8 (Berkeley) 1/21/94
* $Id: tty.c,v 1.12 1994/10/23 06:18:13 davidg Exp $
* $Id: tty.c,v 1.13 1994/11/01 22:23:29 bde Exp $
*/
#include <sys/param.h>
@ -1594,6 +1594,10 @@ ttwrite(tp, uio, flag)
if (ttyoutput(*cp, tp) >= 0) {
/* No Clists, wait a bit. */
ttstart(tp);
if (flag & IO_NDELAY) {
error = EWOULDBLOCK;
goto out;
}
error = ttysleep(tp, &lbolt,
TTOPRI | PCATCH, ttybuf, 0);
if (error)
@ -1625,6 +1629,10 @@ ttwrite(tp, uio, flag)
if (i > 0) {
/* No Clists, wait a bit. */
ttstart(tp);
if (flag & IO_NDELAY) {
error = EWOULDBLOCK;
goto out;
}
error = ttysleep(tp,
&lbolt, TTOPRI | PCATCH, ttybuf, 0);
if (error)
@ -1662,10 +1670,8 @@ ttwrite(tp, uio, flag)
uio->uio_resid += cc;
return (uio->uio_resid == cnt ? EWOULDBLOCK : 0);
}
if (tp->t_outq.c_cc || ISSET(tp->t_state, TS_BUSY)) {
SET(tp->t_state, TS_ASLEEP);
error = ttysleep(tp, &tp->t_outq, TTOPRI | PCATCH, ttyout, 0);
}
SET(tp->t_state, TS_ASLEEP);
error = ttysleep(tp, &tp->t_outq, TTOPRI | PCATCH, ttyout, 0);
splx(s);
if (error)
goto out;