X-Git-Url: http://git.tuebingen.mpg.de/?p=paraslash.git;a=blobdiff_plain;f=sched.c;h=b6efb1ae815309e672997abca57ae97a8f6906d1;hp=2500406005614dc3850a283e37057cc844608ac3;hb=0113172c1f18f4a168b0a0fdacb376da2f2a73e3;hpb=5132ecf659d4b578dd14181c8a7de043dbc6807a

diff --git a/sched.c b/sched.c
index 25004060..b6efb1ae 100644
--- a/sched.c
+++ b/sched.c
@@ -1,11 +1,12 @@
 /*
- * Copyright (C) 2006-2008 Andre Noll <maan@systemlinux.org>
+ * Copyright (C) 2006-2009 Andre Noll <maan@systemlinux.org>
  *
  * Licensed under the GPL v2. For licencing details see COPYING.
  */
 
 /** \file sched.c Paraslash's scheduling functions. */
 
+#include <regex.h>
 #include <dirent.h> /* readdir() */
 #include <assert.h>
 #include <sys/time.h>
@@ -32,25 +33,25 @@ struct timeval *now = &now_struct;
  * If the pre_select pointer of \a t is not \p NULL, it is removed from
  * the pre_select list of the scheduler. Same goes for \a post_select.
  */
-void unregister_task(struct task *t)
+static void unregister_task(struct task *t)
 {
 	if (!initialized)
 		return;
-	PARA_INFO_LOG("unregistering %s (%p)\n", t->status, t);
+	PARA_INFO_LOG("unregistering %s (%s)\n", t->status,
+		t->error <0? para_strerror(-t->error) : "shutdown");
 	if (t->pre_select)
 		list_del(&t->pre_select_node);
 	if (t->post_select)
 		list_del(&t->post_select_node);
-	if (t->error >= 0)
-		t->error = -E_TASK_KILLED;
-};
+	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)
+		if (t->error >= 0 && t->pre_select)
 			t->pre_select(s, t);
 //		PARA_INFO_LOG("%s \n", t->status);
 		if (t->error >= 0)
@@ -105,18 +106,30 @@ int schedule(struct sched *s)
 
 	if (!initialized)
 		return -E_NOT_INITIALIZED;
-	gettimeofday(now, NULL);
+	if (!s->select_function)
+		s->select_function = para_select;
 again:
 	FD_ZERO(&s->rfds);
 	FD_ZERO(&s->wfds);
 	s->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 = para_select(s->max_fileno + 1, &s->rfds, &s->wfds, &s->timeout);
+	ret = s->select_function(s->max_fileno + 1, &s->rfds, &s->wfds, &s->timeout);
 	if (ret < 0)
 		return ret;
+	if (ret == 0) {
+		/*
+		 * APUE: Be careful not to check the descriptor sets on return
+		 * unless the return value is greater than zero. The return
+		 * state of the descriptor sets is implementation dependent if
+		 * either a signal is caught or the timer expires.
+		 */
+		FD_ZERO(&s->rfds);
+		FD_ZERO(&s->wfds);
+	}
 	gettimeofday(now, NULL);
 	sched_post_select(s);
 	if (list_empty(&pre_select_list) && list_empty(&post_select_list))
@@ -133,7 +146,7 @@ static void init_sched(void)
 	INIT_LIST_HEAD(&pre_select_list);
 	INIT_LIST_HEAD(&post_select_list);
 	initialized = 1;
-};
+}
 
 /**
  * Add a task to the scheduler.
@@ -155,7 +168,7 @@ void register_task(struct task *t)
 		list_add_tail(&t->pre_select_node, &pre_select_list);
 	}
 	if (t->post_select) {
-		PARA_DEBUG_LOG("post_select: %p\n", &t->pre_select);
+		PARA_DEBUG_LOG("post_select: %p\n", &t->post_select);
 		list_add_tail(&t->post_select_node, &post_select_list);
 	}
 }
@@ -177,7 +190,7 @@ void sched_shutdown(void)
 	list_for_each_entry_safe(t, tmp, &post_select_list, post_select_node)
 		unregister_task(t);
 	initialized = 0;
-};
+}
 
 /**
  * Get the list of all registered tasks.
@@ -247,3 +260,40 @@ int kill_task(char *id)
 	}
 	return -E_NO_SUCH_TASK;
 }
+
+void sched_min_delay(struct sched *s)
+{
+	s->timeout.tv_sec = 0;
+	s->timeout.tv_usec = 1;
+}
+
+void sched_request_timeout(struct timeval *timeout, struct sched *s)
+{
+	if (tv_diff(&s->timeout, timeout, NULL) > 0)
+		s->timeout = *timeout;
+}
+
+void sched_request_timeout_ms(long unsigned ms, struct sched *s)
+{
+	struct timeval tv;
+	ms2tv(ms, &tv);
+	sched_request_timeout(&tv, s);
+}
+
+void sched_request_barrier(struct timeval *barrier, struct sched *s)
+{
+	struct timeval diff;
+
+	if (tv_diff(now, barrier, &diff) > 0)
+		return;
+	sched_request_timeout(&diff, s);
+}
+
+void sched_request_barrier_or_min_delay(struct timeval *barrier, struct sched *s)
+{
+	struct timeval diff;
+
+	if (tv_diff(now, barrier, &diff) > 0)
+		return sched_min_delay(s);
+	sched_request_timeout(&diff, s);
+}