Merge remote-tracking branch 's/master'

[paraslash.git] / sched.h

diff --git a/sched.h b/sched.h
index b92aaff75bd8554069145e70a1fe0db3274c4905..b3df0b66b180bd1f3f2f48f784c07a187fbac712 100644 (file)
--- a/sched.h
+++ b/sched.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2006-2008 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,13 +20,19 @@ 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;
+       /** If non-NULL, use this function instead of para_select. */
+       int (*select_function)(int, fd_set *, fd_set *, struct timeval *);
+       /** Currently active pre_select functions. */
+       struct list_head pre_select_list;
+       /** Currently active post_select functions. */
+       struct list_head post_select_list;
 };
 
 /**
@@ -61,7 +67,7 @@ struct task {
        /** Position of the task in the post_select list of the scheduler. */
        struct list_head post_select_node;
        /** Descriptive text and current status of the task. */
-       char status[MAXLINE];
+       char status[255];
 };
 
 /**
@@ -72,8 +78,12 @@ struct task {
  */
 extern struct timeval *now;
 
-void register_task(struct task *t);
+void register_task(struct sched *s, struct task *t);
 int schedule(struct sched *s);
-char *get_task_list(void);
-int kill_task(char *id);
-void sched_shutdown(void);
+char *get_task_list(struct sched *s);
+void sched_shutdown(struct sched *s);
+void sched_min_delay(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);