--- libaitsched/src/hooks.c	2013/08/15 18:43:44	1.18.4.5
+++ 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.5 2013/08/15 18:43:44 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_FLAG(t));
 			schedCancel((sched_task_t*) TASK_RET(t));
 			return NULL;
+#endif	/* HAVE_TIMER_CREATE */
 		default:
 			return NULL;
 	}
@@ -1130,6 +1132,7 @@ 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)
 {
@@ -1143,7 +1146,7 @@ sched_hook_rtc(void *task, void *arg __unused)
 
 	memset(&evt, 0, sizeof evt);
 	evt.sigev_notify = SIGEV_SIGNAL;
-	evt.sigev_signo = TASK_DATLEN(t) + SIGRTMIN;
+	evt.sigev_signo = (intptr_t) TASK_DATA(t) + SIGRTMIN;
 	evt.sigev_value.sival_ptr = TASK_DATA(t);
 
 	if (timer_create(CLOCK_MONOTONIC, &evt, &tmr) == -1) {
@@ -1155,8 +1158,8 @@ sched_hook_rtc(void *task, void *arg __unused)
 	} else
 		TASK_FLAG(t) = (u_long) tmr;
 
-	if (!(sigt = schedSignal(TASK_ROOT(t), TASK_FUNC(t), TASK_ARG(t), evt.sigev_signo, 
-				TASK_DATA(t), (size_t) tmr))) {
+	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
@@ -1180,5 +1183,9 @@ sched_hook_rtc(void *task, void *arg __unused)
 		return (void*) -1;
 	}
 
+	if (!TASK_ISLOCKED(t))
+		TASK_LOCK(t);
+
 	return NULL;
 }
+#endif	/* HAVE_TIMER_CREATE */