return j;
}
-int job_link(Job *j) {
- int r;
-
- assert(j);
- assert(!j->linked);
-
- if ((r = hashmap_put(j->manager->jobs, UINT32_TO_PTR(j->id), j)) < 0)
- return r;
-
- j->name->meta.job = j;
-
- j->linked = true;
-
- return 0;
-}
-
void job_free(Job *j) {
assert(j);
/* Detach from next 'bigger' objects */
if (j->linked) {
- assert(j->name);
- assert(j->name->meta.job == j);
- j->name->meta.job = NULL;
+ if (j->name->meta.job == j)
+ j->name->meta.job = NULL;
hashmap_remove(j->manager->jobs, UINT32_TO_PTR(j->id));
}
void job_dump(Job *j, FILE*f) {
static const char* const job_type_table[_JOB_TYPE_MAX] = {
- [JOB_START] = "START",
- [JOB_STOP] = "STOP",
- [JOB_VERIFY_STARTED] = "VERIFY_STARTED",
- [JOB_RELOAD] = "RELOAD",
- [JOB_RESTART] = "RESTART",
- [JOB_TRY_RESTART] = "TRY_RESTART",
- [JOB_RESTART_FINISH] = "RESTART_FINISH"
+ [JOB_START] = "start",
+ [JOB_STOP] = "stop",
+ [JOB_VERIFY_STARTED] = "verify-started",
+ [JOB_RELOAD] = "reload",
+ [JOB_RESTART] = "restart",
+ [JOB_TRY_RESTART] = "try-restart",
+ [JOB_RESTART_FINISH] = "restart-finish"
};
static const char* const job_state_table[_JOB_STATE_MAX] = {
- [JOB_WAITING] = "WAITING",
- [JOB_RUNNING] = "RUNNING",
- [JOB_DONE] = "DONE"
+ [JOB_WAITING] = "waiting",
+ [JOB_RUNNING] = "running",
+ [JOB_DONE] = "done"
};
assert(j);
assert(f);
- fprintf(f, "Job %u: %s → %s in state %s\n",
+ fprintf(f, "Job %u (%s) → %s in state %s\n",
j->id,
name_id(j->name),
job_type_table[j->type],