[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-block] [PATCH 02/18] aio: rename bh_lock to list_lock
From: |
Paolo Bonzini |
Subject: |
[Qemu-block] [PATCH 02/18] aio: rename bh_lock to list_lock |
Date: |
Thu, 6 Aug 2015 15:36:00 +0200 |
This will be used for AioHandlers too. There is going to be little
or no contention, so it is better to reuse the same lock.
Signed-off-by: Paolo Bonzini <address@hidden>
---
async.c | 16 ++++++++--------
include/block/aio.h | 2 +-
2 files changed, 9 insertions(+), 9 deletions(-)
diff --git a/async.c b/async.c
index f992914..7e97614 100644
--- a/async.c
+++ b/async.c
@@ -50,12 +50,12 @@ QEMUBH *aio_bh_new(AioContext *ctx, QEMUBHFunc *cb, void
*opaque)
.cb = cb,
.opaque = opaque,
};
- qemu_mutex_lock(&ctx->bh_lock);
+ qemu_mutex_lock(&ctx->list_lock);
bh->next = ctx->first_bh;
/* Make sure that the members are ready before putting bh into list */
smp_wmb();
ctx->first_bh = bh;
- qemu_mutex_unlock(&ctx->bh_lock);
+ qemu_mutex_unlock(&ctx->list_lock);
return bh;
}
@@ -92,7 +92,7 @@ int aio_bh_poll(AioContext *ctx)
/* remove deleted bhs */
if (!ctx->walking_bh) {
- qemu_mutex_lock(&ctx->bh_lock);
+ qemu_mutex_lock(&ctx->list_lock);
bhp = &ctx->first_bh;
while (*bhp) {
bh = *bhp;
@@ -103,7 +103,7 @@ int aio_bh_poll(AioContext *ctx)
bhp = &bh->next;
}
}
- qemu_mutex_unlock(&ctx->bh_lock);
+ qemu_mutex_unlock(&ctx->list_lock);
}
return ret;
@@ -234,7 +234,7 @@ aio_ctx_finalize(GSource *source)
thread_pool_free(ctx->thread_pool);
- qemu_mutex_lock(&ctx->bh_lock);
+ qemu_mutex_lock(&ctx->list_lock);
while (ctx->first_bh) {
QEMUBH *next = ctx->first_bh->next;
@@ -244,12 +244,12 @@ aio_ctx_finalize(GSource *source)
g_free(ctx->first_bh);
ctx->first_bh = next;
}
- qemu_mutex_unlock(&ctx->bh_lock);
+ qemu_mutex_unlock(&ctx->list_lock);
aio_set_event_notifier(ctx, &ctx->notifier, NULL);
event_notifier_cleanup(&ctx->notifier);
rfifolock_destroy(&ctx->lock);
- qemu_mutex_destroy(&ctx->bh_lock);
+ qemu_mutex_destroy(&ctx->list_lock);
timerlistgroup_deinit(&ctx->tlg);
}
@@ -318,7 +318,7 @@ AioContext *aio_context_new(Error **errp)
(EventNotifierHandler *)
event_notifier_dummy_cb);
ctx->thread_pool = NULL;
- qemu_mutex_init(&ctx->bh_lock);
+ qemu_mutex_init(&ctx->list_lock);
rfifolock_init(&ctx->lock, NULL, NULL);
timerlistgroup_init(&ctx->tlg, aio_timerlist_notify, ctx);
diff --git a/include/block/aio.h b/include/block/aio.h
index 9dd32e0..026f6c1 100644
--- a/include/block/aio.h
+++ b/include/block/aio.h
@@ -89,7 +89,7 @@ struct AioContext {
uint32_t notify_me;
/* lock to protect between bh's adders and deleter */
- QemuMutex bh_lock;
+ QemuMutex list_lock;
/* Anchor of the list of Bottom Halves belonging to the context */
struct QEMUBH *first_bh;
--
2.4.3
- [Qemu-block] [RFC PATCH 00/18] Fine-grained AioContext critical sections, Paolo Bonzini, 2015/08/06
- [Qemu-block] [PATCH 02/18] aio: rename bh_lock to list_lock,
Paolo Bonzini <=
- [Qemu-block] [PATCH 03/18] qemu-thread: introduce QemuLockCnt, Paolo Bonzini, 2015/08/06
- [Qemu-block] [PATCH 04/18] aio: make ctx->list_lock a QemuLockCnt, subsuming ctx->walking_bh, Paolo Bonzini, 2015/08/06
- [Qemu-block] [PATCH 06/18] aio-posix: remove walking_handlers, protecting AioHandler list with list_lock, Paolo Bonzini, 2015/08/06
- [Qemu-block] [PATCH 09/18] aio: push aio_context_acquire/release down to dispatching, Paolo Bonzini, 2015/08/06
- [Qemu-block] [PATCH 10/18] async: optimize aio_bh_poll, Paolo Bonzini, 2015/08/06
- [Qemu-block] [PATCH 16/18] quorum: split quorum_fifo_aio_cb from quorum_aio_cb, Paolo Bonzini, 2015/08/06
- [Qemu-block] [PATCH 05/18] aio: tweak walking in dispatch phase, Paolo Bonzini, 2015/08/06
- [Qemu-block] [PATCH 08/18] aio: document locking, Paolo Bonzini, 2015/08/06
- [Qemu-block] [PATCH 14/18] block: explicitly acquire aiocontext in timers that need it, Paolo Bonzini, 2015/08/06
- [Qemu-block] [PATCH 01/18] iothread: release iothread around aio_poll, Paolo Bonzini, 2015/08/06