X-Git-Url: http://git.tuebingen.mpg.de/?p=paraslash.git;a=blobdiff_plain;f=sched.c;h=9be3a2e83109f0db884c5fdebf3e7e62f4f9b3c5;hp=cdc5b65828788bd0dc359c372a928f8d4cecb3db;hb=886c74b9356c905b528d51ac6ab1628496caf3f0;hpb=7aaf87f2673119f0e5ee2923eddbbbd2e7f97a2f

diff --git a/sched.c b/sched.c
index cdc5b658..9be3a2e8 100644
--- a/sched.c
+++ b/sched.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2006-2010 Andre Noll <maan@systemlinux.org>
+ * Copyright (C) 2006-2011 Andre Noll <maan@systemlinux.org>
  *
  * Licensed under the GPL v2. For licencing details see COPYING.
  */
@@ -38,21 +38,20 @@ static void unregister_task(struct task *t)
 {
 	if (!initialized)
 		return;
+	assert(t->error < 0);
 	PARA_INFO_LOG("unregistering %s (%s)\n", t->status,
-		t->error <0? para_strerror(-t->error) : "shutdown");
+		para_strerror(-t->error));
 	if (t->pre_select)
 		list_del(&t->pre_select_node);
 	if (t->post_select)
 		list_del(&t->post_select_node);
-	t->error = -E_TASK_UNREGISTERED;
 }
 
-
 static void sched_preselect(struct sched *s)
 {
 	struct task *t, *tmp;
 	list_for_each_entry_safe(t, tmp, &pre_select_list, pre_select_node) {
-		if (t->error >= 0 && t->pre_select)
+		if (t->pre_select)
 			t->pre_select(s, t);
 //		PARA_INFO_LOG("%s \n", t->status);
 		if (t->error >= 0)
@@ -132,13 +131,14 @@ int schedule(struct sched *s)
 again:
 	FD_ZERO(&s->rfds);
 	FD_ZERO(&s->wfds);
-	s->timeout = s->default_timeout;
+	s->select_timeout = s->default_timeout;
 	s->max_fileno = -1;
 	gettimeofday(now, NULL);
 	sched_preselect(s);
 	if (list_empty(&pre_select_list) && list_empty(&post_select_list))
 		return 0;
-	ret = s->select_function(s->max_fileno + 1, &s->rfds, &s->wfds, &s->timeout);
+	ret = s->select_function(s->max_fileno + 1, &s->rfds, &s->wfds,
+		&s->select_timeout);
 	if (ret < 0)
 		return ret;
 	if (ret == 0) {
@@ -206,10 +206,14 @@ void sched_shutdown(void)
 
 	if (!initialized)
 		return;
-	list_for_each_entry_safe(t, tmp, &pre_select_list, pre_select_node)
+	list_for_each_entry_safe(t, tmp, &pre_select_list, pre_select_node) {
+		t->error = -E_SCHED_SHUTDOWN;
 		unregister_task(t);
-	list_for_each_entry_safe(t, tmp, &post_select_list, post_select_node)
+	}
+	list_for_each_entry_safe(t, tmp, &post_select_list, post_select_node) {
+		t->error = -E_SCHED_SHUTDOWN;
 		unregister_task(t);
+	}
 	initialized = 0;
 }
 
@@ -218,8 +222,7 @@ void sched_shutdown(void)
  *
  * \return The task list.
  *
- * Each entry of the list contains an identifier which is simply a hex number
- * that may be used in \a kill_task() to terminate the task.
+ * Each entry of the list contains an identifier which is simply a hex number.
  * The result is dynamically allocated and must be freed by the caller.
  */
 char *get_task_list(void)
@@ -247,41 +250,6 @@ char *get_task_list(void)
 	return msg;
 }
 
-/**
- * Simulate an error for the given task.
- *
- * \param id The task identifier.
- *
- * Find the task identified by \a id, set the tasks' error value to
- * \p -E_TASK_KILLED and unregister the task.
- *
- * \return Positive on success, negative on errors (e.g. if \a id does not
- * correspond to a registered task).
- */
-int kill_task(char *id)
-{
-	struct task *t, *tmp;
-	char buf[20];
-
-	if (!initialized)
-		return -E_NOT_INITIALIZED;
-	list_for_each_entry_safe(t, tmp, &pre_select_list, pre_select_node) {
-		sprintf(buf, "%p", t);
-		if (strcmp(id, buf))
-			continue;
-		t->error = -E_TASK_KILLED;
-		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->error = -E_TASK_KILLED;
-		return 1;
-	}
-	return -E_NO_SUCH_TASK;
-}
-
 /**
  * Set the select timeout to the minimal possible value.
  *
@@ -291,26 +259,26 @@ int kill_task(char *id)
  */
 void sched_min_delay(struct sched *s)
 {
-	s->timeout.tv_sec = 0;
-	s->timeout.tv_usec = 1;
+	s->select_timeout.tv_sec = 0;
+	s->select_timeout.tv_usec = 1;
 }
 
 /**
  * Impose an upper bound for the timeout of the next select() call.
  *
- * \param timeout Maximal allowed timeout.
+ * \param to Maximal allowed timeout.
  * \param s Pointer to the scheduler struct.
  *
- * If the current scheduler timeout is already smaller than \a timeout, this
+ * If the current scheduler timeout is already smaller than \a to, this
  * function does nothing. Otherwise the timeout for the next select() call is
  * set to the given value.
  *
  * \sa sched_request_timeout_ms().
  */
-void sched_request_timeout(struct timeval *timeout, struct sched *s)
+void sched_request_timeout(struct timeval *to, struct sched *s)
 {
-	if (tv_diff(&s->timeout, timeout, NULL) > 0)
-		s->timeout = *timeout;
+	if (tv_diff(&s->select_timeout, to, NULL) > 0)
+		s->select_timeout = *to;
 }
 
 /**