--- libaitsched/src/hooks.c	2012/05/14 12:09:13	1.6
+++ libaitsched/src/hooks.c	2012/05/30 08:34:44	1.6.4.2
@@ -3,7 +3,7 @@
 *  by Michael Pounov <misho@openbsd-bg.org>
 *
 * $Author: misho $
-* $Id: hooks.c,v 1.6 2012/05/14 12:09:13 misho Exp $
+* $Id: hooks.c,v 1.6.4.2 2012/05/30 08:34:44 misho Exp $
 *
 **************************************************************************
 The ELWIX and AITNET software is distributed under the following
@@ -107,6 +107,7 @@ sched_hook_cancel(void *task, void *arg __unused)
 	sched_task_t *t = task;
 	struct kevent chg[1];
 	struct timespec timeout = { 0, 0 };
+	uintptr_t ident;
 
 	if (!t || !TASK_ROOT(t))
 		return (void*) -1;
@@ -128,6 +129,18 @@ sched_hook_cancel(void *task, void *arg __unused)
 #endif
 			kevent(TASK_ROOT(t)->root_kq, chg, 1, NULL, 0, &timeout);
 			break;
+		case taskALARM:
+			if (TASK_DATA(t))
+				ident = (uintptr_t) TASK_DATA(t);
+			else
+				ident = (uintptr_t) TASK_FUNC(t);
+#ifdef __NetBSD__
+			EV_SET(&chg[0], ident, EVFILT_TIMER, EV_DELETE, 0, 0, (intptr_t) ident);
+#else
+			EV_SET(&chg[0], ident, EVFILT_TIMER, EV_DELETE, 0, 0, (void*) ident);
+#endif
+			kevent(TASK_ROOT(t)->root_kq, chg, 1, NULL, 0, &timeout);
+			break;
 		default:
 			break;
 	}
@@ -202,6 +215,49 @@ sched_hook_write(void *task, void *arg __unused)
 }
 
 /*
+ * sched_hook_alarm() - Default ALARM hook
+ *
+ * @task = current task
+ * @arg = unused
+ * return: <0 errors and 0 ok
+ */
+void *
+sched_hook_alarm(void *task, void *arg __unused)
+{
+	sched_task_t *t = task;
+	struct kevent chg[1];
+	struct timespec timeout = { 0, 0 };
+	uintptr_t ident;
+
+	if (!t || !TASK_ROOT(t))
+		return (void*) -1;
+
+	if (TASK_DATA(t))
+		ident = (uintptr_t) TASK_DATA(t);
+	else
+		ident = (uintptr_t) TASK_FUNC(t);
+
+#ifdef __NetBSD__
+	EV_SET(&chg[0], ident, EVFILT_TIMER, EV_ADD | EV_ONESHOT, 0, 
+			t->task_val.ts.tv_sec * 1000 + t->task_val.ts.tv_nsec / 1000000, 
+			(intptr_t) ident);
+#else
+	EV_SET(&chg[0], ident, EVFILT_TIMER, EV_ADD | EV_ONESHOT, 0, 
+			t->task_val.ts.tv_sec * 1000 + t->task_val.ts.tv_nsec / 1000000, 
+			(void*) ident);
+#endif
+	if (kevent(TASK_ROOT(t)->root_kq, chg, 1, NULL, 0, &timeout) == -1) {
+		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;
+	}
+
+	return NULL;
+}
+
+/*
  * sched_hook_fetch() - Default FETCH hook
  *
  * @root = root task
@@ -218,6 +274,7 @@ sched_hook_fetch(void *root, void *arg __unused)
 	struct kevent evt[1], res[KQ_EVENTS];
 	register int i;
 	int en;
+	uintptr_t ident;
 
 	if (!r)
 		return NULL;
@@ -404,6 +461,33 @@ sched_hook_fetch(void *root, void *arg __unused)
 						pthread_mutex_unlock(&r->root_mtx[taskREADY]);
 #endif
 					}
+					break;
+				}
+				break;
+			case EVFILT_TIMER:
+				TAILQ_FOREACH_SAFE(task, &r->root_alarm, task_node, tmp) {
+					if (TASK_DATA(task))
+						ident = (uintptr_t) TASK_DATA(task);
+					else
+						ident = (uintptr_t) TASK_FUNC(task);
+					if (ident != ((uintptr_t) res[i].udata))
+						continue;
+					/* remove alarm handle */
+#ifdef HAVE_LIBPTHREAD
+					pthread_mutex_lock(&r->root_mtx[taskALARM]);
+#endif
+					TAILQ_REMOVE(&r->root_alarm, task, task_node);
+#ifdef HAVE_LIBPTHREAD
+					pthread_mutex_unlock(&r->root_mtx[taskALARM]);
+#endif
+					task->task_type = taskREADY;
+#ifdef HAVE_LIBPTHREAD
+					pthread_mutex_lock(&r->root_mtx[taskREADY]);
+#endif
+					TAILQ_INSERT_TAIL(&r->root_ready, task, task_node);
+#ifdef HAVE_LIBPTHREAD
+					pthread_mutex_unlock(&r->root_mtx[taskREADY]);
+#endif
 					break;
 				}
 				break;