--- libaitsched/src/aitsched.c	2012/05/31 22:31:48	1.10
+++ libaitsched/src/aitsched.c	2012/07/24 14:06:11	1.11
@@ -3,7 +3,7 @@
 *  by Michael Pounov <misho@openbsd-bg.org>
 *
 * $Author: misho $
-* $Id: aitsched.c,v 1.10 2012/05/31 22:31:48 misho Exp $
+* $Id: aitsched.c,v 1.11 2012/07/24 14:06:11 misho Exp $
 *
 **************************************************************************
 The ELWIX and AITNET software is distributed under the following
@@ -167,6 +167,7 @@ schedInit(void ** __restrict data, size_t datlen)
 		TAILQ_INIT(&root->root_signal);
 		TAILQ_INIT(&root->root_event);
 		TAILQ_INIT(&root->root_eventlo);
+		TAILQ_INIT(&root->root_suspend);
 		TAILQ_INIT(&root->root_ready);
 		TAILQ_INIT(&root->root_unuse);
 
@@ -230,6 +231,8 @@ schedEnd(sched_root_task_t ** __restrict root)
 		schedCancel(task);
 	TAILQ_FOREACH_SAFE(task, &(*root)->root_eventlo, 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);
 
@@ -384,6 +387,9 @@ schedCancel(sched_task_t * __restrict task)
 		case taskEVENTLO:
 			queue = &TASK_ROOT(task)->root_eventlo;
 			break;
+		case taskSUSPEND:
+			queue = &TASK_ROOT(task)->root_suspend;
+			break;
 		case taskREADY:
 			queue = &TASK_ROOT(task)->root_ready;
 			break;
@@ -411,7 +417,7 @@ schedCancel(sched_task_t * __restrict task)
  * @root = root task
  * @type = cancel from queue type, if =taskMAX cancel same task from all queues
  * @criteria = find task by criteria 
- * 	[CRITERIA_ANY|CRITERIA_CALL|CRITERIA_ARG|CRITERIA_FD|CRITERIA_VAL|CRITERIA_TS|CRITERIA_DATA]
+ * 	[CRITERIA_ANY|CRITERIA_CALL|CRITERIA_ARG|CRITERIA_FD|CRITERIA_VAL|CRITERIA_ID|CRITERIA_TS|CRITERIA_DATA]
  * @param = search parameter
  * @hook = custom cleanup hook function, may be NULL
  * return: -1 error, -2 error in sub-stage cancel execution, -3 error from custom hook or 0 ok
@@ -448,6 +454,8 @@ schedCancelby(sched_root_task_t * __restrict root, sch
 			return -2;
 		if (schedCancelby(root, taskEVENTLO, criteria, param, hook))
 			return -2;
+		if (schedCancelby(root, taskSUSPEND, criteria, param, hook))
+			return -2;
 		if (schedCancelby(root, taskREADY, criteria, param, hook))
 			return -2;
 		return 0;
@@ -484,6 +492,9 @@ schedCancelby(sched_root_task_t * __restrict root, sch
 		case taskEVENTLO:
 			queue = &root->root_eventlo;
 			break;
+		case taskSUSPEND:
+			queue = &root->root_suspend;
+			break;
 		case taskREADY:
 			queue = &root->root_ready;
 			break;
@@ -512,6 +523,7 @@ schedCancelby(sched_root_task_t * __restrict root, sch
 				if (TASK_FD(task) == (intptr_t) param)
 					flg = 1;
 				break;
+			case CRITERIA_ID:
 			case CRITERIA_VAL:
 				if (TASK_VAL(task) == (u_long) param)
 					flg = 1;
@@ -642,4 +654,74 @@ schedTermCondition(sched_root_task_t * __restrict root
 	root->root_cond = condValue;
 	root->root_hooks.hook_exec.condition = sched_hook_condition;
 	return 0;
+}
+
+/*
+ * schedResumeby() - Resume suspended task
+ *
+ * @root = root task
+ * @criteria = find task by criteria 
+ * 	[CRITERIA_ANY|CRITERIA_ID|CRITERIA_DATA]
+ * @param = search parameter (sched_task_t *task| u_long id)
+ * return: -1 error or 0 resumed ok
+ */
+int
+schedResumeby(sched_root_task_t * __restrict root, u_char criteria, void *param)
+{
+	sched_task_t *task, *tmp;
+	register int flg = 0;
+
+	if (!root)
+		return -1;
+
+#ifdef HAVE_LIBPTHREAD
+	pthread_mutex_lock(&root->root_mtx[taskSUSPEND]);
+#endif
+	TAILQ_FOREACH_SAFE(task, &root->root_suspend, task_node, tmp) {
+		flg ^= flg;
+		switch (criteria) {
+			case CRITERIA_ANY:
+				flg = 1;
+				break;
+			case CRITERIA_ID:
+				if (TASK_VAL(task) == (u_long) param)
+					flg = 1;
+				break;
+			case CRITERIA_DATA:
+				if (TASK_ID(task) == (sched_task_t*) param)
+					flg = 1;
+				break;
+			default:
+				sched_SetErr(EINVAL, "Invalid parameter criteria %d", criteria);
+				flg = -1;
+		}
+		if (flg < 0)
+			break;
+		/* resume choosen task */
+		if (flg > 0) {
+			if (root->root_hooks.hook_exec.resume)
+				if (root->root_hooks.hook_exec.resume(task, NULL)) {
+					flg = -1;
+					break;
+				}
+
+			TAILQ_REMOVE(&root->root_suspend, task, task_node);
+
+			task->task_type = taskREADY;
+#ifdef HAVE_LIBPTHREAD
+			pthread_mutex_lock(&root->root_mtx[taskREADY]);
+#endif
+			TAILQ_INSERT_TAIL(&root->root_ready, task, task_node);
+#ifdef HAVE_LIBPTHREAD
+			pthread_mutex_unlock(&root->root_mtx[taskREADY]);
+#endif
+
+			flg ^= flg;	/* ok */
+		}
+	}
+#ifdef HAVE_LIBPTHREAD
+	pthread_mutex_unlock(&root->root_mtx[taskSUSPEND]);
+#endif
+
+	return flg;
 }