fridtjof/qemu-cr16
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

jobs: remove ret argument to job_completed; privatize it

Browse source 
Jobs are now expected to return their retcode on the stack, from the
.run callback, so we can remove that argument.

job_cancel does not need to set -ECANCELED because job_completed will
update the return code itself if the job was canceled.

While we're here, make job_completed static to job.c and remove it from
job.h; move the documentation of return code to the .run() callback and
to the job->ret property, accordingly.

Signed-off-by: John Snow <jsnow@redhat.com>
Message-id: 20180830015734.19765-9-jsnow@redhat.com
Reviewed-by: Max Reitz <mreitz@redhat.com>
Signed-off-by: Max Reitz <mreitz@redhat.com>
This commit is contained in:
John Snow 2018-08-29 21:57:33 -04:00 • committed by Max Reitz
parent 6870277535
commit 404ff28d6a
3 changed files with 22 additions and 19 deletions
Download patch file Download diff file Expand all files Collapse all files

11
job.c
View file

@ -535,6 +535,8 @@ void job_drain(Job *job)
}
}
static void job_completed(Job *job);
static void job_exit(void *opaque)
{
Job *job = (Job *)opaque;
@ -545,7 +547,7 @@ static void job_exit(void *opaque)
job->driver->exit(job);
aio_context_release(aio_context);
}
job_completed(job, job->ret);
job_completed(job);
}
/**
@ -883,13 +885,12 @@ static void job_completed_txn_success(Job *job)
}
}
void job_completed(Job *job, int ret)
static void job_completed(Job *job)
{
assert(job && job->txn && !job_is_completed(job));
job->ret = ret;
job_update_rc(job);
trace_job_completed(job, ret, job->ret);
trace_job_completed(job, job->ret);
if (job->ret) {
job_completed_txn_abort(job);
} else {
@ -905,7 +906,7 @@ void job_cancel(Job *job, bool force)
}
job_cancel_async(job, force);
if (!job_started(job)) {
job_completed(job, -ECANCELED);
job_completed(job);
} else if (job->deferred_to_main_loop) {
job_completed_txn_abort(job);
} else {