Commit 7483d1e5 authored by Alex Bligh's avatar Alex Bligh Committed by Stefan Hajnoczi
Browse files

aio / timers: convert block_job_sleep_ns and co_sleep_ns to new API 



Convert block_job_sleep_ns and co_sleep_ns to use the new timer
API.

Signed-off-by: default avatarAlex Bligh <alex@alex.org.uk>
Signed-off-by: default avatarStefan Hajnoczi <stefanha@redhat.com>
parent 884f17c2

block/backup.c

+2 −2
Original line number Diff line number Diff line
@@ -272,9 +272,9 @@ static void coroutine_fn backup_run(void *opaque) 
                uint64_t delay_ns = ratelimit_calculate_delay(

                        &job->limit, job->sectors_read);

                job->sectors_read = 0;

                block_job_sleep_ns(&job->common, rt_clock, delay_ns);

                block_job_sleep_ns(&job->common, QEMU_CLOCK_REALTIME, delay_ns);

            } else {

                block_job_sleep_ns(&job->common, rt_clock, 0);

                block_job_sleep_ns(&job->common, QEMU_CLOCK_REALTIME, 0);

            }



            if (block_job_is_cancelled(&job->common)) {

block/commit.c

+1 −1
Original line number Diff line number Diff line
@@ -103,7 +103,7 @@ wait: 
        /* 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, rt_clock, delay_ns);

        block_job_sleep_ns(&s->common, QEMU_CLOCK_REALTIME, delay_ns);

        if (block_job_is_cancelled(&s->common)) {

            break;

        }

block/mirror.c

+2 −2
Original line number Diff line number Diff line
@@ -439,13 +439,13 @@ static void coroutine_fn mirror_run(void *opaque) 
                delay_ns = 0;

            }



            block_job_sleep_ns(&s->common, rt_clock, delay_ns);

            block_job_sleep_ns(&s->common, QEMU_CLOCK_REALTIME, delay_ns);

            if (block_job_is_cancelled(&s->common)) {

                break;

            }

        } else if (!should_complete) {

            delay_ns = (s->in_flight == 0 && cnt == 0 ? SLICE_TIME : 0);

            block_job_sleep_ns(&s->common, rt_clock, delay_ns);

            block_job_sleep_ns(&s->common, QEMU_CLOCK_REALTIME, delay_ns);

        } else if (cnt == 0) {

            /* The two disks are in sync.  Exit and report successful

             * completion.

block/stream.c

+1 −1
Original line number Diff line number Diff line
@@ -114,7 +114,7 @@ wait: 
        /* 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, rt_clock, delay_ns);

        block_job_sleep_ns(&s->common, QEMU_CLOCK_REALTIME, delay_ns);

        if (block_job_is_cancelled(&s->common)) {

            break;

        }

blockjob.c

+2 −2
Original line number Diff line number Diff line
@@ -187,7 +187,7 @@ int block_job_cancel_sync(BlockJob *job) 
    return (data.cancelled && data.ret == 0) ? -ECANCELED : data.ret;

}



void block_job_sleep_ns(BlockJob *job, QEMUClock *clock, int64_t ns)

void block_job_sleep_ns(BlockJob *job, QEMUClockType type, int64_t ns)

{

    assert(job->busy);
@@ -200,7 +200,7 @@ void block_job_sleep_ns(BlockJob *job, QEMUClock *clock, int64_t ns) 
    if (block_job_is_paused(job)) {

        qemu_coroutine_yield();

    } else {

        co_sleep_ns(clock, ns);

        co_sleep_ns(type, ns);

    }

    job->busy = true;

}