X-Git-Url: http://git.tuebingen.mpg.de/?p=paraslash.git;a=blobdiff_plain;f=sched.c;h=c5b2c5ea1b4badf8b5f2e02fe94a03c9cdb6421f;hp=fad70132232268a2c9aade01c12b29e68f8987dc;hb=3a343b3f6bdf852848b2eb9b7d2f4f3661aa78cd;hpb=2290d9be0703d3f83f38c2f100b1b41ec0790bb3

diff --git a/sched.c b/sched.c
index fad70132..c5b2c5ea 100644
--- a/sched.c
+++ b/sched.c
@@ -10,22 +10,21 @@
 struct list_head pre_select_list;
 struct list_head post_select_list;
 
+static struct timeval now_struct;
+struct timeval *now = &now_struct;
+
 static void sched_preselect(struct sched *s)
 {
 	struct task *t, *tmp;
 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;
-		if (t->ret < 0) {
-			t->error_handler(t);
-			goto again;
-		}
-		if (!(t->flags & PRE_EOF_IS_ERROR))
+		if (!t->event_handler)
 			continue;
-		t->ret = -E_PRE_EOF;
-		t->error_handler(t);
+		t->event_handler(t);
 		goto again;
 	}
 }
@@ -36,23 +35,17 @@ 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)
-			continue;
-		if (t->ret < 0) {
-			t->error_handler(t);
-			continue;
-		}
-		if (!(t->flags & POST_EOF_IS_ERROR))
+//		PARA_INFO_LOG("%s: %d\n", t->status, t->ret);
+		if (t->ret > 0 || !t->event_handler)
 			continue;
-		t->ret = -E_POST_EOF;
-		t->error_handler(t);
+		t->event_handler(t);
 	}
 }
 
 int sched(struct sched *s)
 {
 
-	gettimeofday(&s->now, NULL);
+	gettimeofday(now, NULL);
 again:
 	FD_ZERO(&s->rfds);
 	FD_ZERO(&s->wfds);
@@ -63,7 +56,7 @@ again:
 		&s->wfds, &s->timeout);
 	if (s->select_ret < 0)
 		return s->select_ret;
-	gettimeofday(&s->now, NULL);
+	gettimeofday(now, NULL);
 	sched_post_select(s);
 	if (list_empty(&pre_select_list) && list_empty(&post_select_list))
 		return 0;
@@ -72,27 +65,21 @@ again:
 
 void *register_task(struct task *t)
 {
-	PARA_INFO_LOG("registering task %p\n", 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;
 }
 
 void unregister_task(struct task *t)
 {
-	PARA_INFO_LOG("unregistering task %p\n", t);
+	PARA_INFO_LOG("unregistering %s (%p)\n", t->status, t);
 	if (t->pre_select)
 		list_del(&t->pre_select_node);
 	if (t->post_select)
@@ -116,5 +103,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;
+}