--- libaitsched/src/hooks.c	2012/05/10 14:44:22	1.5.2.3
+++ libaitsched/src/hooks.c	2012/05/30 08:07:45	1.6.4.1
@@ -3,7 +3,7 @@
 *  by Michael Pounov <misho@openbsd-bg.org>
 *
 * $Author: misho $
-* $Id: hooks.c,v 1.5.2.3 2012/05/10 14:44:22 misho Exp $
+* $Id: hooks.c,v 1.6.4.1 2012/05/30 08:07:45 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,45 @@ 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, 0, (intptr_t) ident);
+#else
+	EV_SET(&chg[0], ident, EVFILT_TIMER, EV_ADD | EV_ONESHOT, 0, 0, (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
@@ -212,12 +264,13 @@ void *
 sched_hook_fetch(void *root, void *arg __unused)
 {
 	sched_root_task_t *r = root;
-	sched_task_t *task;
+	sched_task_t *task, *tmp;
 	struct timespec now, m, mtmp;
 	struct timespec *timeout;
 	struct kevent evt[1], res[KQ_EVENTS];
 	register int i;
 	int en;
+	uintptr_t ident;
 
 	if (!r)
 		return NULL;
@@ -318,7 +371,7 @@ sched_hook_fetch(void *root, void *arg __unused)
 		/* Put read/write task to ready queue */
 		switch (res[i].filter) {
 			case EVFILT_READ:
-				TAILQ_FOREACH(task, &r->root_read, task_node) {
+				TAILQ_FOREACH_SAFE(task, &r->root_read, task_node, tmp) {
 					if (TASK_FD(task) != ((intptr_t) res[i].udata))
 						continue;
 					/* remove read handle */
@@ -363,7 +416,7 @@ sched_hook_fetch(void *root, void *arg __unused)
 				}
 				break;
 			case EVFILT_WRITE:
-				TAILQ_FOREACH(task, &r->root_write, task_node) {
+				TAILQ_FOREACH_SAFE(task, &r->root_write, task_node, tmp) {
 					if (TASK_FD(task) != ((intptr_t) res[i].udata))
 						continue;
 					/* remove write handle */
@@ -407,6 +460,33 @@ sched_hook_fetch(void *root, void *arg __unused)
 					break;
 				}
 				break;
+			case EVFILT_TIMER:
+				if (TASK_DATA(task))
+					ident = (uintptr_t) TASK_DATA(task);
+				else
+					ident = (uintptr_t) TASK_FUNC(task);
+				TAILQ_FOREACH_SAFE(task, &r->root_alarm, task_node, tmp) {
+					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;
 		}
 		if (kevent(r->root_kq, evt, 1, NULL, 0, &now) == -1) {
 			if (r->root_hooks.hook_exec.exception) {
@@ -420,7 +500,7 @@ sched_hook_fetch(void *root, void *arg __unused)
 	/* timer update & put in ready queue */
 	clock_gettime(CLOCK_MONOTONIC, &now);
 
-	TAILQ_FOREACH(task, &r->root_timer, task_node)
+	TAILQ_FOREACH_SAFE(task, &r->root_timer, task_node, tmp)
 		if (sched_timespeccmp(&now, &TASK_TS(task), -) >= 0) {
 #ifdef HAVE_LIBPTHREAD
 			pthread_mutex_lock(&r->root_mtx[taskTIMER]);