--- libaitsched/src/hooks.c	2013/05/30 09:13:52	1.17
+++ libaitsched/src/hooks.c	2013/08/15 18:14:54	1.18.4.3
@@ -3,7 +3,7 @@
 *  by Michael Pounov <misho@openbsd-bg.org>
 *
 * $Author: misho $
-* $Id: hooks.c,v 1.17 2013/05/30 09:13:52 misho Exp $
+* $Id: hooks.c,v 1.18.4.3 2013/08/15 18:14:54 misho Exp $
 *
 **************************************************************************
 The ELWIX and AITNET software is distributed under the following
@@ -162,6 +162,8 @@ sched_hook_cancel(void *task, void *arg __unused)
 #else
 			EV_SET(&chg[0], TASK_VAL(t), EVFILT_SIGNAL, EV_DELETE, 0, 0, (void*) TASK_VAL(t));
 #endif
+			/* restore signal */
+			signal(TASK_VAL(t), SIG_DFL);
 			break;
 #ifdef AIO_SUPPORT
 		case taskAIO:
@@ -211,6 +213,12 @@ sched_hook_cancel(void *task, void *arg __unused)
 #ifdef HAVE_LIBPTHREAD
 			pthread_cancel((pthread_t) TASK_VAL(t));
 #endif
+			return NULL;
+		case taskRTC:
+			timer_delete(*(timer_t*) TASK_DATLEN(t));
+			schedCancel((sched_task_t*) TASK_RET(t));
+			free((void*) TASK_DATLEN(t));
+			return NULL;
 		default:
 			return NULL;
 	}
@@ -339,11 +347,11 @@ sched_hook_alarm(void *task, void *arg __unused)
 		return (void*) -1;
 
 #ifdef __NetBSD__
-	EV_SET(&chg[0], (uintptr_t) TASK_DATA(t), EVFILT_TIMER, EV_ADD | EV_ONESHOT, 0, 
+	EV_SET(&chg[0], (uintptr_t) TASK_DATA(t), EVFILT_TIMER, EV_ADD | EV_CLEAR, 0, 
 			t->task_val.ts.tv_sec * 1000 + t->task_val.ts.tv_nsec / 1000000, 
 			(intptr_t) TASK_DATA(t));
 #else
-	EV_SET(&chg[0], (uintptr_t) TASK_DATA(t), EVFILT_TIMER, EV_ADD | EV_ONESHOT, 0, 
+	EV_SET(&chg[0], (uintptr_t) TASK_DATA(t), EVFILT_TIMER, EV_ADD | EV_CLEAR, 0, 
 			t->task_val.ts.tv_sec * 1000 + t->task_val.ts.tv_nsec / 1000000, 
 			(void*) TASK_DATA(t));
 #endif
@@ -447,10 +455,13 @@ sched_hook_signal(void *task, void *arg __unused)
 	if (!t || !TASK_ROOT(t))
 		return (void*) -1;
 
+	/* ignore signal */
+	signal(TASK_VAL(t), SIG_IGN);
+
 #ifdef __NetBSD__
-	EV_SET(&chg[0], TASK_VAL(t), EVFILT_SIGNAL, EV_ADD, 0, 0, (intptr_t) TASK_VAL(t));
+	EV_SET(&chg[0], TASK_VAL(t), EVFILT_SIGNAL, EV_ADD | EV_CLEAR, 0, 0, (intptr_t) TASK_VAL(t));
 #else
-	EV_SET(&chg[0], TASK_VAL(t), EVFILT_SIGNAL, EV_ADD, 0, 0, (void*) TASK_VAL(t));
+	EV_SET(&chg[0], TASK_VAL(t), EVFILT_SIGNAL, EV_ADD | EV_CLEAR, 0, 0, (void*) TASK_VAL(t));
 #endif
 	if (kevent(TASK_ROOT(t)->root_kq, chg, 1, NULL, 0, &timeout) == -1) {
 		if (TASK_ROOT(t)->root_hooks.hook_exec.exception)
@@ -1111,4 +1122,77 @@ sched_hook_condition(void *root, void *arg)
 		return NULL;
 
 	return (void*) (r->root_cond - *(intptr_t*) arg);
+}
+
+/*
+ * sched_hook_rtc() - Default RTC hook
+ *
+ * @task = current task
+ * @arg = unused
+ * return: <0 errors and 0 ok
+ */
+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;
+
+	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;
+
+	if (timer_create((clockid_t) TASK_DATA(t), &evt, evt.sigev_value.sival_ptr) == -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;
+
+	if (!(sigt = schedSignal(TASK_ROOT(t), TASK_FUNC(t), TASK_ARG(t), evt.sigev_signo, 
+				TASK_DATA(t), TASK_DATLEN(t)))) {
+		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);
+		return (void*) -1;
+	} else
+		TASK_RET(t) = (uintptr_t) sigt;
+
+	memset(&its, 0, sizeof its);
+	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 (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);
+		return (void*) -1;
+	}
+
+	return NULL;
 }