X-Git-Url: http://git.tuebingen.mpg.de/?p=paraslash.git;a=blobdiff_plain;f=sched.h;h=ea9578f7b05b3bae17e69e87543675e902d0c590;hp=f119025c4c73f2d6b811f8220e6cec4c2449cd0d;hb=4867d9a4948aadde4dd59436e1c5fb0fc141ba89;hpb=4fcc1b13adffb4c9d320fbef2fe4e9b75dd2c5f9

diff --git a/sched.h b/sched.h
index f119025c..ea9578f7 100644
--- a/sched.h
+++ b/sched.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2006-2009 Andre Noll <maan@systemlinux.org>
+ * Copyright (C) 2006-2011 Andre Noll <maan@systemlinux.org>
  *
  * Licensed under the GPL v2. For licencing details see COPYING.
  */
@@ -20,14 +20,14 @@ struct sched {
 	/** Initial value before any pre_select call. */
 	struct timeval default_timeout;
 	/** The current timeout for the upcoming select call. */
-	struct timeval timeout;
+	struct timeval select_timeout;
 	/** fds that should be watched for readability. */
 	fd_set rfds;
 	/** fds that should be watched for writability. */
 	fd_set wfds;
 	/** Highest numbered file descriptor in any of the above fd sets. */
 	int max_fileno;
-	/** In non-NULL, use this function instead of para_select. */
+	/** If non-NULL, use this function instead of para_select. */
 	int (*select_function)(int, fd_set *, fd_set *, struct timeval *);
 };
 
@@ -77,8 +77,9 @@ extern struct timeval *now;
 void register_task(struct task *t);
 int schedule(struct sched *s);
 char *get_task_list(void);
-int kill_task(char *id);
 void sched_shutdown(void);
 void sched_min_delay(struct sched *s);
-void sched_request_timeout(struct timeval *timeout, struct sched *s);
+void sched_request_timeout(struct timeval *to, struct sched *s);
 void sched_request_timeout_ms(long unsigned ms, struct sched *s);
+int sched_request_barrier(struct timeval *barrier, struct sched *s);
+int sched_request_barrier_or_min_delay(struct timeval *barrier, struct sched *s);