|
|
4a2fec |
From e514856415406ee30a9199843895057faa7e7152 Mon Sep 17 00:00:00 2001
|
|
|
4a2fec |
From: Jeffrey Cody <jcody@redhat.com>
|
|
|
4a2fec |
Date: Thu, 30 Nov 2017 22:49:13 +0100
|
|
|
4a2fec |
Subject: [PATCH 09/21] blockjob: remove clock argument from block_job_sleep_ns
|
|
|
4a2fec |
|
|
|
4a2fec |
RH-Author: Jeffrey Cody <jcody@redhat.com>
|
|
|
4a2fec |
Message-id: <2f57c3ce7143bdde2d8c485e3b1eda19898547dd.1511985875.git.jcody@redhat.com>
|
|
|
4a2fec |
Patchwork-id: 78048
|
|
|
4a2fec |
O-Subject: [RHV7.5 qemu-kvm-rhev PATCH 09/11] blockjob: remove clock argument from block_job_sleep_ns
|
|
|
4a2fec |
Bugzilla: 1506531
|
|
|
4a2fec |
RH-Acked-by: Paolo Bonzini <pbonzini@redhat.com>
|
|
|
4a2fec |
RH-Acked-by: Stefan Hajnoczi <stefanha@redhat.com>
|
|
|
4a2fec |
RH-Acked-by: John Snow <jsnow@redhat.com>
|
|
|
4a2fec |
|
|
|
4a2fec |
From: Paolo Bonzini <pbonzini@redhat.com>
|
|
|
4a2fec |
|
|
|
4a2fec |
All callers are using QEMU_CLOCK_REALTIME, and it will not be possible to
|
|
|
4a2fec |
support more than one clock when block_job_sleep_ns switches to a single
|
|
|
4a2fec |
timer stored in the BlockJob struct.
|
|
|
4a2fec |
|
|
|
4a2fec |
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
|
|
|
4a2fec |
Reviewed-by: Alberto Garcia <berto@igalia.com>
|
|
|
4a2fec |
Tested-By: Jeff Cody <jcody@redhat.com>
|
|
|
4a2fec |
Reviewed-by: Fam Zheng <famz@redhat.com>
|
|
|
4a2fec |
Reviewed-by: Jeff Cody <jcody@redhat.com>
|
|
|
4a2fec |
Reviewed-by: Stefan Hajnoczi <stefanha@redhat.com>
|
|
|
4a2fec |
Signed-off-by: Kevin Wolf <kwolf@redhat.com>
|
|
|
4a2fec |
(cherry picked from commit 5bf1d5a73a4a6d0e2d692bd02b6d7f3eedeed3b7)
|
|
|
4a2fec |
Signed-off-by: Jeff Cody <jcody@redhat.com>
|
|
|
4a2fec |
Signed-off-by: Miroslav Rezanina <mrezanin@redhat.com>
|
|
|
4a2fec |
---
|
|
|
4a2fec |
block/backup.c | 4 ++--
|
|
|
4a2fec |
block/commit.c | 2 +-
|
|
|
4a2fec |
block/mirror.c | 6 +++---
|
|
|
4a2fec |
block/stream.c | 2 +-
|
|
|
4a2fec |
blockjob.c | 5 +++--
|
|
|
4a2fec |
include/block/blockjob_int.h | 7 +++----
|
|
|
4a2fec |
tests/test-blockjob-txn.c | 2 +-
|
|
|
4a2fec |
7 files changed, 14 insertions(+), 14 deletions(-)
|
|
|
4a2fec |
|
|
|
4a2fec |
diff --git a/block/backup.c b/block/backup.c
|
|
|
4a2fec |
index 504a089..ac6dc89 100644
|
|
|
4a2fec |
--- a/block/backup.c
|
|
|
4a2fec |
+++ b/block/backup.c
|
|
|
4a2fec |
@@ -346,9 +346,9 @@ static bool coroutine_fn yield_and_check(BackupBlockJob *job)
|
|
|
4a2fec |
uint64_t delay_ns = ratelimit_calculate_delay(&job->limit,
|
|
|
4a2fec |
job->bytes_read);
|
|
|
4a2fec |
job->bytes_read = 0;
|
|
|
4a2fec |
- block_job_sleep_ns(&job->common, QEMU_CLOCK_REALTIME, delay_ns);
|
|
|
4a2fec |
+ block_job_sleep_ns(&job->common, delay_ns);
|
|
|
4a2fec |
} else {
|
|
|
4a2fec |
- block_job_sleep_ns(&job->common, QEMU_CLOCK_REALTIME, 0);
|
|
|
4a2fec |
+ block_job_sleep_ns(&job->common, 0);
|
|
|
4a2fec |
}
|
|
|
4a2fec |
|
|
|
4a2fec |
if (block_job_is_cancelled(&job->common)) {
|
|
|
4a2fec |
diff --git a/block/commit.c b/block/commit.c
|
|
|
4a2fec |
index 834084b..9dbad9c 100644
|
|
|
4a2fec |
--- a/block/commit.c
|
|
|
4a2fec |
+++ b/block/commit.c
|
|
|
4a2fec |
@@ -179,7 +179,7 @@ static void coroutine_fn commit_run(void *opaque)
|
|
|
4a2fec |
/* Note that even when no rate limit is applied we need to yield
|
|
|
4a2fec |
* with no pending I/O here so that bdrv_drain_all() returns.
|
|
|
4a2fec |
*/
|
|
|
4a2fec |
- block_job_sleep_ns(&s->common, QEMU_CLOCK_REALTIME, delay_ns);
|
|
|
4a2fec |
+ block_job_sleep_ns(&s->common, delay_ns);
|
|
|
4a2fec |
if (block_job_is_cancelled(&s->common)) {
|
|
|
4a2fec |
break;
|
|
|
4a2fec |
}
|
|
|
4a2fec |
diff --git a/block/mirror.c b/block/mirror.c
|
|
|
4a2fec |
index 17278db..b88014e 100644
|
|
|
4a2fec |
--- a/block/mirror.c
|
|
|
4a2fec |
+++ b/block/mirror.c
|
|
|
4a2fec |
@@ -608,7 +608,7 @@ static void mirror_throttle(MirrorBlockJob *s)
|
|
|
4a2fec |
|
|
|
4a2fec |
if (now - s->last_pause_ns > SLICE_TIME) {
|
|
|
4a2fec |
s->last_pause_ns = now;
|
|
|
4a2fec |
- block_job_sleep_ns(&s->common, QEMU_CLOCK_REALTIME, 0);
|
|
|
4a2fec |
+ block_job_sleep_ns(&s->common, 0);
|
|
|
4a2fec |
} else {
|
|
|
4a2fec |
block_job_pause_point(&s->common);
|
|
|
4a2fec |
}
|
|
|
4a2fec |
@@ -891,13 +891,13 @@ static void coroutine_fn mirror_run(void *opaque)
|
|
|
4a2fec |
trace_mirror_before_sleep(s, cnt * BDRV_SECTOR_SIZE,
|
|
|
4a2fec |
s->synced, delay_ns);
|
|
|
4a2fec |
if (!s->synced) {
|
|
|
4a2fec |
- block_job_sleep_ns(&s->common, QEMU_CLOCK_REALTIME, delay_ns);
|
|
|
4a2fec |
+ block_job_sleep_ns(&s->common, delay_ns);
|
|
|
4a2fec |
if (block_job_is_cancelled(&s->common)) {
|
|
|
4a2fec |
break;
|
|
|
4a2fec |
}
|
|
|
4a2fec |
} else if (!should_complete) {
|
|
|
4a2fec |
delay_ns = (s->in_flight == 0 && cnt == 0 ? SLICE_TIME : 0);
|
|
|
4a2fec |
- block_job_sleep_ns(&s->common, QEMU_CLOCK_REALTIME, delay_ns);
|
|
|
4a2fec |
+ block_job_sleep_ns(&s->common, delay_ns);
|
|
|
4a2fec |
}
|
|
|
4a2fec |
s->last_pause_ns = qemu_clock_get_ns(QEMU_CLOCK_REALTIME);
|
|
|
4a2fec |
}
|
|
|
4a2fec |
diff --git a/block/stream.c b/block/stream.c
|
|
|
4a2fec |
index e6f7234..499cdac 100644
|
|
|
4a2fec |
--- a/block/stream.c
|
|
|
4a2fec |
+++ b/block/stream.c
|
|
|
4a2fec |
@@ -141,7 +141,7 @@ static void coroutine_fn stream_run(void *opaque)
|
|
|
4a2fec |
/* Note that even when no rate limit is applied we need to yield
|
|
|
4a2fec |
* with no pending I/O here so that bdrv_drain_all() returns.
|
|
|
4a2fec |
*/
|
|
|
4a2fec |
- block_job_sleep_ns(&s->common, QEMU_CLOCK_REALTIME, delay_ns);
|
|
|
4a2fec |
+ block_job_sleep_ns(&s->common, delay_ns);
|
|
|
4a2fec |
if (block_job_is_cancelled(&s->common)) {
|
|
|
4a2fec |
break;
|
|
|
4a2fec |
}
|
|
|
4a2fec |
diff --git a/blockjob.c b/blockjob.c
|
|
|
4a2fec |
index 2509bba..4d78046 100644
|
|
|
4a2fec |
--- a/blockjob.c
|
|
|
4a2fec |
+++ b/blockjob.c
|
|
|
4a2fec |
@@ -788,7 +788,7 @@ bool block_job_is_cancelled(BlockJob *job)
|
|
|
4a2fec |
return job->cancelled;
|
|
|
4a2fec |
}
|
|
|
4a2fec |
|
|
|
4a2fec |
-void block_job_sleep_ns(BlockJob *job, QEMUClockType type, int64_t ns)
|
|
|
4a2fec |
+void block_job_sleep_ns(BlockJob *job, int64_t ns)
|
|
|
4a2fec |
{
|
|
|
4a2fec |
assert(job->busy);
|
|
|
4a2fec |
|
|
|
4a2fec |
@@ -803,7 +803,8 @@ void block_job_sleep_ns(BlockJob *job, QEMUClockType type, int64_t ns)
|
|
|
4a2fec |
* it wakes and runs, otherwise we risk double-entry or entry after
|
|
|
4a2fec |
* completion. */
|
|
|
4a2fec |
if (!block_job_should_pause(job)) {
|
|
|
4a2fec |
- co_aio_sleep_ns(blk_get_aio_context(job->blk), type, ns);
|
|
|
4a2fec |
+ co_aio_sleep_ns(blk_get_aio_context(job->blk),
|
|
|
4a2fec |
+ QEMU_CLOCK_REALTIME, ns);
|
|
|
4a2fec |
}
|
|
|
4a2fec |
|
|
|
4a2fec |
block_job_pause_point(job);
|
|
|
4a2fec |
diff --git a/include/block/blockjob_int.h b/include/block/blockjob_int.h
|
|
|
4a2fec |
index 43f3be2..f7ab183 100644
|
|
|
4a2fec |
--- a/include/block/blockjob_int.h
|
|
|
4a2fec |
+++ b/include/block/blockjob_int.h
|
|
|
4a2fec |
@@ -139,14 +139,13 @@ void *block_job_create(const char *job_id, const BlockJobDriver *driver,
|
|
|
4a2fec |
/**
|
|
|
4a2fec |
* block_job_sleep_ns:
|
|
|
4a2fec |
* @job: The job that calls the function.
|
|
|
4a2fec |
- * @clock: The clock to sleep on.
|
|
|
4a2fec |
* @ns: How many nanoseconds to stop for.
|
|
|
4a2fec |
*
|
|
|
4a2fec |
* Put the job to sleep (assuming that it wasn't canceled) for @ns
|
|
|
4a2fec |
- * nanoseconds. Canceling the job will not interrupt the wait, so the
|
|
|
4a2fec |
- * cancel will not process until the coroutine wakes up.
|
|
|
4a2fec |
+ * %QEMU_CLOCK_REALTIME nanoseconds. Canceling the job will not interrupt
|
|
|
4a2fec |
+ * the wait, so the cancel will not process until the coroutine wakes up.
|
|
|
4a2fec |
*/
|
|
|
4a2fec |
-void block_job_sleep_ns(BlockJob *job, QEMUClockType type, int64_t ns);
|
|
|
4a2fec |
+void block_job_sleep_ns(BlockJob *job, int64_t ns);
|
|
|
4a2fec |
|
|
|
4a2fec |
/**
|
|
|
4a2fec |
* block_job_yield:
|
|
|
4a2fec |
diff --git a/tests/test-blockjob-txn.c b/tests/test-blockjob-txn.c
|
|
|
4a2fec |
index c77343f..3591c96 100644
|
|
|
4a2fec |
--- a/tests/test-blockjob-txn.c
|
|
|
4a2fec |
+++ b/tests/test-blockjob-txn.c
|
|
|
4a2fec |
@@ -44,7 +44,7 @@ static void coroutine_fn test_block_job_run(void *opaque)
|
|
|
4a2fec |
|
|
|
4a2fec |
while (s->iterations--) {
|
|
|
4a2fec |
if (s->use_timer) {
|
|
|
4a2fec |
- block_job_sleep_ns(job, QEMU_CLOCK_REALTIME, 0);
|
|
|
4a2fec |
+ block_job_sleep_ns(job, 0);
|
|
|
4a2fec |
} else {
|
|
|
4a2fec |
block_job_yield(job);
|
|
|
4a2fec |
}
|
|
|
4a2fec |
--
|
|
|
4a2fec |
1.8.3.1
|
|
|
4a2fec |
|