Commit 5d43e86e authored by Kevin Wolf's avatar Kevin Wolf
Browse files

job: Add job_sleep_ns() 



There is nothing block layer specific about block_job_sleep_ns(), so
move the function to Job.

Signed-off-by: default avatarKevin Wolf <kwolf@redhat.com>
Reviewed-by: default avatarJohn Snow <jsnow@redhat.com>
Reviewed-by: default avatarMax Reitz <mreitz@redhat.com>
parent da01ff7f

block/backup.c

+1 −1
Original line number Diff line number Diff line
@@ -338,7 +338,7 @@ static bool coroutine_fn yield_and_check(BackupBlockJob *job) 
     * return. Without a yield, the VM would not reboot. */

    delay_ns = block_job_ratelimit_get_delay(&job->common, job->bytes_read);

    job->bytes_read = 0;

    block_job_sleep_ns(&job->common, delay_ns);

    job_sleep_ns(&job->common.job, delay_ns);



    if (job_is_cancelled(&job->common.job)) {

        return true;

block/commit.c

+1 −1
Original line number Diff line number Diff line
@@ -172,7 +172,7 @@ static void coroutine_fn commit_run(void *opaque) 
        /* Note that even when no rate limit is applied we need to yield

         * with no pending I/O here so that bdrv_drain_all() returns.

         */

        block_job_sleep_ns(&s->common, delay_ns);

        job_sleep_ns(&s->common.job, delay_ns);

        if (job_is_cancelled(&s->common.job)) {

            break;

        }

block/mirror.c

+2 −2
Original line number Diff line number Diff line
@@ -595,7 +595,7 @@ static void mirror_throttle(MirrorBlockJob *s) 


    if (now - s->last_pause_ns > BLOCK_JOB_SLICE_TIME) {

        s->last_pause_ns = now;

        block_job_sleep_ns(&s->common, 0);

        job_sleep_ns(&s->common.job, 0);

    } else {

        job_pause_point(&s->common.job);

    }
@@ -869,7 +869,7 @@ static void coroutine_fn mirror_run(void *opaque) 
                        cnt == 0 ? BLOCK_JOB_SLICE_TIME : 0);

        }

        trace_mirror_before_sleep(s, cnt, s->synced, delay_ns);

        block_job_sleep_ns(&s->common, delay_ns);

        job_sleep_ns(&s->common.job, delay_ns);

        if (job_is_cancelled(&s->common.job) &&

            (!s->synced || s->common.force))

        {

block/stream.c

+1 −1
Original line number Diff line number Diff line
@@ -140,7 +140,7 @@ static void coroutine_fn stream_run(void *opaque) 
        /* Note that even when no rate limit is applied we need to yield

         * with no pending I/O here so that bdrv_drain_all() returns.

         */

        block_job_sleep_ns(&s->common, delay_ns);

        job_sleep_ns(&s->common.job, delay_ns);

        if (job_is_cancelled(&s->common.job)) {

            break;

        }

blockjob.c

+0 −27
Original line number Diff line number Diff line
@@ -181,7 +181,6 @@ void block_job_free(Job *job) 
                                    block_job_detach_aio_context, bjob);

    blk_unref(bjob->blk);

    error_free(bjob->blocker);

    assert(!timer_pending(&bjob->job.sleep_timer));

}



static void block_job_attached_aio_context(AioContext *new_context,
@@ -290,13 +289,6 @@ const BlockJobDriver *block_job_driver(BlockJob *job) 
    return job->driver;

}



static void block_job_sleep_timer_cb(void *opaque)

{

    BlockJob *job = opaque;



    block_job_enter(job);

}



static void block_job_decommission(BlockJob *job)

{

    assert(job);
@@ -866,9 +858,6 @@ void *block_job_create(const char *job_id, const BlockJobDriver *driver, 
    job->opaque        = opaque;

    job->auto_finalize = !(flags & BLOCK_JOB_MANUAL_FINALIZE);

    job->auto_dismiss  = !(flags & BLOCK_JOB_MANUAL_DISMISS);

    aio_timer_init(qemu_get_aio_context(), &job->job.sleep_timer,

                   QEMU_CLOCK_REALTIME, SCALE_NS,

                   block_job_sleep_timer_cb, job);



    error_setg(&job->blocker, "block device is in use by block job: %s",

               job_type_str(&job->job));
@@ -931,22 +920,6 @@ void block_job_enter(BlockJob *job) 
    job_enter_cond(&job->job, NULL);

}



void block_job_sleep_ns(BlockJob *job, int64_t ns)

{

    assert(job->job.busy);



    /* Check cancellation *before* setting busy = false, too!  */

    if (job_is_cancelled(&job->job)) {

        return;

    }



    if (!job_should_pause(&job->job)) {

        job_do_yield(&job->job, qemu_clock_get_ns(QEMU_CLOCK_REALTIME) + ns);

    }



    job_pause_point(&job->job);

}



void block_job_yield(BlockJob *job)

{

    assert(job->job.busy);