--- libaitsched/src/hooks.c	2012/01/08 03:28:26	1.3.4.1
+++ libaitsched/src/hooks.c	2012/01/24 14:04:58	1.3.4.2
@@ -3,7 +3,7 @@
 *  by Michael Pounov <misho@openbsd-bg.org>
 *
 * $Author: misho $
-* $Id: hooks.c,v 1.3.4.1 2012/01/08 03:28:26 misho Exp $
+* $Id: hooks.c,v 1.3.4.2 2012/01/24 14:04:58 misho Exp $
 *
 **************************************************************************
 The ELWIX and AITNET software is distributed under the following
@@ -244,8 +244,8 @@ sched_hook_fetch(void *root, void *arg __unused)
 	struct sched_IO *io;
 	sched_root_task_t *r = root;
 	sched_task_t *task;
-	struct timeval now, m, mtmp;
-	struct timespec nw, *timeout;
+	struct timespec now, m, mtmp;
+	struct timespec *timeout;
 	struct kevent evt[1], res[KQ_EVENTS];
 	register int i;
 	int en;
@@ -293,21 +293,19 @@ retry:
 	}
 
 #ifdef TIMER_WITHOUT_SORT
-	clock_gettime(CLOCK_MONOTONIC, &nw);
-	now.tv_sec = nw.tv_sec;
-	now.tv_usec = nw.tv_nsec / 1000;
+	clock_gettime(CLOCK_MONOTONIC, &now);
 
-	timerclear(&r->root_wait);
+	timespecclear(&r->root_wait);
 	TAILQ_FOREACH(task, &r->root_timer, task_node) {
-		if (!timerisset(&r->root_wait))
-			r->root_wait = TASK_TV(task);
-		else if (timercmp(&TASK_TV(task), &r->root_wait, -) < 0)
-			r->root_wait = TASK_TV(task);
+		if (!timespecisset(&r->root_wait))
+			r->root_wait = TASK_TS(task);
+		else if (timespeccmp(&TASK_TS(task), &r->root_wait, -) < 0)
+			r->root_wait = TASK_TS(task);
 	}
 
 	if (TAILQ_FIRST(&r->root_timer)) {
 		m = r->root_wait;
-		timersub(&m, &now, &mtmp);
+		timespecsub(&m, &now, &mtmp);
 		r->root_wait = mtmp;
 	} else {
 		/* set wait INFTIM */
@@ -315,27 +313,23 @@ retry:
 	}
 #else
 	if (!TAILQ_FIRST(&r->root_eventlo) && (task = TAILQ_FIRST(&r->root_timer))) {
-		clock_gettime(CLOCK_MONOTONIC, &nw);
-		now.tv_sec = nw.tv_sec;
-		now.tv_usec = nw.tv_nsec / 1000;
+		clock_gettime(CLOCK_MONOTONIC, &now);
 
-		m = TASK_TV(task);
-		timersub(&m, &now, &mtmp);
+		m = TASK_TS(task);
+		timespecsub(&m, &now, &mtmp);
 		r->root_wait = mtmp;
 	} else {
 		/* set wait INFTIM */
-		r->root_wait.tv_sec = r->root_wait.tv_usec = -1;
+		r->root_wait.tv_sec = r->root_wait.tv_nsec = -1;
 	}
 #endif
 	/* if present member of eventLo, set NOWAIT */
 	if (TAILQ_FIRST(&r->root_eventlo))
-		timerclear(&r->root_wait);
+		timespecclear(&r->root_wait);
 
-	if (r->root_wait.tv_sec != -1 && r->root_wait.tv_usec != -1) {
-		nw.tv_sec = r->root_wait.tv_sec;
-		nw.tv_nsec = r->root_wait.tv_usec * 1000;
-		timeout = &nw;
-	} else	/* wait INFTIM */
+	if (r->root_wait.tv_sec != -1 && r->root_wait.tv_nsec != -1)
+		timeout = &r->root_wait;
+	else	/* wait INFTIM */
 		timeout = NULL;
 	if ((en = kevent(r->root_kq, NULL, 0, res, KQ_EVENTS, timeout)) == -1) {
 		if (r->root_hooks.hook_exec.exception) {
@@ -352,7 +346,7 @@ retry:
 #endif
 	}
 
-	nw.tv_sec = nw.tv_nsec = 0;
+	now.tv_sec = now.tv_nsec = 0;
 	/* Go and catch the cat into pipes ... */
 	for (i = 0; i < en; i++) {
 		memcpy(evt, &res[i], sizeof evt);
@@ -456,7 +450,7 @@ retry:
 				}
 				break;
 		}
-		if (kevent(r->root_kq, evt, 1, NULL, 0, &nw) == -1) {
+		if (kevent(r->root_kq, evt, 1, NULL, 0, &now) == -1) {
 			if (r->root_hooks.hook_exec.exception) {
 				if (r->root_hooks.hook_exec.exception(r, NULL))
 					return NULL;
@@ -466,12 +460,10 @@ retry:
 	}
 
 	/* timer update & put in ready queue */
-	clock_gettime(CLOCK_MONOTONIC, &nw);
-	now.tv_sec = nw.tv_sec;
-	now.tv_usec = nw.tv_nsec / 1000;
+	clock_gettime(CLOCK_MONOTONIC, &now);
 
 	TAILQ_FOREACH(task, &r->root_timer, task_node)
-		if (timercmp(&now, &TASK_TV(task), -) >= 0) {
+		if (timespeccmp(&now, &TASK_TS(task), -) >= 0) {
 #ifdef HAVE_LIBPTHREAD
 			pthread_mutex_lock(&r->root_mtx[taskTIMER]);
 #endif