X-Git-Url: http://git.tuebingen.mpg.de/?p=paraslash.git;a=blobdiff_plain;f=sched.c;h=27d71f67d40fd69614e7f8c19bd0f409fb175aca;hp=6233e40b950b3916c581882479461050cdd10551;hb=5124ade7db7ee2eef8a8a6acae2a398d82a666cc;hpb=148c7c722fd5795228f586b6ef8d953662b68224

diff --git a/sched.c b/sched.c
index 6233e40b..27d71f67 100644
--- a/sched.c
+++ b/sched.c
@@ -16,9 +16,12 @@ static void sched_preselect(struct sched *s)
 again:
 	list_for_each_entry_safe(t, tmp, &pre_select_list, pre_select_node) {
 		t->pre_select(s, t);
-		if (t->ret > 0 || !t->error_handler)
+//		PARA_INFO_LOG("%s \n", t->status);
+		if (t->ret > 0)
 			continue;
-		t->error_handler(t);
+		if (!t->event_handler)
+			continue;
+		t->event_handler(t);
 		goto again;
 	}
 }
@@ -29,9 +32,10 @@ static void sched_post_select(struct sched *s)
 
 	list_for_each_entry_safe(t, tmp, &post_select_list, post_select_node) {
 		t->post_select(s, t);
-		if (t->ret > 0 || !t->error_handler)
+//		PARA_INFO_LOG("%s: %d\n", t->status, t->ret);
+		if (t->ret > 0 || !t->event_handler)
 			continue;
-		t->error_handler(t);
+		t->event_handler(t);
 	}
 }
 
@@ -61,17 +65,11 @@ void *register_task(struct task *t)
 	PARA_INFO_LOG("registering %s (%p)\n", t->status, t);
 	if (t->pre_select) {
 		PARA_DEBUG_LOG("pre_select: %p\n", &t->pre_select);
-		if (t->flags & PRE_ADD_TAIL)
-			list_add_tail(&t->pre_select_node, &pre_select_list);
-		else
-			list_add(&t->pre_select_node, &pre_select_list);
+		list_add(&t->pre_select_node, &pre_select_list);
 	}
 	if (t->post_select) {
 		PARA_DEBUG_LOG("post_select: %p\n", &t->pre_select);
-		if (t->flags & POST_ADD_TAIL)
-			list_add_tail(&t->post_select_node, &post_select_list);
-		else
-			list_add(&t->post_select_node, &post_select_list);
+		list_add(&t->post_select_node, &post_select_list);
 	}
 	return t;
 }
@@ -102,5 +100,49 @@ void sched_shutdown(void)
 		unregister_task(t);
 };
 
+char *get_task_list(void)
+{
+	struct task *t, *tmp;
+	char *msg = NULL;
+	list_for_each_entry_safe(t, tmp, &pre_select_list, pre_select_node) {
+		char *tmp_msg;
+		tmp_msg = make_message("%s%p\tpre\t%s\n", msg? msg : "", t, t->status);
+		free(msg);
+		msg = tmp_msg;
+	}
+	list_for_each_entry_safe(t, tmp, &post_select_list, post_select_node) {
+		char *tmp_msg;
+//		if (t->pre_select)
+//			continue;
+		tmp_msg = make_message("%s%p\tpost\t%s\n", msg? msg : "", t, t->status);
+		free(msg);
+		msg = tmp_msg;
+	}
+	//PARA_DEBUG_LOG("task list:\n%s", msg);
+	return msg;
+}
 
-//char *get_tast_list();
+int kill_task(char *id)
+{
+	struct task *t, *tmp;
+	char buf[20];
+	list_for_each_entry_safe(t, tmp, &pre_select_list, pre_select_node) {
+		sprintf(buf, "%p", t);
+		if (strcmp(id, buf))
+			continue;
+		t->ret = -E_TASK_KILLED;
+		if (t->event_handler)
+			t->event_handler(t);
+		return 1;
+	}
+	list_for_each_entry_safe(t, tmp, &post_select_list, post_select_node) {
+		sprintf(buf, "%p", t);
+		if (strcmp(id, buf))
+			continue;
+		t->ret = -E_TASK_KILLED;
+		if (t->event_handler)
+			t->event_handler(t);
+		return 1;
+	}
+	return -E_NO_SUCH_TASK;
+}