[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PATCH v4 5/9] block/block-copy: factor out find_conflicting_inflight_re
From: |
Vladimir Sementsov-Ogievskiy |
Subject: |
[PATCH v4 5/9] block/block-copy: factor out find_conflicting_inflight_req |
Date: |
Wed, 11 Mar 2020 13:30:00 +0300 |
Split find_conflicting_inflight_req to be used separately.
Signed-off-by: Vladimir Sementsov-Ogievskiy <address@hidden>
Reviewed-by: Andrey Shinkevich <address@hidden>
Reviewed-by: Max Reitz <address@hidden>
---
block/block-copy.c | 31 +++++++++++++++++++------------
1 file changed, 19 insertions(+), 12 deletions(-)
diff --git a/block/block-copy.c b/block/block-copy.c
index b075dba206..251d415a2c 100644
--- a/block/block-copy.c
+++ b/block/block-copy.c
@@ -24,23 +24,30 @@
#define BLOCK_COPY_MAX_BUFFER (1 * MiB)
#define BLOCK_COPY_MAX_MEM (128 * MiB)
+static BlockCopyInFlightReq *find_conflicting_inflight_req(BlockCopyState *s,
+ int64_t start,
+ int64_t end)
+{
+ BlockCopyInFlightReq *req;
+
+ QLIST_FOREACH(req, &s->inflight_reqs, list) {
+ if (end > req->start_byte && start < req->end_byte) {
+ return req;
+ }
+ }
+
+ return NULL;
+}
+
static void coroutine_fn block_copy_wait_inflight_reqs(BlockCopyState *s,
int64_t start,
int64_t end)
{
BlockCopyInFlightReq *req;
- bool waited;
-
- do {
- waited = false;
- QLIST_FOREACH(req, &s->inflight_reqs, list) {
- if (end > req->start_byte && start < req->end_byte) {
- qemu_co_queue_wait(&req->wait_queue, NULL);
- waited = true;
- break;
- }
- }
- } while (waited);
+
+ while ((req = find_conflicting_inflight_req(s, start, end))) {
+ qemu_co_queue_wait(&req->wait_queue, NULL);
+ }
}
static void block_copy_inflight_req_begin(BlockCopyState *s,
--
2.21.0
- [PATCH v4 0/9] block-copy improvements: part I, Vladimir Sementsov-Ogievskiy, 2020/03/11
- [PATCH v4 5/9] block/block-copy: factor out find_conflicting_inflight_req,
Vladimir Sementsov-Ogievskiy <=
- [PATCH v4 3/9] block/block-copy: specialcase first copy_range request, Vladimir Sementsov-Ogievskiy, 2020/03/11
- [PATCH v4 4/9] block/block-copy: use block_status, Vladimir Sementsov-Ogievskiy, 2020/03/11
- [PATCH v4 1/9] job: refactor progress to separate object, Vladimir Sementsov-Ogievskiy, 2020/03/11
- [PATCH v4 8/9] block/block-copy: reduce intersecting request lock, Vladimir Sementsov-Ogievskiy, 2020/03/11
- [PATCH v4 9/9] block/block-copy: hide structure definitions, Vladimir Sementsov-Ogievskiy, 2020/03/11
- [PATCH v4 7/9] block/block-copy: rename start to offset in interfaces, Vladimir Sementsov-Ogievskiy, 2020/03/11
- [PATCH v4 6/9] block/block-copy: refactor interfaces to use bytes instead of end, Vladimir Sementsov-Ogievskiy, 2020/03/11
- [PATCH v4 2/9] block/block-copy: fix progress calculation, Vladimir Sementsov-Ogievskiy, 2020/03/11
- Re: [PATCH v4 0/9] block-copy improvements: part I, Max Reitz, 2020/03/11