yeahuh / rpms / qemu-kvm

Forked from rpms/qemu-kvm 2 years ago
Clone
ae23c9
From 603278c7c9f5e89f7db4c98b81d2b3d64a6bbe6b Mon Sep 17 00:00:00 2001
ae23c9
From: Kevin Wolf <kwolf@redhat.com>
ae23c9
Date: Tue, 26 Jun 2018 09:48:28 +0200
ae23c9
Subject: [PATCH 120/268] job: Add job_transition_to_ready()
ae23c9
ae23c9
RH-Author: Kevin Wolf <kwolf@redhat.com>
ae23c9
Message-id: <20180626094856.6924-46-kwolf@redhat.com>
ae23c9
Patchwork-id: 81114
ae23c9
O-Subject: [RHV-7.6 qemu-kvm-rhev PATCH v2 45/73] job: Add job_transition_to_ready()
ae23c9
Bugzilla: 1513543
ae23c9
RH-Acked-by: Jeffrey Cody <jcody@redhat.com>
ae23c9
RH-Acked-by: Max Reitz <mreitz@redhat.com>
ae23c9
RH-Acked-by: Fam Zheng <famz@redhat.com>
ae23c9
ae23c9
The transition to the READY state was still performed in the BlockJob
ae23c9
layer, in the same function that sent the BLOCK_JOB_READY QMP event.
ae23c9
ae23c9
This patch brings the state transition to the Job layer and implements
ae23c9
the QMP event using a notifier called from the Job layer, like we
ae23c9
already do for other events related to state transitions.
ae23c9
ae23c9
Signed-off-by: Kevin Wolf <kwolf@redhat.com>
ae23c9
Reviewed-by: Max Reitz <mreitz@redhat.com>
ae23c9
(cherry picked from commit 2e1795b58131427719c7cd11f8b9b6984b3f24f8)
ae23c9
Signed-off-by: Kevin Wolf <kwolf@redhat.com>
ae23c9
Signed-off-by: Miroslav Rezanina <mrezanin@redhat.com>
ae23c9
---
ae23c9
 block/mirror.c               |  6 +++---
ae23c9
 blockjob.c                   | 33 ++++++++++++++++++---------------
ae23c9
 include/block/blockjob.h     |  3 +++
ae23c9
 include/block/blockjob_int.h |  8 --------
ae23c9
 include/qemu/job.h           |  9 ++++++---
ae23c9
 job.c                        | 16 +++++++++++++---
ae23c9
 tests/test-bdrv-drain.c      |  2 +-
ae23c9
 tests/test-blockjob.c        |  2 +-
ae23c9
 8 files changed, 45 insertions(+), 34 deletions(-)
ae23c9
ae23c9
diff --git a/block/mirror.c b/block/mirror.c
ae23c9
index 687f955..bdc1b5b 100644
ae23c9
--- a/block/mirror.c
ae23c9
+++ b/block/mirror.c
ae23c9
@@ -727,8 +727,8 @@ static void coroutine_fn mirror_run(void *opaque)
ae23c9
     }
ae23c9
 
ae23c9
     if (s->bdev_length == 0) {
ae23c9
-        /* Report BLOCK_JOB_READY and wait for complete. */
ae23c9
-        block_job_event_ready(&s->common);
ae23c9
+        /* Transition to the READY state and wait for complete. */
ae23c9
+        job_transition_to_ready(&s->common.job);
ae23c9
         s->synced = true;
ae23c9
         while (!job_is_cancelled(&s->common.job) && !s->should_complete) {
ae23c9
             job_yield(&s->common.job);
ae23c9
@@ -824,7 +824,7 @@ static void coroutine_fn mirror_run(void *opaque)
ae23c9
                  * report completion.  This way, block-job-cancel will leave
ae23c9
                  * the target in a consistent state.
ae23c9
                  */
ae23c9
-                block_job_event_ready(&s->common);
ae23c9
+                job_transition_to_ready(&s->common.job);
ae23c9
                 s->synced = true;
ae23c9
             }
ae23c9
 
ae23c9
diff --git a/blockjob.c b/blockjob.c
ae23c9
index 38f18e9..da11b3b 100644
ae23c9
--- a/blockjob.c
ae23c9
+++ b/blockjob.c
ae23c9
@@ -338,6 +338,22 @@ static void block_job_event_pending(Notifier *n, void *opaque)
ae23c9
                                       &error_abort);
ae23c9
 }
ae23c9
 
