X-Git-Url: http://git.tuebingen.mpg.de/?p=paraslash.git;a=blobdiff_plain;f=sched.h;h=ada1cc106c068706fc175cc883450c17a237f4b7;hp=c706b5093fba47f3173cc183daa07f0b77120a48;hb=9aa1f3d69c0aa335b3026581defbc09eb2c4efb4;hpb=00cedf20a69178ac3ec3e43035a2d54868f1bc6d

diff --git a/sched.h b/sched.h
index c706b509..ada1cc10 100644
--- a/sched.h
+++ b/sched.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2006-2014 Andre Noll <maan@systemlinux.org>
+ * Copyright (C) 2006 Andre Noll <maan@tuebingen.mpg.de>
  *
  * Licensed under the GPL v2. For licencing details see COPYING.
  */
@@ -33,38 +33,33 @@ struct sched {
 	struct list_head task_list;
 };
 
-/**
- * Paraslash's task structure.
- *
- * Before registering a task to the scheduler, the task structure must be
- * filled in properly by the caller.
- *
- * \sa \ref sched.
- */
-struct task {
+struct task;
+
+/** Information that must be supplied by callers of \ref task_register(). */
+struct task_info {
+	/** Used for log messages and by \ref get_task_list(). */
+	const char *name;
 	/**
-	 * The optional pre select hook of \a t.
+	 * The optional pre select method.
 	 *
 	 * 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 hook of \a t.
+	 * The mandatory post select method.
 	 *
 	 * Its purpose is to evaluate and act upon the results of the previous
 	 * select call. If this function returns a negative value, the
 	 * scheduler unregisters the task.
 	 */
-	int (*post_select)(struct sched *s, struct task *t);
-	/** Whether this task is active (>=0) or in error state (<0). */
-	int error;
-	/** Position of the task in the task list of the scheduler. */
-	struct list_head node;
-	/** Descriptive text and current status of the task. */
-	char status[255];
-	/** If less than zero, the task was notified by another task. */
-	int notification;
+	int (*post_select)(struct sched *s, void *context);
+	/**
+	 * 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;
 };
 
 /**
@@ -73,14 +68,17 @@ struct task {
  * 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;
 
-void register_task(struct sched *s, struct task *t);
+struct task *task_register(struct task_info *info, struct sched *s);
 int schedule(struct sched *s);
+void sched_shutdown(struct sched *s);
 char *get_task_list(struct sched *s);
 void task_notify(struct task *t, int err);
 void task_notify_all(struct sched *s, int err);
-int task_get_notification(struct task *t);
+int task_get_notification(const struct task *t);
+int task_status(const struct task *t);
+int task_reap(struct task **tptr);
 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);