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