--- libaitsched/src/aitsched.c	2012/08/08 08:25:39	1.13
+++ libaitsched/src/aitsched.c	2012/08/23 00:31:41	1.15.2.3
@@ -3,7 +3,7 @@
 *  by Michael Pounov <misho@openbsd-bg.org>
 *
 * $Author: misho $
-* $Id: aitsched.c,v 1.13 2012/08/08 08:25:39 misho Exp $
+* $Id: aitsched.c,v 1.15.2.3 2012/08/23 00:31:41 misho Exp $
 *
 **************************************************************************
 The ELWIX and AITNET software is distributed under the following
@@ -108,6 +108,9 @@ schedRegisterHooks(sched_root_task_t * __restrict root
 #ifdef EVFILT_USER
 	root->root_hooks.hook_add.user = sched_hook_user;
 #endif
+#ifdef HAVE_LIBPTHREAD
+	root->root_hooks.hook_add.thread = sched_hook_thread;
+#endif
 
 	root->root_hooks.hook_exec.cancel = sched_hook_cancel;
 	root->root_hooks.hook_exec.fetch = sched_hook_fetch;
@@ -118,6 +121,16 @@ schedRegisterHooks(sched_root_task_t * __restrict root
 	return 0;
 }
 
+#ifdef HAVE_LIBPTHREAD
+static void
+_sched_threadChild()
+{
+	pthread_setcancelstate(PTHREAD_CANCEL_ENABLE, NULL);
+	pthread_setcanceltype(PTHREAD_CANCEL_ASYNCHRONOUS, NULL);
+	pthread_testcancel();
+}
+#endif
+
 /*
  * schedInit() - Init scheduler
  *
@@ -175,8 +188,11 @@ schedInit(void ** __restrict data, size_t datlen)
 		TAILQ_INIT(&root->root_suspend);
 		TAILQ_INIT(&root->root_ready);
 		TAILQ_INIT(&root->root_unuse);
+		TAILQ_INIT(&root->root_thread);
 
 #ifdef HAVE_LIBPTHREAD
+		pthread_atfork(NULL, NULL, _sched_threadChild);
+
 		for (i = 0; i < taskMAX; i++)
 			pthread_mutex_unlock(&root->root_mtx[i]);
 #endif
@@ -238,12 +254,14 @@ schedEnd(sched_root_task_t ** __restrict root)
 		schedCancel(task);
 	TAILQ_FOREACH_SAFE(task, &(*root)->root_event, task_node, tmp)
 		schedCancel(task);
-	TAILQ_FOREACH_SAFE(task, &(*root)->root_task, task_node, tmp)
-		schedCancel(task);
 	TAILQ_FOREACH_SAFE(task, &(*root)->root_suspend, task_node, tmp)
 		schedCancel(task);
 	TAILQ_FOREACH_SAFE(task, &(*root)->root_ready, task_node, tmp)
 		schedCancel(task);
+	TAILQ_FOREACH_SAFE(task, &(*root)->root_thread, task_node, tmp)
+		schedCancel(task);
+	TAILQ_FOREACH_SAFE(task, &(*root)->root_task, task_node, tmp)
+		schedCancel(task);
 
 #ifdef HAVE_LIBPTHREAD
 	pthread_mutex_lock(&(*root)->root_mtx[taskUNUSE]);
@@ -408,6 +426,9 @@ schedCancel(sched_task_t * __restrict task)
 		case taskREADY:
 			queue = &TASK_ROOT(task)->root_ready;
 			break;
+		case taskTHREAD:
+			queue = &TASK_ROOT(task)->root_thread;
+			break;
 		default:
 			queue = NULL;
 	}
@@ -421,7 +442,7 @@ schedCancel(sched_task_t * __restrict task)
 #endif
 	}
 	if (TASK_TYPE(task) != taskUNUSE)
-		_sched_unuseTask(task);
+		sched_unuseTask(task);
 
 	return 0;
 }
@@ -477,6 +498,8 @@ schedCancelby(sched_root_task_t * __restrict root, sch
 			return -2;
 		if (schedCancelby(root, taskREADY, criteria, param, hook))
 			return -2;
+		if (schedCancelby(root, taskTHREAD, criteria, param, hook))
+			return -2;
 		return 0;
 	}
 	/* choosen queue */
@@ -523,6 +546,9 @@ schedCancelby(sched_root_task_t * __restrict root, sch
 		case taskREADY:
 			queue = &root->root_ready;
 			break;
+		case taskTHREAD:
+			queue = &root->root_thread;
+			break;
 		default:
 			return 0;
 	}
@@ -583,7 +609,7 @@ schedCancelby(sched_root_task_t * __restrict root, sch
 
 			TAILQ_REMOVE(queue, task, task_node);
 			if (TASK_TYPE(task) != taskUNUSE)
-				_sched_unuseTask(task);
+				sched_unuseTask(task);
 
 			flg ^= flg;	/* ok */
 		}
@@ -678,23 +704,6 @@ schedTermCondition(sched_root_task_t * __restrict root
 
 	root->root_cond = condValue;
 	root->root_hooks.hook_exec.condition = sched_hook_condition;
-	return 0;
-}
-
-/*
- * schedMissEvents() - Set new miss events rate for regular tasks
- *
- * @root = root task
- * @missEvents = maximum number of missed events before firing tasks
- * return: -1 error or 0 ok
- */
-inline int
-schedMissEvents(sched_root_task_t * __restrict root, u_int missEvents)
-{
-	if (!root)
-		return -1;
-
-	root->root_miss = missEvents;
 	return 0;
 }