--- libaitsched/src/hooks.c	2013/08/15 17:58:31	1.18.4.2
+++ libaitsched/src/hooks.c	2013/08/26 14:29:20	1.21.4.1
@@ -3,7 +3,7 @@
 *  by Michael Pounov <misho@openbsd-bg.org>
 *
 * $Author: misho $
-* $Id: hooks.c,v 1.18.4.2 2013/08/15 17:58:31 misho Exp $
+* $Id: hooks.c,v 1.21.4.1 2013/08/26 14:29:20 misho Exp $
 *
 **************************************************************************
 The ELWIX and AITNET software is distributed under the following
@@ -208,16 +208,18 @@ sched_hook_cancel(void *task, void *arg __unused)
 			EV_SET(&chg[0], TASK_VAL(t), EVFILT_USER, EV_DELETE, 0, 0, (void*) TASK_VAL(t));
 #endif
 			break;
-#endif
+#endif	/* EVFILT_USER */
 		case taskTHREAD:
 #ifdef HAVE_LIBPTHREAD
 			pthread_cancel((pthread_t) TASK_VAL(t));
 #endif
 			return NULL;
+#if defined(HAVE_TIMER_CREATE) && defined(HAVE_TIMER_SETTIME)
 		case taskRTC:
-			timer_delete((timer_t) TASK_DATLEN(t));
+			timer_delete((timer_t) TASK_FLAG(t));
 			schedCancel((sched_task_t*) TASK_RET(t));
 			return NULL;
+#endif	/* HAVE_TIMER_CREATE */
 		default:
 			return NULL;
 	}
@@ -645,7 +647,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
@@ -698,7 +700,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
@@ -751,7 +753,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
@@ -782,7 +784,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
@@ -813,7 +815,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
@@ -844,7 +846,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
@@ -877,7 +879,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
@@ -919,7 +921,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
@@ -969,7 +971,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
@@ -1130,50 +1132,39 @@ sched_hook_condition(void *root, void *arg)
  * @arg = unused
  * return: <0 errors and 0 ok
  */
+#if defined(HAVE_TIMER_CREATE) && defined(HAVE_TIMER_SETTIME)
 void *
 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 = (intptr_t) TASK_DATA(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)))) {
+	if (!(sigt = schedSignal(TASK_ROOT(t), _sched_rtcWrapper, TASK_ARG(t), evt.sigev_signo, 
+				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;
@@ -1182,16 +1173,19 @@ 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_RELTIME, &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;
 	}
 
+	if (!TASK_ISLOCKED(t))
+		TASK_LOCK(t);
+
 	return NULL;
 }
+#endif	/* HAVE_TIMER_CREATE */