X-Git-Url: http://git.tuebingen.mpg.de/?a=blobdiff_plain;f=sched.c;h=9b0bddc13e36d8fa9636c292b4c243e2e0416f86;hb=f45846b1a228c806424e6bf937ba09e648e87441;hp=5f7babe7a6f6ec98838d3d558a630b89e6d0a1b2;hpb=6f0e4a5138f17d0a150f648fd09fe867c080660a;p=paraslash.git diff --git a/sched.c b/sched.c index 5f7babe7..9b0bddc1 100644 --- a/sched.c +++ b/sched.c @@ -36,13 +36,13 @@ void unregister_task(struct task *t) { if (!initialized) return; - PARA_INFO_LOG("unregistering %s (%p)\n", t->status, t); + PARA_INFO_LOG("unregistering %s (%s)\n", t->status, + t->error <0? para_strerror(-t->error) : "shutdown"); if (t->pre_select) list_del(&t->pre_select_node); if (t->post_select) list_del(&t->post_select_node); - if (t->error >= 0) - t->error = -E_TASK_KILLED; + t->error = -E_TASK_UNREGISTERED; }; @@ -236,7 +236,6 @@ int kill_task(char *id) if (strcmp(id, buf)) continue; t->error = -E_TASK_KILLED; - unregister_task(t); return 1; } list_for_each_entry_safe(t, tmp, &post_select_list, post_select_node) { @@ -244,7 +243,6 @@ int kill_task(char *id) if (strcmp(id, buf)) continue; t->error = -E_TASK_KILLED; - unregister_task(t); return 1; } return -E_NO_SUCH_TASK;