Convert the remaining ones to {m,t}sleep_nsec(9), ok?
Index: kern/kern_bufq.c
===================================================================
RCS file: /cvs/src/sys/kern/kern_bufq.c,v
retrieving revision 1.32
diff -u -p -r1.32 kern_bufq.c
--- kern/kern_bufq.c 16 Aug 2017 17:52:17 -0000 1.32
+++ kern/kern_bufq.c 16 Dec 2019 10:08:31 -0000
@@ -109,7 +109,7 @@ bufq_init(struct bufq *bq, int type)
mtx_enter(&bufqs_mtx);
while (bufqs_stop) {
- msleep(&bufqs_stop, &bufqs_mtx, PRIBIO, "bqinit", 0);
+ msleep_nsec(&bufqs_stop, &bufqs_mtx, PRIBIO, "bqinit", INFSLP);
}
SLIST_INSERT_HEAD(&bufqs, bq, bufq_entries);
mtx_leave(&bufqs_mtx);
@@ -168,7 +168,7 @@ bufq_destroy(struct bufq *bq)
mtx_enter(&bufqs_mtx);
while (bufqs_stop) {
- msleep(&bufqs_stop, &bufqs_mtx, PRIBIO, "bqdest", 0);
+ msleep_nsec(&bufqs_stop, &bufqs_mtx, PRIBIO, "bqdest", INFSLP);
}
SLIST_REMOVE(&bufqs, bq, bufq, bufq_entries);
mtx_leave(&bufqs_mtx);
@@ -180,7 +180,8 @@ bufq_queue(struct bufq *bq, struct buf *
{
mtx_enter(&bq->bufq_mtx);
while (bq->bufq_stop) {
- msleep(&bq->bufq_stop, &bq->bufq_mtx, PRIBIO, "bqqueue", 0);
+ msleep_nsec(&bq->bufq_stop, &bq->bufq_mtx, PRIBIO, "bqqueue",
+ INFSLP);
}
bp->b_bq = bq;
@@ -244,8 +245,8 @@ bufq_wait(struct bufq *bq)
mtx_enter(&bq->bufq_mtx);
while (bq->bufq_outstanding >= bq->bufq_hi) {
bq->bufq_waiting++;
- msleep(&bq->bufq_waiting, &bq->bufq_mtx,
- PRIBIO, "bqwait", 0);
+ msleep_nsec(&bq->bufq_waiting, &bq->bufq_mtx,
+ PRIBIO, "bqwait", INFSLP);
bq->bufq_waiting--;
}
mtx_leave(&bq->bufq_mtx);
@@ -282,8 +283,8 @@ bufq_quiesce(void)
mtx_enter(&bq->bufq_mtx);
bq->bufq_stop = 1;
while (bq->bufq_outstanding) {
- msleep(&bq->bufq_outstanding, &bq->bufq_mtx,
- PRIBIO, "bqquies", 0);
+ msleep_nsec(&bq->bufq_outstanding, &bq->bufq_mtx,
+ PRIBIO, "bqquies", INFSLP);
}
mtx_leave(&bq->bufq_mtx);
}
Index: kern/kern_exit.c
===================================================================
RCS file: /cvs/src/sys/kern/kern_exit.c,v
retrieving revision 1.181
diff -u -p -r1.181 kern_exit.c
--- kern/kern_exit.c 11 Dec 2019 07:30:09 -0000 1.181
+++ kern/kern_exit.c 16 Dec 2019 10:07:34 -0000
@@ -164,7 +164,7 @@ exit1(struct proc *p, int xexit, int xsi
if ((p->p_flag & P_THREAD) == 0) {
/* main thread gotta wait because it has the pid, et al */
while (pr->ps_refcnt > 1)
- tsleep(&pr->ps_threads, PWAIT, "thrdeath", 0);
+ tsleep_nsec(&pr->ps_threads, PWAIT, "thrdeath", INFSLP);
if (pr->ps_flags & PS_PROFIL)
stopprofclock(pr);
}
@@ -412,7 +412,8 @@ reaper(void *arg)
for (;;) {
mtx_enter(&deadproc_mutex);
while ((p = LIST_FIRST(&deadproc)) == NULL)
- msleep(&deadproc, &deadproc_mutex, PVM, "reaper", 0);
+ msleep_nsec(&deadproc, &deadproc_mutex, PVM, "reaper",
+ INFSLP);
/* Remove us from the deadproc list. */
LIST_REMOVE(p, p_hash);
@@ -567,7 +568,7 @@ loop:
retval[0] = 0;
return (0);
}
- if ((error = tsleep(q->p_p, PWAIT | PCATCH, "wait", 0)) != 0)
+ if ((error = tsleep_nsec(q->p_p, PWAIT | PCATCH, "wait", INFSLP)) != 0)
return (error);
goto loop;
}
Index: kern/kern_fork.c
===================================================================
RCS file: /cvs/src/sys/kern/kern_fork.c,v
retrieving revision 1.218
diff -u -p -r1.218 kern_fork.c
--- kern/kern_fork.c 29 Nov 2019 21:32:04 -0000 1.218
+++ kern/kern_fork.c 16 Dec 2019 10:08:43 -0000
@@ -491,7 +491,7 @@ fork1(struct proc *curp, int flags, void
*/
if (flags & FORK_PPWAIT)
while (curpr->ps_flags & PS_ISPWAIT)
- tsleep(curpr, PWAIT, "ppwait", 0);
+ tsleep_nsec(curpr, PWAIT, "ppwait", INFSLP);
/*
* If we're tracing the child, alert the parent too.
Index: kern/kern_malloc.c
===================================================================
RCS file: /cvs/src/sys/kern/kern_malloc.c,v
retrieving revision 1.140
diff -u -p -r1.140 kern_malloc.c
--- kern/kern_malloc.c 28 Nov 2019 16:23:11 -0000 1.140
+++ kern/kern_malloc.c 16 Dec 2019 10:08:55 -0000
@@ -218,7 +218,7 @@ malloc(size_t size, int type, int flags)
#endif
if (ksp->ks_limblocks < 65535)
ksp->ks_limblocks++;
- msleep(ksp, &malloc_mtx, PSWP+2, memname[type], 0);
+ msleep_nsec(ksp, &malloc_mtx, PSWP+2, memname[type], INFSLP);
}
ksp->ks_memuse += allocsize; /* account for this early */
ksp->ks_size |= 1 << indx;
Index: kern/kern_physio.c
===================================================================
RCS file: /cvs/src/sys/kern/kern_physio.c,v
retrieving revision 1.43
diff -u -p -r1.43 kern_physio.c
--- kern/kern_physio.c 14 Mar 2015 03:38:50 -0000 1.43
+++ kern/kern_physio.c 16 Dec 2019 10:09:47 -0000
@@ -163,7 +163,7 @@ physio(void (*strategy)(struct buf *), d
/* [wait for the transfer to complete] */
while ((bp->b_flags & B_DONE) == 0)
- tsleep(bp, PRIBIO + 1, "physio", 0);
+ tsleep_nsec(bp, PRIBIO + 1, "physio", INFSLP);
/* Mark it busy again, so nobody else will use it. */
bp->b_flags |= B_BUSY;
Index: kern/kern_sensors.c
===================================================================
RCS file: /cvs/src/sys/kern/kern_sensors.c,v
retrieving revision 1.38
diff -u -p -r1.38 kern_sensors.c
--- kern/kern_sensors.c 9 Apr 2017 15:47:18 -0000 1.38
+++ kern/kern_sensors.c 16 Dec 2019 10:09:59 -0000
@@ -242,7 +242,7 @@ sensor_quiesce(void)
{
sensors_quiesced = 1;
while (sensors_running > 0)
- tsleep(&sensors_running, PZERO, "sensorpause", 0);
+ tsleep_nsec(&sensors_running, PZERO, "sensorpause", INFSLP);
}
void
Index: kern/kern_sig.c
===================================================================
RCS file: /cvs/src/sys/kern/kern_sig.c,v
retrieving revision 1.236
diff -u -p -r1.236 kern_sig.c
--- kern/kern_sig.c 11 Dec 2019 07:30:09 -0000 1.236
+++ kern/kern_sig.c 16 Dec 2019 10:11:04 -0000
@@ -507,7 +507,7 @@ sys_sigsuspend(struct proc *p, void *v,
struct sigacts *ps = pr->ps_sigacts;
dosigsuspend(p, SCARG(uap, mask) &~ sigcantmask);
- while (tsleep(ps, PPAUSE|PCATCH, "pause", 0) == 0)
+ while (tsleep_nsec(ps, PPAUSE|PCATCH, "pause", INFSLP) == 0)
/* void */;
/* always return EINTR rather than ERESTART... */
return (EINTR);
@@ -2055,7 +2055,7 @@ single_thread_wait(struct process *pr)
{
/* wait until they're all suspended */
while (pr->ps_singlecount > 0)
- tsleep(&pr->ps_singlecount, PWAIT, "suspend", 0);
+ tsleep_nsec(&pr->ps_singlecount, PWAIT, "suspend", INFSLP);
}
void
Index: kern/kern_task.c
===================================================================
RCS file: /cvs/src/sys/kern/kern_task.c,v
retrieving revision 1.26
diff -u -p -r1.26 kern_task.c
--- kern/kern_task.c 23 Jun 2019 12:56:10 -0000 1.26
+++ kern/kern_task.c 16 Dec 2019 10:09:24 -0000
@@ -167,7 +167,8 @@ taskq_destroy(struct taskq *tq)
while (tq->tq_running > 0) {
wakeup(tq);
- msleep(&tq->tq_running, &tq->tq_mtx, PWAIT, "tqdestroy", 0);
+ msleep_nsec(&tq->tq_running, &tq->tq_mtx, PWAIT, "tqdestroy",
+ INFSLP);
}
mtx_leave(&tq->tq_mtx);
@@ -318,7 +319,7 @@ retry:
}
tq->tq_waiting++;
- msleep(tq, &tq->tq_mtx, PWAIT, "bored", 0);
+ msleep_nsec(tq, &tq->tq_mtx, PWAIT, "bored", INFSLP);
tq->tq_waiting--;
}
@@ -330,7 +331,7 @@ retry:
if (++tq->tq_waiting == tq->tq_nthreads) {
tq->tq_waiting--;
} else {
- msleep(tq, &tq->tq_mtx, PWAIT, "tqblk", 0);
+ msleep_nsec(tq, &tq->tq_mtx, PWAIT, "tqblk", INFSLP);
tq->tq_waiting--;
goto retry;
}
