From: art <art@openbsd.org>
Date: Thu, 23 Mar 2000 15:55:52 +0000 (+0000)
Subject: Use the new timeout facilities for ITIMER_REAL.
X-Git-Url: http://artulab.com/gitweb/?a=commitdiff_plain;h=0427279fbad020614c39da5aaa406f99627be846;p=openbsd

Use the new timeout facilities for ITIMER_REAL.
---

diff --git a/sys/kern/kern_exec.c b/sys/kern/kern_exec.c
index aab946407fe..15ed8af28fe 100644
--- a/sys/kern/kern_exec.c
+++ b/sys/kern/kern_exec.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: kern_exec.c,v 1.40 2000/03/22 21:35:37 mickey Exp $	*/
+/*	$OpenBSD: kern_exec.c,v 1.41 2000/03/23 15:55:52 art Exp $	*/
 /*	$NetBSD: kern_exec.c,v 1.75 1996/02/09 18:59:28 christos Exp $	*/
 
 /*-
@@ -566,7 +566,7 @@ sys_execve(p, v, retval)
 	if (p->p_flag & P_SUGIDEXEC) {
 		int i, s = splclock();
 
-		untimeout(realitexpire, (void *)p);
+		timeout_del(&p->p_realit_to);
 		timerclear(&p->p_realtimer.it_interval);
 		timerclear(&p->p_realtimer.it_value);
 		for (i = 0; i < sizeof(p->p_stats->p_timer) /
diff --git a/sys/kern/kern_exit.c b/sys/kern/kern_exit.c
index b7d61950ad1..5efdeea121a 100644
--- a/sys/kern/kern_exit.c
+++ b/sys/kern/kern_exit.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: kern_exit.c,v 1.21 2000/02/21 20:00:09 art Exp $	*/
+/*	$OpenBSD: kern_exit.c,v 1.22 2000/03/23 15:55:52 art Exp $	*/
 /*	$NetBSD: kern_exit.c,v 1.39 1996/04/22 01:38:25 christos Exp $	*/
 
 /*
@@ -134,7 +134,7 @@ exit1(p, rv)
 	}
 	p->p_sigignore = ~0;
 	p->p_siglist = 0;
-	untimeout(realitexpire, (caddr_t)p);
+	timeout_del(&p->p_realit_to);
 
 	/*
 	 * Close open files and release open-file table.
diff --git a/sys/kern/kern_time.c b/sys/kern/kern_time.c
index eac35bced09..736fe37775a 100644
--- a/sys/kern/kern_time.c
+++ b/sys/kern/kern_time.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: kern_time.c,v 1.17 2000/03/17 22:24:26 jakob Exp $	*/
+/*	$OpenBSD: kern_time.c,v 1.18 2000/03/23 15:55:52 art Exp $	*/
 /*	$NetBSD: kern_time.c,v 1.20 1996/02/18 11:57:06 fvdl Exp $	*/
 
 /*
@@ -486,10 +486,11 @@ sys_setitimer(p, v, retval)
 		return (EINVAL);
 	s = splclock();
 	if (SCARG(uap, which) == ITIMER_REAL) {
-		untimeout(realitexpire, (void *)p);
+		timeout_del(&p->p_realit_to);
 		if (timerisset(&aitv.it_value)) {
 			timeradd(&aitv.it_value, &time, &aitv.it_value);
-			timeout(realitexpire, (void *)p, hzto(&aitv.it_value));
+			timeout_set(&p->p_realit_to, realitexpire, p);
+			timeout_add(&p->p_realit_to, hzto(&aitv.it_value));
 		}
 		p->p_realtimer = aitv;
 	} else
@@ -524,8 +525,8 @@ realitexpire(arg)
 		timeradd(&p->p_realtimer.it_value,
 		    &p->p_realtimer.it_interval, &p->p_realtimer.it_value);
 		if (timercmp(&p->p_realtimer.it_value, &time, >)) {
-			timeout(realitexpire, (void *)p,
-			    hzto(&p->p_realtimer.it_value));
+			timeout_add(&p->p_realit_to,
+				    hzto(&p->p_realtimer.it_value));
 			splx(s);
 			return;
 		}