ae23c9
+static void block_job_event_ready(Notifier *n, void *opaque)
ae23c9
+{
ae23c9
+    BlockJob *job = opaque;
ae23c9
+
ae23c9
+    if (block_job_is_internal(job)) {
ae23c9
+        return;
ae23c9
+    }
ae23c9
+
ae23c9
+    qapi_event_send_block_job_ready(job_type(&job->job),
ae23c9
+                                    job->job.id,
ae23c9
+                                    job->len,
ae23c9
+                                    job->offset,
ae23c9
+                                    job->speed, &error_abort);
ae23c9
+}
ae23c9
+
ae23c9
+
ae23c9
 /*
ae23c9
  * API for block job drivers and the block layer.  These functions are
ae23c9
  * declared in blockjob_int.h.
ae23c9
@@ -386,12 +402,14 @@ void *block_job_create(const char *job_id, const BlockJobDriver *driver,
ae23c9
     job->finalize_cancelled_notifier.notify = block_job_event_cancelled;
ae23c9
     job->finalize_completed_notifier.notify = block_job_event_completed;
ae23c9
     job->pending_notifier.notify = block_job_event_pending;
ae23c9
+    job->ready_notifier.notify = block_job_event_ready;
ae23c9
 
ae23c9
     notifier_list_add(&job->job.on_finalize_cancelled,
ae23c9
                       &job->finalize_cancelled_notifier);
ae23c9
     notifier_list_add(&job->job.on_finalize_completed,
ae23c9
                       &job->finalize_completed_notifier);
ae23c9
     notifier_list_add(&job->job.on_pending, &job->pending_notifier);
ae23c9
+    notifier_list_add(&job->job.on_ready, &job->ready_notifier);
ae23c9
 
ae23c9
     error_setg(&job->blocker, "block device is in use by block job: %s",
ae23c9
                job_type_str(&job->job));
ae23c9
@@ -433,21 +451,6 @@ void block_job_user_resume(Job *job)
ae23c9
     block_job_iostatus_reset(bjob);
ae23c9
 }
ae23c9
 
ae23c9
-void block_job_event_ready(BlockJob *job)
ae23c9
-{
ae23c9
-    job_state_transition(&job->job, JOB_STATUS_READY);
ae23c9
-
ae23c9
-    if (block_job_is_internal(job)) {
ae23c9
-        return;
ae23c9
-    }
ae23c9
-
ae23c9
-    qapi_event_send_block_job_ready(job_type(&job->job),
ae23c9
-                                    job->job.id,
ae23c9
-                                    job->len,
ae23c9
-                                    job->offset,
ae23c9
-                                    job->speed, &error_abort);
ae23c9
-}
ae23c9
-
ae23c9
 BlockErrorAction block_job_error_action(BlockJob *job, BlockdevOnError on_err,
ae23c9
                                         int is_read, int error)
ae23c9
 {
ae23c9
diff --git a/include/block/blockjob.h b/include/block/blockjob.h
ae23c9
index 8e1e1ee..4fca45f 100644
ae23c9
--- a/include/block/blockjob.h
ae23c9
+++ b/include/block/blockjob.h
ae23c9
@@ -76,6 +76,9 @@ typedef struct BlockJob {
ae23c9
     /** Called when the job transitions to PENDING */
ae23c9
     Notifier pending_notifier;
ae23c9
 
ae23c9
+    /** Called when the job transitions to READY */
ae23c9
+    Notifier ready_notifier;
ae23c9
+
ae23c9
     /** BlockDriverStates that are involved in this block job */
ae23c9
     GSList *nodes;
ae23c9
 } BlockJob;
ae23c9
diff --git a/include/block/blockjob_int.h b/include/block/blockjob_int.h
ae23c9
index 806ac64..5cd50c6 100644
ae23c9
--- a/include/block/blockjob_int.h
ae23c9
+++ b/include/block/blockjob_int.h
ae23c9
@@ -116,14 +116,6 @@ void block_job_drain(Job *job);
ae23c9
 int64_t block_job_ratelimit_get_delay(BlockJob *job, uint64_t n);
ae23c9
 
ae23c9
 /**
ae23c9
- * block_job_event_ready:
ae23c9
- * @job: The job which is now ready to be completed.
ae23c9
- *
ae23c9
- * Send a BLOCK_JOB_READY event for the specified job.
ae23c9
- */
ae23c9
-void block_job_event_ready(BlockJob *job);
ae23c9
-
ae23c9
-/**
ae23c9
  * block_job_error_action:
ae23c9
  * @job: The job to signal an error for.
ae23c9
  * @on_err: The error action setting.
ae23c9
diff --git a/include/qemu/job.h b/include/qemu/job.h
ae23c9
index 487f9d9..bfc2bc5 100644
ae23c9
--- a/include/qemu/job.h
ae23c9
+++ b/include/qemu/job.h
ae23c9
@@ -132,6 +132,9 @@ typedef struct Job {
ae23c9
     /** Notifiers called when the job transitions to PENDING */
ae23c9
     NotifierList on_pending;
ae23c9
 
ae23c9
+    /** Notifiers called when the job transitions to READY */
ae23c9
+    NotifierList on_ready;
ae23c9
+
ae23c9
     /** Element of the list of jobs */
ae23c9
     QLIST_ENTRY(Job) job_list;
ae23c9
 
ae23c9
@@ -426,6 +429,9 @@ int job_apply_verb(Job *job, JobVerb verb, Error **errp);
ae23c9
 /** The @job could not be started, free it. */
