cryptospore / rpms / qemu-kvm

Forked from rpms/qemu-kvm 2 years ago
Clone
26ba25
From cb84a9e38278854566813e8e5d275de77a0a9019 Mon Sep 17 00:00:00 2001
26ba25
From: Kevin Wolf <kwolf@redhat.com>
26ba25
Date: Tue, 26 Jun 2018 09:48:25 +0200
26ba25
Subject: [PATCH 117/268] job: Add job_yield()
26ba25
26ba25
RH-Author: Kevin Wolf <kwolf@redhat.com>
26ba25
Message-id: <20180626094856.6924-43-kwolf@redhat.com>
26ba25
Patchwork-id: 81120
26ba25
O-Subject: [RHV-7.6 qemu-kvm-rhev PATCH v2 42/73] job: Add job_yield()
26ba25
Bugzilla: 1513543
26ba25
RH-Acked-by: Jeffrey Cody <jcody@redhat.com>
26ba25
RH-Acked-by: Max Reitz <mreitz@redhat.com>
26ba25
RH-Acked-by: Fam Zheng <famz@redhat.com>
26ba25
26ba25
This moves block_job_yield() to the Job layer.
26ba25
26ba25
Signed-off-by: Kevin Wolf <kwolf@redhat.com>
26ba25
Reviewed-by: Max Reitz <mreitz@redhat.com>
26ba25
(cherry picked from commit 198c49cc8d81e8eb0df3749d395599895c3a3a76)
26ba25
Signed-off-by: Kevin Wolf <kwolf@redhat.com>
26ba25
Signed-off-by: Miroslav Rezanina <mrezanin@redhat.com>
26ba25
---
26ba25
 block/backup.c               |  2 +-
26ba25
 block/mirror.c               |  2 +-
26ba25
 blockjob.c                   | 16 ----------------
26ba25
 include/block/blockjob_int.h |  8 --------
26ba25
 include/qemu/job.h           |  9 +++++++--
26ba25
 job.c                        | 20 ++++++++++++++++++--
26ba25
 tests/test-blockjob-txn.c    |  2 +-
26ba25
 7 files changed, 28 insertions(+), 31 deletions(-)
26ba25
26ba25
diff --git a/block/backup.c b/block/backup.c
26ba25
index b13f91d..6f4f3df 100644
26ba25
--- a/block/backup.c
26ba25
+++ b/block/backup.c
26ba25
@@ -444,7 +444,7 @@ static void coroutine_fn backup_run(void *opaque)
26ba25
         while (!job_is_cancelled(&job->common.job)) {
26ba25
             /* Yield until the job is cancelled.  We just let our before_write
26ba25
              * notify callback service CoW requests. */
26ba25
-            block_job_yield(&job->common);
26ba25
+            job_yield(&job->common.job);
26ba25
         }
