sched: Rename task->error to tast->status.

We are going to store not only the (negative) error code in this field
of struct task, so status is a better name for it. The conversion is
trivial.

diff --git a/sched.c b/sched.c
index ae6b2a9d3cb0ac6425d94482fc7892641fca5df8..b92774fa95d4d1a0e4870c6e58a42130bc9bbe5b 100644 (file)
--- a/sched.c
+++ b/sched.c
@@ -26,7 +26,7 @@ struct task {
        /** Copied from the task_info struct during task_register(). */
        int (*post_select)(struct sched *s, struct task *t);
        /** Whether this task is active (>=0) or in error state (<0). */
-       int error;
+       int status;
        /** Position of the task in the task list of the scheduler. */
        struct list_head node;
        /** If less than zero, the task was notified by another task. */
@@ -51,7 +51,7 @@ static void sched_preselect(struct sched *s)
        struct task *t, *tmp;
 
        list_for_each_entry_safe(t, tmp, &s->task_list, node) {
-               if (t->error < 0)
+               if (t->status < 0)
                        continue;
                if (t->notification != 0)
                        sched_min_delay(s);
@@ -71,13 +71,13 @@ static void unlink_and_free_task(struct task *t)
 static inline void call_post_select(struct sched *s, struct task *t)
 {
 #ifndef SCHED_DEBUG
-       t->error = t->post_select(s, t);
+       t->status = t->post_select(s, t);
 #else
        struct timeval t1, t2, diff;
        unsigned long pst;
 
        clock_get_realtime(&t1);
-       t->error = t->post_select(s, t);
+       t->status = t->post_select(s, t);
        clock_get_realtime(&t2);
        tv_diff(&t1, &t2, &diff);
        pst = tv2ms(&diff);
@@ -93,14 +93,14 @@ static unsigned sched_post_select(struct sched *s)
        unsigned num_running_tasks = 0;
 
        list_for_each_entry_safe(t, tmp, &s->task_list, node) {
-               if (t->error < 0) {
+               if (t->status < 0) {
                        if (t->dead) /* task has been reaped */
                                unlink_and_free_task(t);
                        continue;
                }
                call_post_select(s, t);
                t->notification = 0;
-               if (t->error >= 0)
+               if (t->status >= 0)
                        num_running_tasks++;
        }
        return num_running_tasks;
@@ -184,7 +184,7 @@ int task_reap(struct task **tptr)
        t = *tptr;
        if (!t)
                return 0;
-       if (t->error >= 0)
+       if (t->status >= 0)
                return 0;
        if (t->dead) /* will be freed in sched_post_select() */
                return 0;
@@ -198,7 +198,7 @@ int task_reap(struct task **tptr)
         */
        t->dead = true;
        *tptr = NULL;
-       return t->error;
+       return t->status;
 }
 
 /**
@@ -213,7 +213,7 @@ void sched_shutdown(struct sched *s)
        struct task *t, *tmp;
 
        list_for_each_entry_safe(t, tmp, &s->task_list, node) {
-               if (t->error >= 0)
+               if (t->status >= 0)
                        /* The task list should contain only terminated tasks. */
                        PARA_WARNING_LOG("shutting down running task %s\n",
                                t->name);
@@ -242,7 +242,7 @@ struct task *task_register(struct task_info *info, struct sched *s)
        snprintf(t->name, sizeof(t->name) - 1, "%s", info->name);
        t->name[sizeof(t->name) - 1] = '\0';
        t->notification = 0;
-       t->error = 0;
+       t->status = 0;
        t->dead = false;
        t->pre_select = info->pre_select;
        t->post_select = info->post_select;
@@ -282,7 +282,7 @@ char *get_task_list(struct sched *s)
        list_for_each_entry_safe(t, tmp, &s->task_list, node) {
                char *tmp_msg;
                tmp_msg = make_message("%s%p\t%s\t%s\n", msg? msg : "", t,
-                       t->error < 0? (t->dead? "dead" : "zombie") : "running",
+                       t->status < 0? (t->dead? "dead" : "zombie") : "running",
                        t->name);
                free(msg);
                msg = tmp_msg;
@@ -348,9 +348,9 @@ int task_status(const struct task *t)
                return 0;
        if (t->dead)
                return 0;
-       if (t->error >= 0)
+       if (t->status >= 0)
                return 1;
-       return t->error;
+       return t->status;
 }
 
 /**