ae23c9
 void job_early_fail(Job *job);
ae23c9
 
ae23c9
+/** Moves the @job from RUNNING to READY */
ae23c9
+void job_transition_to_ready(Job *job);
ae23c9
+
ae23c9
 /**
ae23c9
  * @job: The job being completed.
ae23c9
  * @ret: The status code.
ae23c9
@@ -522,7 +528,4 @@ void job_defer_to_main_loop(Job *job, JobDeferToMainLoopFn *fn, void *opaque);
ae23c9
  */
ae23c9
 int job_finish_sync(Job *job, void (*finish)(Job *, Error **errp), Error **errp);
ae23c9
 
ae23c9
-/* TODO To be removed from the public interface */
ae23c9
-void job_state_transition(Job *job, JobStatus s1);
ae23c9
-
ae23c9
 #endif
ae23c9
diff --git a/job.c b/job.c
ae23c9
index aa4c746..b5bd51b 100644
ae23c9
--- a/job.c
ae23c9
+++ b/job.c
ae23c9
@@ -157,9 +157,7 @@ static int job_txn_apply(JobTxn *txn, int fn(Job *), bool lock)
ae23c9
     return rc;
ae23c9
 }
ae23c9
 
ae23c9
-
ae23c9
-/* TODO Make static once the whole state machine is in job.c */
ae23c9
-void job_state_transition(Job *job, JobStatus s1)
ae23c9
+static void job_state_transition(Job *job, JobStatus s1)
ae23c9
 {
ae23c9
     JobStatus s0 = job->status;
ae23c9
     assert(s1 >= 0 && s1 <= JOB_STATUS__MAX);
ae23c9
@@ -321,6 +319,7 @@ void *job_create(const char *job_id, const JobDriver *driver, JobTxn *txn,
ae23c9
     notifier_list_init(&job->on_finalize_cancelled);
ae23c9
     notifier_list_init(&job->on_finalize_completed);
ae23c9
     notifier_list_init(&job->on_pending);
ae23c9
+    notifier_list_init(&job->on_ready);
ae23c9
 
ae23c9
     job_state_transition(job, JOB_STATUS_CREATED);
ae23c9
     aio_timer_init(qemu_get_aio_context(), &job->sleep_timer,
ae23c9
@@ -380,6 +379,11 @@ static void job_event_pending(Job *job)
ae23c9
     notifier_list_notify(&job->on_pending, job);
ae23c9
 }
ae23c9
 
ae23c9
+static void job_event_ready(Job *job)
ae23c9
+{
ae23c9
+    notifier_list_notify(&job->on_ready, job);
ae23c9
+}
ae23c9
+
ae23c9
 void job_enter_cond(Job *job, bool(*fn)(Job *job))
ae23c9
 {
ae23c9
     if (!job_started(job)) {
ae23c9
@@ -799,6 +803,12 @@ static int job_transition_to_pending(Job *job)
ae23c9
     return 0;
ae23c9
 }
ae23c9
 
ae23c9
+void job_transition_to_ready(Job *job)
ae23c9
+{
ae23c9
+    job_state_transition(job, JOB_STATUS_READY);
ae23c9
+    job_event_ready(job);
ae23c9
+}
ae23c9
+
ae23c9
 static void job_completed_txn_success(Job *job)
ae23c9
 {
ae23c9
     JobTxn *txn = job->txn;
ae23c9
diff --git a/tests/test-bdrv-drain.c b/tests/test-bdrv-drain.c
ae23c9
index 3600ffd..2cba63b 100644
ae23c9
--- a/tests/test-bdrv-drain.c
ae23c9
+++ b/tests/test-bdrv-drain.c
ae23c9
@@ -505,7 +505,7 @@ static void coroutine_fn test_job_start(void *opaque)
ae23c9
 {
ae23c9
     TestBlockJob *s = opaque;
ae23c9
 
ae23c9
-    block_job_event_ready(&s->common);
ae23c9
+    job_transition_to_ready(&s->common.job);
ae23c9
     while (!s->should_complete) {
ae23c9
         job_sleep_ns(&s->common.job, 100000);
ae23c9
     }
ae23c9
diff --git a/tests/test-blockjob.c b/tests/test-blockjob.c
ae23c9
index 8180d03..e408d52 100644
ae23c9
--- a/tests/test-blockjob.c
ae23c9
+++ b/tests/test-blockjob.c
ae23c9
@@ -186,7 +186,7 @@ static void coroutine_fn cancel_job_start(void *opaque)
ae23c9
         }
ae23c9
 
ae23c9
         if (!job_is_ready(&s->common.job) && s->should_converge) {
ae23c9
-            block_job_event_ready(&s->common);
ae23c9
+            job_transition_to_ready(&s->common.job);
ae23c9
         }
ae23c9
 
ae23c9
         job_sleep_ns(&s->common.job, 100000);
ae23c9
-- 
ae23c9
1.8.3.1
ae23c9