--- libaitsched/src/hooks.c	2012/01/24 14:51:03	1.3.4.3
+++ libaitsched/src/hooks.c	2012/04/24 13:29:28	1.5.2.1
@@ -3,7 +3,7 @@
 *  by Michael Pounov <misho@openbsd-bg.org>
 *
 * $Author: misho $
-* $Id: hooks.c,v 1.3.4.3 2012/01/24 14:51:03 misho Exp $
+* $Id: hooks.c,v 1.5.2.1 2012/04/24 13:29:28 misho Exp $
 *
 **************************************************************************
 The ELWIX and AITNET software is distributed under the following
@@ -12,7 +12,7 @@ terms:
 All of the documentation and software included in the ELWIX and AITNET
 Releases is copyrighted by ELWIX - Sofia/Bulgaria <info@elwix.org>
 
-Copyright 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011
+Copyright 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012
 	by Michael Pounov <misho@elwix.org>.  All rights reserved.
 
 Redistribution and use in source and binary forms, with or without
@@ -49,6 +49,7 @@ SUCH DAMAGE.
 
 /*
  * sched_hook_init() - Default INIT hook
+ *
  * @root = root task
  * @data = optional data if !=NULL
  * return: <0 errors and 0 ok
@@ -81,6 +82,7 @@ sched_hook_init(void *root, void *data)
 
 /*
  * sched_hook_fini() - Default FINI hook
+ *
  * @root = root task
  * @arg = unused
  * return: <0 errors and 0 ok
@@ -109,6 +111,7 @@ sched_hook_fini(void *root, void *arg __unused)
 
 /*
  * sched_hook_cancel() - Default CANCEL hook
+ *
  * @task = current task
  * @arg = unused
  * return: <0 errors and 0 ok
@@ -154,6 +157,7 @@ sched_hook_cancel(void *task, void *arg __unused)
 
 /*
  * sched_hook_read() - Default READ hook
+ *
  * @task = current task
  * @arg = unused
  * return: <0 errors and 0 ok
@@ -194,6 +198,7 @@ sched_hook_read(void *task, void *arg __unused)
 
 /*
  * sched_hook_write() - Default WRITE hook
+ *
  * @task = current task
  * @arg = unused
  * return: <0 errors and 0 ok
@@ -234,6 +239,7 @@ sched_hook_write(void *task, void *arg __unused)
 
 /*
  * sched_hook_fetch() - Default FETCH hook
+ *
  * @root = root task
  * @arg = unused
  * return: NULL error or !=NULL fetched task
@@ -295,41 +301,41 @@ retry:
 #ifdef TIMER_WITHOUT_SORT
 	clock_gettime(CLOCK_MONOTONIC, &now);
 
-	timespecclear(&r->root_wait);
+	sched_timespecclear(&r->root_wait);
 	TAILQ_FOREACH(task, &r->root_timer, task_node) {
-		if (!timespecisset(&r->root_wait))
+		if (!sched_timespecisset(&r->root_wait))
 			r->root_wait = TASK_TS(task);
-		else if (timespeccmp(&TASK_TS(task), &r->root_wait, -) < 0)
+		else if (sched_timespeccmp(&TASK_TS(task), &r->root_wait, -) < 0)
 			r->root_wait = TASK_TS(task);
 	}
 
 	if (TAILQ_FIRST(&r->root_timer)) {
 		m = r->root_wait;
-		timespecsub(&m, &now, &mtmp);
+		sched_timespecsub(&m, &now, &mtmp);
 		r->root_wait = mtmp;
 	} else {
 		/* set wait INFTIM */
-		r->root_wait.tv_sec = r->root_wait.tv_nsec = -1;
+		sched_timespecinf(&r->root_wait);
 	}
 #else
 	if (!TAILQ_FIRST(&r->root_eventlo) && (task = TAILQ_FIRST(&r->root_timer))) {
 		clock_gettime(CLOCK_MONOTONIC, &now);
 
 		m = TASK_TS(task);
-		timespecsub(&m, &now, &mtmp);
+		sched_timespecsub(&m, &now, &mtmp);
 		r->root_wait = mtmp;
 	} else {
 		/* set wait INFTIM */
-		r->root_wait.tv_sec = r->root_wait.tv_nsec = -1;
+		sched_timespecinf(&r->root_wait);
 	}
 #endif
 	/* if present member of eventLo, set NOWAIT */
 	if (TAILQ_FIRST(&r->root_eventlo))
-		timespecclear(&r->root_wait);
+		sched_timespecclear(&r->root_wait);
 
 	if (r->root_wait.tv_sec != -1 && r->root_wait.tv_nsec != -1)
 		timeout = &r->root_wait;
-	else if (r->root_poll.tv_sec == -1 && r->root_poll.tv_nsec == -1)
+	else if (sched_timespecisinf(&r->root_poll))
 		timeout = NULL;
 	else
 		timeout = &r->root_poll;
@@ -465,7 +471,7 @@ retry:
 	clock_gettime(CLOCK_MONOTONIC, &now);
 
 	TAILQ_FOREACH(task, &r->root_timer, task_node)
-		if (timespeccmp(&now, &TASK_TS(task), -) >= 0) {
+		if (sched_timespeccmp(&now, &TASK_TS(task), -) >= 0) {
 #ifdef HAVE_LIBPTHREAD
 			pthread_mutex_lock(&r->root_mtx[taskTIMER]);
 #endif
@@ -510,8 +516,10 @@ retry:
 		r->root_eventlo_miss = 0;
 
 	/* OK, lets get ready task !!! */
-	if (!(task = TAILQ_FIRST(&r->root_ready)))
-		goto retry;
+	task = TAILQ_FIRST(&r->root_ready);
+	if (!(task))
+		return NULL;
+
 #ifdef HAVE_LIBPTHREAD
 	pthread_mutex_lock(&r->root_mtx[taskREADY]);
 #endif
@@ -532,6 +540,7 @@ retry:
 
 /*
  * sched_hook_exception() - Default EXCEPTION hook
+ *
  * @root = root task
  * @arg = custom handling: if arg == EV_EOF or other value; default: arg == NULL log errno
  * return: <0 errors and 0 ok
@@ -558,4 +567,22 @@ sched_hook_exception(void *root, void *arg)
 	/* default case! */
 	LOGERR;
 	return NULL;
+}
+
+/*
+ * sched_hook_condition() - Default CONDITION hook
+ *
+ * @root = root task
+ * @arg = killState from schedRun()
+ * return: NULL kill scheduler loop or !=NULL ok
+ */
+void *
+sched_hook_condition(void *root, void *arg)
+{
+	sched_root_task_t *r = root;
+
+	if (!r || !ROOT_DATA(r) || !ROOT_DATLEN(r))
+		return NULL;
+
+	return (void*) (r->root_cond - *(intptr_t*) arg);
 }