26ba25
     } else if (job->sync_mode == MIRROR_SYNC_MODE_INCREMENTAL) {
26ba25
         ret = backup_run_incremental(job);
26ba25
diff --git a/block/mirror.c b/block/mirror.c
26ba25
index c63cf7c..687f955 100644
26ba25
--- a/block/mirror.c
26ba25
+++ b/block/mirror.c
26ba25
@@ -731,7 +731,7 @@ static void coroutine_fn mirror_run(void *opaque)
26ba25
         block_job_event_ready(&s->common);
26ba25
         s->synced = true;
26ba25
         while (!job_is_cancelled(&s->common.job) && !s->should_complete) {
26ba25
-            block_job_yield(&s->common);
26ba25
+            job_yield(&s->common.job);
26ba25
         }
26ba25
         s->common.job.cancelled = false;
26ba25
         goto immediate_exit;
26ba25
diff --git a/blockjob.c b/blockjob.c
26ba25
index 438baa1..f146fe0 100644
26ba25
--- a/blockjob.c
26ba25
+++ b/blockjob.c
26ba25
@@ -431,22 +431,6 @@ void *block_job_create(const char *job_id, const BlockJobDriver *driver,
26ba25
     return job;
26ba25
 }
26ba25
 
26ba25
-void block_job_yield(BlockJob *job)
26ba25
-{
26ba25
-    assert(job->job.busy);
26ba25
-
26ba25
-    /* Check cancellation *before* setting busy = false, too!  */
26ba25
-    if (job_is_cancelled(&job->job)) {
26ba25
-        return;
26ba25
-    }
26ba25
-
26ba25
-    if (!job_should_pause(&job->job)) {
26ba25
-        job_do_yield(&job->job, -1);
26ba25
-    }
26ba25
-
26ba25
-    job_pause_point(&job->job);
26ba25
-}
26ba25
-
26ba25
 void block_job_iostatus_reset(BlockJob *job)
26ba25
 {
26ba25
     if (job->iostatus == BLOCK_DEVICE_IO_STATUS_OK) {
26ba25
diff --git a/include/block/blockjob_int.h b/include/block/blockjob_int.h
26ba25
index 7df07b2..806ac64 100644
26ba25
--- a/include/block/blockjob_int.h
26ba25
+++ b/include/block/blockjob_int.h
26ba25
@@ -108,14 +108,6 @@ void block_job_user_resume(Job *job);
26ba25
 void block_job_drain(Job *job);
26ba25
 
26ba25
 /**
26ba25
- * block_job_yield:
26ba25
- * @job: The job that calls the function.
26ba25
- *
26ba25
- * Yield the block job coroutine.
26ba25
- */
26ba25
-void block_job_yield(BlockJob *job);
26ba25
-
26ba25
-/**
26ba25
  * block_job_ratelimit_get_delay:
26ba25
  *
26ba25
  * Calculate and return delay for the next request in ns. See the documentation
26ba25
diff --git a/include/qemu/job.h b/include/qemu/job.h
26ba25
index bbe1b0c..94900ec 100644
26ba25
--- a/include/qemu/job.h
26ba25
+++ b/include/qemu/job.h
26ba25
@@ -339,6 +339,13 @@ void coroutine_fn job_pause_point(Job *job);
26ba25
 
26ba25
 /**
26ba25
  * @job: The job that calls the function.
26ba25
+ *
26ba25
+ * Yield the job coroutine.
26ba25
+ */
26ba25
+void job_yield(Job *job);
26ba25
+
26ba25
+/**
26ba25
+ * @job: The job that calls the function.
26ba25
  * @ns: How many nanoseconds to stop for.
26ba25
  *
26ba25
  * Put the job to sleep (assuming that it wasn't canceled) for @ns
26ba25
@@ -508,8 +515,6 @@ int job_finish_sync(Job *job, void (*finish)(Job *, Error **errp), Error **errp)
26ba25
 
26ba25
 /* TODO To be removed from the public interface */
26ba25
 void job_state_transition(Job *job, JobStatus s1);
26ba25
-void coroutine_fn job_do_yield(Job *job, uint64_t ns);
26ba25
-bool job_should_pause(Job *job);
26ba25
 void job_do_dismiss(Job *job);
26ba25
 
26ba25
 #endif
26ba25
diff --git a/job.c b/job.c
26ba25
index 2e453f6..eede680 100644
26ba25
--- a/job.c
26ba25
+++ b/job.c
26ba25
@@ -226,7 +226,7 @@ static bool job_started(Job *job)
26ba25
     return job->co;
26ba25
 }
26ba25
 
26ba25
-bool job_should_pause(Job *job)
26ba25
+static bool job_should_pause(Job *job)
26ba25
 {
26ba25
     return job->pause_count > 0;
26ba25
 }
26ba25
@@ -396,7 +396,7 @@ void job_enter(Job *job)
26ba25
  *
26ba25
  * If @ns is (uint64_t) -1, no timer is scheduled and job_enter() must be
26ba25
  * called explicitly. */
26ba25
-void coroutine_fn job_do_yield(Job *job, uint64_t ns)
26ba25
+static void coroutine_fn job_do_yield(Job *job, uint64_t ns)
26ba25
 {
26ba25
     job_lock();
26ba25
     if (ns != -1) {
26ba25
@@ -441,6 +441,22 @@ void coroutine_fn job_pause_point(Job *job)
26ba25
     }
26ba25
 }
26ba25
 
26ba25
+void job_yield(Job *job)
26ba25
+{
26ba25
+    assert(job->busy);
26ba25
+
26ba25
+    /* Check cancellation *before* setting busy = false, too!  */
26ba25
+    if (job_is_cancelled(job)) {
26ba25
+        return;
26ba25
+    }
26ba25
+
26ba25
+    if (!job_should_pause(job)) {
26ba25
+        job_do_yield(job, -1);
26ba25
+    }
26ba25
+
26ba25
+    job_pause_point(job);
26ba25
+}
26ba25
+
26ba25
 void coroutine_fn job_sleep_ns(Job *job, int64_t ns)
26ba25
 {
26ba25
     assert(job->busy);
26ba25
diff --git a/tests/test-blockjob-txn.c b/tests/test-blockjob-txn.c
26ba25
index 34ee179..fce8366 100644
26ba25
--- a/tests/test-blockjob-txn.c
26ba25
+++ b/tests/test-blockjob-txn.c
26ba25
@@ -47,7 +47,7 @@ static void coroutine_fn test_block_job_run(void *opaque)
26ba25
         if (s->use_timer) {
26ba25
             job_sleep_ns(&job->job, 0);
26ba25
         } else {
26ba25
-            block_job_yield(job);
26ba25
+            job_yield(&job->job);
26ba25
         }
26ba25
 
26ba25
         if (job_is_cancelled(&job->job)) {
26ba25
-- 
26ba25
1.8.3.1
26ba25