[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH v2 12/13] blockjob: privatize block_job_sleep_ns
From: |
John Snow |
Subject: |
[Qemu-devel] [PATCH v2 12/13] blockjob: privatize block_job_sleep_ns |
Date: |
Fri, 19 Jan 2018 15:58:46 -0500 |
There's not currently any external caller of it.
Except in tests, but we'll fix that here too.
Replace usages in test cases with block_job_relax, which functions
similarly enough to be used as a drop-in replacement.
Very technically block_job_sleep_ns(job, 0) behaves differently
from block_job_relax(job, 0) in that relax may resolve to a no-op,
but this makes no difference in the test in which it is used.
Signed-off-by: John Snow <address@hidden>
---
blockjob.c | 11 ++++++++++-
include/block/blockjob_int.h | 11 -----------
tests/test-bdrv-drain.c | 2 +-
tests/test-blockjob-txn.c | 2 +-
4 files changed, 12 insertions(+), 14 deletions(-)
diff --git a/blockjob.c b/blockjob.c
index b5a0cda412..40167d6896 100644
--- a/blockjob.c
+++ b/blockjob.c
@@ -876,7 +876,16 @@ bool block_job_is_cancelled(BlockJob *job)
return job->cancelled;
}
-int block_job_sleep_ns(BlockJob *job, int64_t ns)
+/**
+ * block_job_sleep_ns:
+ * @job: The job that calls the function.
+ * @ns: How many nanoseconds to stop for.
+ *
+ * Put the job to sleep (assuming that it wasn't canceled) for @ns
+ * %QEMU_CLOCK_REALTIME nanoseconds. Canceling the job will immediately
+ * interrupt the wait.
+ */
+static int block_job_sleep_ns(BlockJob *job, int64_t ns)
{
assert(job->busy);
diff --git a/include/block/blockjob_int.h b/include/block/blockjob_int.h
index 1ceb47e1e6..c4891a5a9b 100644
--- a/include/block/blockjob_int.h
+++ b/include/block/blockjob_int.h
@@ -138,17 +138,6 @@ void *block_job_create(const char *job_id, const
BlockJobDriver *driver,
uint64_t shared_perm, int64_t speed, int flags,
BlockCompletionFunc *cb, void *opaque, Error **errp);
-/**
- * block_job_sleep_ns:
- * @job: The job that calls the function.
- * @ns: How many nanoseconds to stop for.
- *
- * Put the job to sleep (assuming that it wasn't canceled) for @ns
- * %QEMU_CLOCK_REALTIME nanoseconds. Canceling the job will immediately
- * interrupt the wait.
- */
-int block_job_sleep_ns(BlockJob *job, int64_t ns);
-
/**
* block_job_yield:
* @job: The job that calls the function.
diff --git a/tests/test-bdrv-drain.c b/tests/test-bdrv-drain.c
index d760e2b243..5d47541b4c 100644
--- a/tests/test-bdrv-drain.c
+++ b/tests/test-bdrv-drain.c
@@ -506,7 +506,7 @@ static void coroutine_fn test_job_start(void *opaque)
TestBlockJob *s = opaque;
while (!s->should_complete) {
- block_job_sleep_ns(&s->common, 100000);
+ block_job_relax(&s->common, 100000);
}
block_job_defer_to_main_loop(&s->common, test_job_completed, NULL);
diff --git a/tests/test-blockjob-txn.c b/tests/test-blockjob-txn.c
index 3591c9617f..edcf0de6bd 100644
--- a/tests/test-blockjob-txn.c
+++ b/tests/test-blockjob-txn.c
@@ -44,7 +44,7 @@ static void coroutine_fn test_block_job_run(void *opaque)
while (s->iterations--) {
if (s->use_timer) {
- block_job_sleep_ns(job, 0);
+ block_job_relax(job, 0);
} else {
block_job_yield(job);
}
--
2.14.3
- [Qemu-devel] [PATCH v2 02/13] blockjob: consolidate SLICE_TIME definition, (continued)
- [Qemu-devel] [PATCH v2 02/13] blockjob: consolidate SLICE_TIME definition, John Snow, 2018/01/19
- [Qemu-devel] [PATCH v2 03/13] blockjob: create block_job_relax, John Snow, 2018/01/19
- [Qemu-devel] [PATCH v2 01/13] blockjob: record time of last entrance, John Snow, 2018/01/19
- [Qemu-devel] [PATCH v2 05/13] block/commit: use block_job_relax, John Snow, 2018/01/19
- [Qemu-devel] [PATCH v2 04/13] blockjob: allow block_job_throttle to take delay_ns, John Snow, 2018/01/19
- [Qemu-devel] [PATCH v2 06/13] block/stream: use block_job_relax, John Snow, 2018/01/19
- [Qemu-devel] [PATCH v2 07/13] block/backup: use block_job_relax, John Snow, 2018/01/19
- [Qemu-devel] [PATCH v2 08/13] allow block_job_relax to return -ECANCELED, John Snow, 2018/01/19
- [Qemu-devel] [PATCH v2 09/13] block/backup: remove yield_and_check, John Snow, 2018/01/19
- [Qemu-devel] [PATCH v2 10/13] block/mirror: condense cancellation and relax calls, John Snow, 2018/01/19
- [Qemu-devel] [PATCH v2 12/13] blockjob: privatize block_job_sleep_ns,
John Snow <=
- [Qemu-devel] [PATCH v2 11/13] block/mirror: remove block_job_sleep_ns calls, John Snow, 2018/01/19
- [Qemu-devel] [PATCH v2 13/13] blockjob: remove block_job_pause_point from interface, John Snow, 2018/01/19
- Re: [Qemu-devel] [PATCH v2 00/13] blockjob: refactor mirror_throttle, no-reply, 2018/01/19
- Re: [Qemu-devel] [PATCH v2 00/13] blockjob: refactor mirror_throttle, John Snow, 2018/01/30