--- libaitsched/src/hooks.c	2013/08/15 18:14:54	1.18.4.3
+++ libaitsched/src/hooks.c	2013/08/15 18:39:00	1.18.4.4
@@ -3,7 +3,7 @@
 *  by Michael Pounov <misho@openbsd-bg.org>
 *
 * $Author: misho $
-* $Id: hooks.c,v 1.18.4.3 2013/08/15 18:14:54 misho Exp $
+* $Id: hooks.c,v 1.18.4.4 2013/08/15 18:39:00 misho Exp $
 *
 **************************************************************************
 The ELWIX and AITNET software is distributed under the following
@@ -215,9 +215,8 @@ sched_hook_cancel(void *task, void *arg __unused)
 #endif
 			return NULL;
 		case taskRTC:
-			timer_delete(*(timer_t*) TASK_DATLEN(t));
+			timer_delete((timer_t) TASK_FLAG(t));
 			schedCancel((sched_task_t*) TASK_RET(t));
-			free((void*) TASK_DATLEN(t));
 			return NULL;
 		default:
 			return NULL;
@@ -646,7 +645,7 @@ sched_hook_fetch(void *root, void *arg __unused)
 					else {
 						flg++;
 						TASK_RET(task) = res[i].data;
-						TASK_FLAG(task) = res[i].fflags;
+						TASK_FLAG(task) = (u_long) res[i].fflags;
 					}
 					/* remove read handle */
 #ifdef HAVE_LIBPTHREAD
@@ -699,7 +698,7 @@ sched_hook_fetch(void *root, void *arg __unused)
 					else {
 						flg++;
 						TASK_RET(task) = res[i].data;
-						TASK_FLAG(task) = res[i].fflags;
+						TASK_FLAG(task) = (u_long) res[i].fflags;
 					}
 					/* remove write handle */
 #ifdef HAVE_LIBPTHREAD
@@ -752,7 +751,7 @@ sched_hook_fetch(void *root, void *arg __unused)
 					else {
 						flg++;
 						TASK_RET(task) = res[i].data;
-						TASK_FLAG(task) = res[i].fflags;
+						TASK_FLAG(task) = (u_long) res[i].fflags;
 					}
 					/* remove alarm handle */
 #ifdef HAVE_LIBPTHREAD
@@ -783,7 +782,7 @@ sched_hook_fetch(void *root, void *arg __unused)
 					else {
 						flg++;
 						TASK_RET(task) = res[i].data;
-						TASK_FLAG(task) = res[i].fflags;
+						TASK_FLAG(task) = (u_long) res[i].fflags;
 					}
 					/* remove node handle */
 #ifdef HAVE_LIBPTHREAD
@@ -814,7 +813,7 @@ sched_hook_fetch(void *root, void *arg __unused)
 					else {
 						flg++;
 						TASK_RET(task) = res[i].data;
-						TASK_FLAG(task) = res[i].fflags;
+						TASK_FLAG(task) = (u_long) res[i].fflags;
 					}
 					/* remove proc handle */
 #ifdef HAVE_LIBPTHREAD
@@ -845,7 +844,7 @@ sched_hook_fetch(void *root, void *arg __unused)
 					else {
 						flg++;
 						TASK_RET(task) = res[i].data;
-						TASK_FLAG(task) = res[i].fflags;
+						TASK_FLAG(task) = (u_long) res[i].fflags;
 					}
 					/* remove signal handle */
 #ifdef HAVE_LIBPTHREAD
@@ -878,7 +877,7 @@ sched_hook_fetch(void *root, void *arg __unused)
 					else {
 						flg++;
 						TASK_RET(task) = res[i].data;
-						TASK_FLAG(task) = res[i].fflags;
+						TASK_FLAG(task) = (u_long) res[i].fflags;
 					}
 					/* remove user handle */
 #ifdef HAVE_LIBPTHREAD
