On Mon, Dec 30, 2019 at 12:14:12PM +0100, Martin Pieuchot wrote:
> I forgot those previously, convert them to tsleep_nsec(9), ok?
OK bluhm@
> Index: kern/init_main.c
> ===================================================================
> RCS file: /cvs/src/sys/kern/init_main.c,v
> retrieving revision 1.293
> diff -u -p -r1.293 init_main.c
> --- kern/init_main.c 29 Nov 2019 06:34:45 -0000 1.293
> +++ kern/init_main.c 30 Dec 2019 10:40:24 -0000
> @@ -464,7 +464,7 @@ main(void *framep)
> * secondary processors, yet.
> */
> while (config_pending)
> - (void) tsleep((void *)&config_pending, PWAIT, "cfpend", 0);
> + tsleep_nsec(&config_pending, PWAIT, "cfpend", INFSLP);
>
> dostartuphooks();
>
> @@ -572,7 +572,7 @@ main(void *framep)
> * proc0: nothing to do, back to sleep
> */
> while (1)
> - tsleep(&proc0, PVM, "scheduler", 0);
> + tsleep_nsec(&proc0, PVM, "scheduler", INFSLP);
> /* NOTREACHED */
> }
>
> @@ -631,7 +631,7 @@ start_init(void *arg)
> * Wait for main() to tell us that it's safe to exec.
> */
> while (start_init_exec == 0)
> - (void) tsleep((void *)&start_init_exec, PWAIT, "initexec", 0);
> + tsleep_nsec(&start_init_exec, PWAIT, "initexec", INFSLP);
>
> check_console(p);
>
> Index: kern/sysv_msg.c
> ===================================================================
> RCS file: /cvs/src/sys/kern/sysv_msg.c,v
> retrieving revision 1.35
> diff -u -p -r1.35 sysv_msg.c
> --- kern/sysv_msg.c 16 Jul 2019 21:30:54 -0000 1.35
> +++ kern/sysv_msg.c 30 Dec 2019 10:39:20 -0000
> @@ -131,7 +131,8 @@ msgctl1(struct proc *p, int msqid, int c
> /* lose interest in the queue and wait for others to too */
> if (--que->que_references > 0) {
> wakeup(que);
> - tsleep(&que->que_references, PZERO, "msgqrm", 0);
> + tsleep_nsec(&que->que_references, PZERO, "msgqrm",
> + INFSLP);
> }
>
> que_free(que);
> @@ -273,7 +274,7 @@ sys_msgsnd(struct proc *p, void *v, regi
> maxmsgs = 1;
>
> que->que_flags |= MSGQ_WRITERS;
> - if ((error = tsleep(que, PZERO|PCATCH, "msgwait", 0)))
> + if ((error = tsleep_nsec(que, PZERO|PCATCH, "msgwait", INFSLP)))
> goto out;
>
> if (que->que_flags & MSGQ_DYING) {
> @@ -344,7 +345,7 @@ sys_msgrcv(struct proc *p, void *v, regi
> }
>
> que->que_flags |= MSGQ_READERS;
> - if ((error = tsleep(que, PZERO|PCATCH, "msgwait", 0)))
> + if ((error = tsleep_nsec(que, PZERO|PCATCH, "msgwait", INFSLP)))
> goto out;
>
> /* make sure the queue still alive */
