X-Git-Url: http://git.tuebingen.mpg.de/?a=blobdiff_plain;f=sched.h;h=e0ca0c011bb0d4838a4071098e4c172403fac015;hb=181beb316afad036ac01a778544c5dec0a8d51c7;hp=05b6c51e725b31bba2f75bf46d1faf714e5ebe2e;hpb=80ff4e0205b6eefa603835fdc30f7f32fbd21f9f;p=paraslash.git

diff --git a/sched.h b/sched.h
index 05b6c51e..e0ca0c01 100644
--- a/sched.h
+++ b/sched.h
@@ -1,8 +1,4 @@
-/*
- * Copyright (C) 2006-2014 Andre Noll <maan@systemlinux.org>
- *
- * Licensed under the GPL v2. For licencing details see COPYING.
- */
+/* Copyright (C) 2006 Andre Noll <maan@tuebingen.mpg.de>, see file COPYING. */
 
 /** \file sched.h Sched and task structures and exported symbols from sched.c. */
 
@@ -17,10 +13,10 @@
  * called after the select call.
  */
 struct sched {
-	/** Initial value before any pre_select call. */
-	struct timeval default_timeout;
-	/** The current timeout for the upcoming select call. */
-	struct timeval select_timeout;
+	/** Initial value (in milliseconds) before any pre_select call. */
+	int default_timeout;
+	/** The timeout (also in milliseconds) for the next select call. */
+	int timeout;
 	/** fds that should be watched for readability. */
 	fd_set rfds;
 	/** fds that should be watched for writability. */
@@ -28,7 +24,7 @@ struct sched {
 	/** Highest numbered file descriptor in any of the above fd sets. */
 	int max_fileno;
 	/** If non-NULL, use this function instead of para_select. */
-	int (*select_function)(int, fd_set *, fd_set *, struct timeval *);
+	int (*select_function)(int, fd_set *, fd_set *, int timeout);
 	/** Tasks which have been registered to the scheduler. */
 	struct list_head task_list;
 };
@@ -45,7 +41,7 @@ struct task_info {
 	 * Its purpose is to add file descriptors to the fd sets of the
 	 * scheduler and to decrease the select timeout if necessary.
 	 */
-	void (*pre_select)(struct sched *s, struct task *t);
+	void (*pre_select)(struct sched *s, void *context);
 	/**
 	 * The mandatory post select method.
 	 *
@@ -53,12 +49,11 @@ struct task_info {
 	 * select call. If this function returns a negative value, the
 	 * scheduler unregisters the task.
 	 */
-	int (*post_select)(struct sched *s, struct task *t);
+	int (*post_select)(struct sched *s, void *context);
 	/**
-	 * This pointer is saved when the task is register(ed). It may be
-	 * queried from ->pre_select() and ->post_select() via \ref
-	 * task_context(). Usually this is a pointer to the struct owned by the
-	 * caller which contains the task pointer as one member.
+	 * This pointer is saved when the task is registered. It is passed to
+	 * ->pre_select() and ->post_select(). Usually this is a pointer to the
+	 * struct owned by the caller which contains the task pointer.
 	 */
 	void *context;
 };
@@ -69,10 +64,9 @@ struct task_info {
  * scheduler are allowed to block, this value should be accurate enough so that
  * there is no need to call clock_gettime() directly.
  */
-extern struct timeval *now;
+extern const struct timeval *now;
 
 struct task *task_register(struct task_info *info, struct sched *s);
-void *task_context(struct task *t);
 int schedule(struct sched *s);
 void sched_shutdown(struct sched *s);
 char *get_task_list(struct sched *s);
@@ -86,3 +80,13 @@ 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);
+
+static inline bool sched_read_ok(int fd, const struct sched *s)
+{
+	return FD_ISSET(fd, &s->rfds);
+}
+
+static inline bool sched_write_ok(int fd, const struct sched *s)
+{
+	return FD_ISSET(fd, &s->wfds);
+}