@@ -920,7 +919,7 @@ sched_hook_fetch(void *root, void *arg __unused)
 					else {
 						flg++;
 						TASK_RET(task) = res[i].data;
-						TASK_FLAG(task) = res[i].fflags;
+						TASK_FLAG(task) = (u_long) res[i].fflags;
 					}
 					/* remove user handle */
 #ifdef HAVE_LIBPTHREAD
@@ -970,7 +969,7 @@ sched_hook_fetch(void *root, void *arg __unused)
 					else {
 						flg++;
 						TASK_RET(task) = res[i].data;
-						TASK_FLAG(task) = res[i].fflags;
+						TASK_FLAG(task) = (u_long) res[i].fflags;
 					}
 					/* remove user handle */
 #ifdef HAVE_LIBPTHREAD
@@ -1137,44 +1136,32 @@ sched_hook_rtc(void *task, void *arg __unused)
 	sched_task_t *sigt = NULL, *t = task;
 	struct itimerspec its;
 	struct sigevent evt;
-	timer_t *tmr = NULL;
+	timer_t tmr;
 
 	if (!t || !TASK_ROOT(t))
 		return (void*) -1;
 
-	tmr = malloc(sizeof(timer_t));
-	if (!tmr) {
-		if (TASK_ROOT(t)->root_hooks.hook_exec.exception)
-			TASK_ROOT(t)->root_hooks.hook_exec.exception(TASK_ROOT(t), NULL);
-		else
-			LOGERR;
-		return (void*) -1;
-	}
-
 	memset(&evt, 0, sizeof evt);
 	evt.sigev_notify = SIGEV_SIGNAL;
-	evt.sigev_signo = (int) TASK_DATA(t) + SIGRTMIN;
-	evt.sigev_value.sival_ptr = tmr;
+	evt.sigev_signo = TASK_DATLEN(t) + SIGRTMIN;
+	evt.sigev_value.sival_ptr = TASK_DATA(t);
 
-	if (timer_create((clockid_t) TASK_DATA(t), &evt, evt.sigev_value.sival_ptr) == -1) {
+	if (timer_create(CLOCK_MONOTONIC, &evt, &tmr) == -1) {
 		if (TASK_ROOT(t)->root_hooks.hook_exec.exception)
 			TASK_ROOT(t)->root_hooks.hook_exec.exception(TASK_ROOT(t), NULL);
 		else
 			LOGERR;
-		if (tmr)
-			free(tmr);
 		return (void*) -1;
 	} else
-		TASK_DATLEN(t) = (size_t) tmr;
+		TASK_FLAG(t) = (u_long) tmr;
 
 	if (!(sigt = schedSignal(TASK_ROOT(t), TASK_FUNC(t), TASK_ARG(t), evt.sigev_signo, 
-				TASK_DATA(t), TASK_DATLEN(t)))) {
+				TASK_DATA(t), (size_t) tmr))) {
 		if (TASK_ROOT(t)->root_hooks.hook_exec.exception)
 			TASK_ROOT(t)->root_hooks.hook_exec.exception(TASK_ROOT(t), NULL);
 		else
 			LOGERR;
-		timer_delete(*tmr);
-		free(tmr);
+		timer_delete(tmr);
 		return (void*) -1;
 	} else
 		TASK_RET(t) = (uintptr_t) sigt;
@@ -1183,14 +1170,13 @@ sched_hook_rtc(void *task, void *arg __unused)
 	its.it_value.tv_sec = t->task_val.ts.tv_sec;
 	its.it_value.tv_nsec = t->task_val.ts.tv_nsec;
 
-	if (timer_settime(*tmr, 0, &its, NULL) == -1) {
+	if (timer_settime(tmr, TIMER_ABSTIME, &its, NULL) == -1) {
 		if (TASK_ROOT(t)->root_hooks.hook_exec.exception)
 			TASK_ROOT(t)->root_hooks.hook_exec.exception(TASK_ROOT(t), NULL);
 		else
 			LOGERR;
 		schedCancel(sigt);
-		timer_delete(*tmr);
-		free(tmr);
+		timer_delete(tmr);
 		return (void*) -1;
 	}