[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-block] [PULL 14/32] coroutine: use QSIMPLEQ instead of QTAILQ
From: |
Kevin Wolf |
Subject: |
[Qemu-block] [PULL 14/32] coroutine: use QSIMPLEQ instead of QTAILQ |
Date: |
Fri, 8 Jul 2016 19:21:26 +0200 |
From: Paolo Bonzini <address@hidden>
CoQueue do not need to remove any element but the head of the list;
processing is always strictly FIFO. Therefore, the simpler singly-linked
QSIMPLEQ can be used instead.
Reviewed-by: Stefan Hajnoczi <address@hidden>
Signed-off-by: Paolo Bonzini <address@hidden>
Reviewed-by: Fam Zheng <address@hidden>
Signed-off-by: Kevin Wolf <address@hidden>
---
include/qemu/coroutine.h | 2 +-
include/qemu/coroutine_int.h | 4 ++--
util/qemu-coroutine-lock.c | 22 +++++++++++-----------
util/qemu-coroutine.c | 2 +-
4 files changed, 15 insertions(+), 15 deletions(-)
diff --git a/include/qemu/coroutine.h b/include/qemu/coroutine.h
index 305fe76..63ae7fe 100644
--- a/include/qemu/coroutine.h
+++ b/include/qemu/coroutine.h
@@ -102,7 +102,7 @@ bool qemu_in_coroutine(void);
* are built.
*/
typedef struct CoQueue {
- QTAILQ_HEAD(, Coroutine) entries;
+ QSIMPLEQ_HEAD(, Coroutine) entries;
} CoQueue;
/**
diff --git a/include/qemu/coroutine_int.h b/include/qemu/coroutine_int.h
index 42d6838..581a7f5 100644
--- a/include/qemu/coroutine_int.h
+++ b/include/qemu/coroutine_int.h
@@ -41,8 +41,8 @@ struct Coroutine {
QSLIST_ENTRY(Coroutine) pool_next;
/* Coroutines that should be woken up when we yield or terminate */
- QTAILQ_HEAD(, Coroutine) co_queue_wakeup;
- QTAILQ_ENTRY(Coroutine) co_queue_next;
+ QSIMPLEQ_HEAD(, Coroutine) co_queue_wakeup;
+ QSIMPLEQ_ENTRY(Coroutine) co_queue_next;
};
Coroutine *qemu_coroutine_new(void);
diff --git a/util/qemu-coroutine-lock.c b/util/qemu-coroutine-lock.c
index da37ca7..cf53693 100644
--- a/util/qemu-coroutine-lock.c
+++ b/util/qemu-coroutine-lock.c
@@ -31,13 +31,13 @@
void qemu_co_queue_init(CoQueue *queue)
{
- QTAILQ_INIT(&queue->entries);
+ QSIMPLEQ_INIT(&queue->entries);
}
void coroutine_fn qemu_co_queue_wait(CoQueue *queue)
{
Coroutine *self = qemu_coroutine_self();
- QTAILQ_INSERT_TAIL(&queue->entries, self, co_queue_next);
+ QSIMPLEQ_INSERT_TAIL(&queue->entries, self, co_queue_next);
qemu_coroutine_yield();
assert(qemu_in_coroutine());
}
@@ -55,8 +55,8 @@ void qemu_co_queue_run_restart(Coroutine *co)
Coroutine *next;
trace_qemu_co_queue_run_restart(co);
- while ((next = QTAILQ_FIRST(&co->co_queue_wakeup))) {
- QTAILQ_REMOVE(&co->co_queue_wakeup, next, co_queue_next);
+ while ((next = QSIMPLEQ_FIRST(&co->co_queue_wakeup))) {
+ QSIMPLEQ_REMOVE_HEAD(&co->co_queue_wakeup, co_queue_next);
qemu_coroutine_enter(next, NULL);
}
}
@@ -66,13 +66,13 @@ static bool qemu_co_queue_do_restart(CoQueue *queue, bool
single)
Coroutine *self = qemu_coroutine_self();
Coroutine *next;
- if (QTAILQ_EMPTY(&queue->entries)) {
+ if (QSIMPLEQ_EMPTY(&queue->entries)) {
return false;
}
- while ((next = QTAILQ_FIRST(&queue->entries)) != NULL) {
- QTAILQ_REMOVE(&queue->entries, next, co_queue_next);
- QTAILQ_INSERT_TAIL(&self->co_queue_wakeup, next, co_queue_next);
+ while ((next = QSIMPLEQ_FIRST(&queue->entries)) != NULL) {
+ QSIMPLEQ_REMOVE_HEAD(&queue->entries, co_queue_next);
+ QSIMPLEQ_INSERT_TAIL(&self->co_queue_wakeup, next, co_queue_next);
trace_qemu_co_queue_next(next);
if (single) {
break;
@@ -97,19 +97,19 @@ bool qemu_co_enter_next(CoQueue *queue)
{
Coroutine *next;
- next = QTAILQ_FIRST(&queue->entries);
+ next = QSIMPLEQ_FIRST(&queue->entries);
if (!next) {
return false;
}
- QTAILQ_REMOVE(&queue->entries, next, co_queue_next);
+ QSIMPLEQ_REMOVE_HEAD(&queue->entries, co_queue_next);
qemu_coroutine_enter(next, NULL);
return true;
}
bool qemu_co_queue_empty(CoQueue *queue)
{
- return QTAILQ_FIRST(&queue->entries) == NULL;
+ return QSIMPLEQ_FIRST(&queue->entries) == NULL;
}
void qemu_co_mutex_init(CoMutex *mutex)
diff --git a/util/qemu-coroutine.c b/util/qemu-coroutine.c
index 5816702..b7cb636 100644
--- a/util/qemu-coroutine.c
+++ b/util/qemu-coroutine.c
@@ -76,7 +76,7 @@ Coroutine *qemu_coroutine_create(CoroutineEntry *entry)
}
co->entry = entry;
- QTAILQ_INIT(&co->co_queue_wakeup);
+ QSIMPLEQ_INIT(&co->co_queue_wakeup);
return co;
}
--
1.8.3.1
- [Qemu-block] [PULL 01/32] stream: Fix prototype of stream_start(), (continued)
- [Qemu-block] [PULL 01/32] stream: Fix prototype of stream_start(), Kevin Wolf, 2016/07/08
- [Qemu-block] [PULL 02/32] blockjob: Update description of the 'id' field, Kevin Wolf, 2016/07/08
- [Qemu-block] [PULL 03/32] blockjob: Add block_job_get(), Kevin Wolf, 2016/07/08
- [Qemu-block] [PULL 04/32] block: Use block_job_get() in find_block_job(), Kevin Wolf, 2016/07/08
- [Qemu-block] [PULL 07/32] backup: Add 'job-id' parameter to 'blockdev-backup' and 'drive-backup', Kevin Wolf, 2016/07/08
- [Qemu-block] [PULL 12/32] osdep: Introduce qemu_dup, Kevin Wolf, 2016/07/08
- [Qemu-block] [PULL 13/32] raw-posix: Use qemu_dup, Kevin Wolf, 2016/07/08
- [Qemu-block] [PULL 08/32] stream: Add 'job-id' parameter to 'block-stream', Kevin Wolf, 2016/07/08
- [Qemu-block] [PULL 05/32] blockjob: Add 'job_id' parameter to block_job_create(), Kevin Wolf, 2016/07/08
- [Qemu-block] [PULL 06/32] mirror: Add 'job-id' parameter to 'blockdev-mirror' and 'drive-mirror', Kevin Wolf, 2016/07/08
- [Qemu-block] [PULL 14/32] coroutine: use QSIMPLEQ instead of QTAILQ,
Kevin Wolf <=
- [Qemu-block] [PULL 09/32] commit: Add 'job-id' parameter to 'block-commit', Kevin Wolf, 2016/07/08
- [Qemu-block] [PULL 10/32] qemu-img: Set the ID of the block job in img_commit(), Kevin Wolf, 2016/07/08
- [Qemu-block] [PULL 11/32] blockjob: Update description of the 'device' field in the QMP API, Kevin Wolf, 2016/07/08
- [Qemu-block] [PULL 18/32] block/qdev: Allow configuring WCE with qdev properties, Kevin Wolf, 2016/07/08
- [Qemu-block] [PULL 17/32] block/qdev: Allow node name for drive properties, Kevin Wolf, 2016/07/08
- [Qemu-block] [PULL 15/32] test-coroutine: prepare for the next patch, Kevin Wolf, 2016/07/08
- [Qemu-block] [PULL 19/32] commit: Fix use of error handling policy, Kevin Wolf, 2016/07/08