Merge branch 't/sync'

[paraslash.git] / sched.h

diff --git a/sched.h b/sched.h
index 907e5fb7462ca744e9049dd39d5ed6afa5a8a5d6..234a8458d5870a1f14c66c81c140b61c0c20bf01 100644 (file)
--- a/sched.h
+++ b/sched.h
@@ -41,10 +41,7 @@ struct sched {
  * Before registering a task to the scheduler, the task structure must be
  * filled in properly by the caller.
  *
- * If one of these functions sets \a t->error to a negative value, the
- * task gets unregistered automatically.
- *
- * \sa struct sched.
+ * \sa \ref sched.
  */
 struct task {
        /**
@@ -55,18 +52,13 @@ struct task {
         */
        void (*pre_select)(struct sched *s, struct task *t);
        /**
-        * The postselect hook of \a t.
-        *
-        * Evaluate and act upon the results of the previous select call.
-        */
-       void (*post_select)(struct sched *s, struct task *t);
-       /**
-        * The newer variant of the post select hook of \a t.
+        * The post select hook of \a t.
         *
-        * This hook must return the error code rather than store it in
-        * t->error.
+        * 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 (*new_post_select)(struct sched *s, struct task *t);
+       int (*post_select)(struct sched *s, struct task *t);
        /** Whether this task is in error state. */
        int error;
        /** Position of the task in the pre_select list of the scheduler. */