mirror/freebsd
1
0
Fork 0
mirror of https://git.FreeBSD.org/src.git synced 2024-12-17 10:26:15 +00:00
Code Issues Releases Activity

Delete some references to sleep() that somehow crept in.

Browse Source
This commit is contained in:
Garrett Wollman 1994-03-20 00:30:04 +00:00
parent 4e208024d0
commit 9131cc8d54
Notes: svn2git 2020-12-20 02:59:44 +00:00 
svn path=/head/; revision=1283
4 changed files with 24 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
sys/i386/isa/aha1542.c
View File

@ -12,7 +12,7 @@
* on the understanding that TFS is not responsible for the correct
* functioning of this software in any circumstances.
*
* $Id: aha1542.c,v 1.20 1994/01/22 21:54:10 rgrimes Exp $
* $Id: aha1542.c,v 1.21 1994/03/01 16:06:37 ats Exp $
*/
/*
@ -741,7 +741,7 @@ aha_get_ccb(unit, flags)
* to come free
*/
while ((!(rc = aha->aha_ccb_free)) && (!(flags & SCSI_NOSLEEP))) {
sleep(&aha->aha_ccb_free, PRIBIO);
tsleep((caddr_t)&aha->aha_ccb_free, PRIBIO, "ahaccb", 0);
}
if (rc) {
aha->aha_ccb_free = aha->aha_ccb_free->next;

5
sys/i386/isa/bt742a.c
View File

@ -12,7 +12,7 @@
* on the understanding that TFS is not responsible for the correct
* functioning of this software in any circumstances.
*
* $Id: bt742a.c,v 1.11 1993/11/25 01:31:27 wollman Exp $
* $Id: bt742a.c,v 1.12 1993/12/19 00:50:29 wollman Exp $
*/
/*
@ -818,7 +818,8 @@ bt_get_ccb(unit, flags)
goto gottit;
} else {
if (!(flags & SCSI_NOSLEEP)) {
sleep(&bt->bt_ccb_free, PRIBIO);
tsleep((caddr_t)&bt->bt_ccb_free, PRIBIO,
"btccb", 0);
}
}
}

27
sys/i386/isa/ft.c
View File

@ -17,7 +17,7 @@
* POSSIBILITY OF SUCH DAMAGE.
*
* ft.c - QIC-40/80 floppy tape driver
* $Id:$
* $Id: ft.c,v 1.4 1994/02/14 22:24:28 nate Exp $
*
*
* 01/26/94 v0.3b - Jim Babb
@ -1212,7 +1212,7 @@ int ftintr_wait(ftu_t ftu, int cmd, int ticks)
}
if (ticks) timeout(ft_timeout, (caddr_t)ftu, ticks);
sleep((caddr_t)&ftsem.intr_wait, FTPRI);
tsleep((caddr_t)&ftsem.intr_wait, FTPRI, "ftwait", 0);
intrdone:
if (ft->sts_wait == FTSTS_TIMEOUT) { /* timeout */
@ -1289,7 +1289,7 @@ int tape_state(ftu_t ftu, int all, int mask, int seconds)
}
if (seconds) {
timeout(state_timeout, (caddr_t)ftu, hz/4);
sleep((caddr_t)&ftsem.long_delay, FTPRI);
tsleep((caddr_t)&ftsem.long_delay, FTPRI, "ftstate", 0);
}
}
DPRT(("ft%d: tape_state failed on mask=$%02x maxtries=%d\n",
@ -1441,9 +1441,11 @@ void tape_inactive(ftu_t ftu)
if (ft->curseg->reqtype == FTIO_RDAHEAD) {
ft->curseg->reqcan = 1; /* XXX cancel rdahead */
while (ft->active) sleep((caddr_t)&ftsem.iosts_change, FTPRI);
while (ft->active)
tsleep((caddr_t)&ftsem.iosts_change, FTPRI, "ftinact", 0);
}
while (ft->active) sleep((caddr_t)&ftsem.iosts_change, FTPRI);
while (ft->active)
tsleep((caddr_t)&ftsem.iosts_change, FTPRI, "ftinact", 0);
}
/*
@ -1726,7 +1728,8 @@ int ftclose(dev_t dev, int flags)
/* Wait for any remaining I/O activity to complete. */
if (ft->curseg->reqtype == FTIO_RDAHEAD) ft->curseg->reqcan = 1;
while (ft->active) sleep((caddr_t)&ftsem.iosts_change, FTPRI);
while (ft->active)
tsleep((caddr_t)&ftsem.iosts_change, FTPRI, "ftclose", 0);
ft->mode = FTM_PRIMARY;
tape_cmd(ftu, QC_PRIMARY);
@ -1768,7 +1771,8 @@ int ftreq_rw(ftu_t ftu, int cmd, QIC_Segment *sr, struct proc *p)
}
if (ftg == NULL || ft->newcart) {
while (ft->active) sleep((caddr_t)&ftsem.iosts_change, FTPRI);
while (ft->active)
tsleep((caddr_t)&ftsem.iosts_change, FTPRI, "ftrw", 0);
tape_state(ftu, 0, QS_READY, 90);
if (ftgetgeom(ftu) < 0) {
return(ENXIO);
@ -1802,7 +1806,8 @@ int ftreq_rw(ftu_t ftu, int cmd, QIC_Segment *sr, struct proc *p)
}
/* Wait until we're ready. */
while (ft->active) sleep((caddr_t)&ftsem.iosts_change, FTPRI);
while (ft->active)
tsleep((caddr_t)&ftsem.iosts_change, FTPRI, "ftrw", 0);
/* Set up a new read request. */
sp = ft->curseg;
@ -1822,7 +1827,7 @@ int ftreq_rw(ftu_t ftu, int cmd, QIC_Segment *sr, struct proc *p)
timeout(ft_timeout, (caddr_t)ftu, 1);
rdwait:
sleep((caddr_t)&ftsem.buff_avail, FTPRI);
tsleep((caddr_t)&ftsem.buff_avail, FTPRI, "ftrw", 0);
bad = sp->reqbad;
sr->sg_crcmap = sp->reqcrc & ~bad;
@ -1837,12 +1842,12 @@ int ftreq_rw(ftu_t ftu, int cmd, QIC_Segment *sr, struct proc *p)
if (ft->curseg->reqtype == FTIO_RDAHEAD) {
ft->curseg->reqcan = 1; /* XXX cancel rdahead */
while (ft->active)
sleep((caddr_t)&ftsem.iosts_change, FTPRI);
tsleep((caddr_t)&ftsem.iosts_change, FTPRI, "ftrw", 0);
}
/* Sleep until a buffer becomes available. */
while (ft->bufseg->reqtype != FTIO_READY)
sleep((caddr_t)&ftsem.buff_avail, FTPRI);
tsleep((caddr_t)&ftsem.buff_avail, FTPRI, "ftrwbuf", 0);
sp = (ft->curseg->reqtype == FTIO_READY) ? ft->curseg : ft->bufseg;
/* Copy in segment and expand bad blocks. */

5
sys/i386/isa/ultra14f.c
View File

@ -19,7 +19,7 @@
* commenced: Sun Sep 27 18:14:01 PDT 1992
* slight mod to make work with 34F as well: Wed Jun 2 18:05:48 WST 1993
*
* $Id: ultra14f.c,v 1.14 1993/12/19 00:50:46 wollman Exp $
* $Id: ultra14f.c,v 1.15 1994/01/29 10:29:14 rgrimes Exp $
*/
#include <sys/types.h>
@ -675,7 +675,8 @@ uha_get_mscp(unit, flags)
goto gottit;
} else {
if (!(flags & SCSI_NOSLEEP)) {
sleep(&uha->free_mscp, PRIBIO);
tsleep((caddr_t)&uha->free_mscp, PRIBIO,
"uhamscp", 0);
}
}
}