Commit ccbfb331 authored by John Snow's avatar John Snow Committed by Max Reitz
Browse files

jobs: remove .exit callback 



Now that all of the jobs use the component finalization callbacks,
there's no use for the heavy-hammer .exit callback anymore.

job_exit becomes a glorified type shim so that we can call
job_completed from aio_bh_schedule_oneshot.

Move these three functions down into job.c to eliminate a
forward reference.

Signed-off-by: default avatarJohn Snow <jsnow@redhat.com>
Reviewed-by: default avatarMax Reitz <mreitz@redhat.com>
Message-id: 20180906130225.5118-12-jsnow@redhat.com
Reviewed-by: default avatarJeff Cody <jcody@redhat.com>
Signed-off-by: default avatarMax Reitz <mreitz@redhat.com>
parent e4dad427

include/qemu/job.h

+0 −11
Original line number Diff line number Diff line
@@ -221,17 +221,6 @@ struct JobDriver { 
     */

    void (*drain)(Job *job);



    /**

     * If the callback is not NULL, exit will be invoked from the main thread

     * when the job's coroutine has finished, but before transactional

     * convergence; before @prepare or @abort.

     *

     * FIXME TODO: This callback is only temporary to transition remaining jobs

     * to prepare/commit/abort/clean callbacks and will be removed before 3.1.

     * is released.

     */

    void (*exit)(Job *job);



    /**

     * If the callback is not NULL, prepare will be invoked when all the jobs

     * belonging to the same transaction complete; or upon this job's completion

job.c

+34 −43
Original line number Diff line number Diff line
@@ -535,49 +535,6 @@ void job_drain(Job *job) 
    }

}



static void job_completed(Job *job);



static void job_exit(void *opaque)

{

    Job *job = (Job *)opaque;

    AioContext *aio_context = job->aio_context;



    if (job->driver->exit) {

        aio_context_acquire(aio_context);

        job->driver->exit(job);

        aio_context_release(aio_context);

    }

    job_completed(job);

}



/**

 * All jobs must allow a pause point before entering their job proper. This

 * ensures that jobs can be paused prior to being started, then resumed later.

 */

static void coroutine_fn job_co_entry(void *opaque)

{

    Job *job = opaque;



    assert(job && job->driver && job->driver->run);

    job_pause_point(job);

    job->ret = job->driver->run(job, &job->err);

    job->deferred_to_main_loop = true;

    aio_bh_schedule_oneshot(qemu_get_aio_context(), job_exit, job);

}





void job_start(Job *job)

{

    assert(job && !job_started(job) && job->paused &&

           job->driver && job->driver->run);

    job->co = qemu_coroutine_create(job_co_entry, job);

    job->pause_count--;

    job->busy = true;

    job->paused = false;

    job_state_transition(job, JOB_STATUS_RUNNING);

    aio_co_enter(job->aio_context, job->co);

}



/* Assumes the block_job_mutex is held */

static bool job_timer_not_pending(Job *job)

{
@@ -894,6 +851,40 @@ static void job_completed(Job *job) 
    }

}



/** Useful only as a type shim for aio_bh_schedule_oneshot. */

static void job_exit(void *opaque)

{

    Job *job = (Job *)opaque;

    job_completed(job);

}



/**

 * All jobs must allow a pause point before entering their job proper. This

 * ensures that jobs can be paused prior to being started, then resumed later.

 */

static void coroutine_fn job_co_entry(void *opaque)

{

    Job *job = opaque;



    assert(job && job->driver && job->driver->run);

    job_pause_point(job);

    job->ret = job->driver->run(job, &job->err);

    job->deferred_to_main_loop = true;

    aio_bh_schedule_oneshot(qemu_get_aio_context(), job_exit, job);

}



void job_start(Job *job)

{

    assert(job && !job_started(job) && job->paused &&

           job->driver && job->driver->run);

    job->co = qemu_coroutine_create(job_co_entry, job);

    job->pause_count--;

    job->busy = true;

    job->paused = false;

    job_state_transition(job, JOB_STATUS_RUNNING);

    aio_co_enter(job->aio_context, job->co);

}



void job_cancel(Job *job, bool force)

{

    if (job->status == JOB_STATUS_CONCLUDED) {