X-Git-Url: http://git.tuebingen.mpg.de/?p=paraslash.git;a=blobdiff_plain;f=sched.c;h=14346ec0e1c411ab08da2ddbdc85073d6945615b;hp=9e346df20f5f4d03e6d1dfaa4322a3eace524db1;hb=7c3e4083d6899aff955ed1b2487122b0cbf43392;hpb=002731cd3938f3be6b71651e56c062af1adcdec0

diff --git a/sched.c b/sched.c
index 9e346df2..14346ec0 100644
--- a/sched.c
+++ b/sched.c
@@ -6,6 +6,7 @@
 
 /** \file sched.c Paraslash's scheduling functions. */
 
+#include <regex.h>
 #include <dirent.h> /* readdir() */
 #include <assert.h>
 #include <sys/time.h>
@@ -43,14 +44,14 @@ static void unregister_task(struct task *t)
 	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)
+		if (t->error >= 0 && t->pre_select)
 			t->pre_select(s, t);
 //		PARA_INFO_LOG("%s \n", t->status);
 		if (t->error >= 0)
@@ -107,12 +108,12 @@ int schedule(struct sched *s)
 		return -E_NOT_INITIALIZED;
 	if (!s->select_function)
 		s->select_function = para_select;
-	gettimeofday(now, NULL);
 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;
@@ -135,7 +136,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.
@@ -157,7 +158,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);
 	}
 }
@@ -179,7 +180,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.
@@ -249,3 +250,22 @@ 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);
+}