coroutine: Rename qemu_coroutine_inc/dec_pool_size()

It's true that these functions currently affect the batch size in which
coroutines are reused (i.e. moved from the global release pool to the
allocation pool of a specific thread), but this is a bug and will be
fixed in a separate patch.

In fact, the comment in the header file already just promises that it
influences the pool size, so reflect this in the name of the functions.
As a nice side effect, the shorter function name makes some line
wrapping unnecessary.

Cc: qemu-stable@nongnu.org
Signed-off-by: Kevin Wolf <kwolf@redhat.com>
Message-Id: <20220510151020.105528-2-kwolf@redhat.com>
Signed-off-by: Kevin Wolf <kwolf@redhat.com>
This commit is contained in:
Kevin Wolf 2022-05-10 17:10:19 +02:00
parent ec11dc41ee
commit 98e3ab3505
3 changed files with 7 additions and 9 deletions

View File

@ -1215,8 +1215,7 @@ static void virtio_blk_device_realize(DeviceState *dev, Error **errp)
for (i = 0; i < conf->num_queues; i++) { for (i = 0; i < conf->num_queues; i++) {
virtio_add_queue(vdev, conf->queue_size, virtio_blk_handle_output); virtio_add_queue(vdev, conf->queue_size, virtio_blk_handle_output);
} }
qemu_coroutine_increase_pool_batch_size(conf->num_queues * conf->queue_size qemu_coroutine_inc_pool_size(conf->num_queues * conf->queue_size / 2);
/ 2);
virtio_blk_data_plane_create(vdev, conf, &s->dataplane, &err); virtio_blk_data_plane_create(vdev, conf, &s->dataplane, &err);
if (err != NULL) { if (err != NULL) {
error_propagate(errp, err); error_propagate(errp, err);
@ -1253,8 +1252,7 @@ static void virtio_blk_device_unrealize(DeviceState *dev)
for (i = 0; i < conf->num_queues; i++) { for (i = 0; i < conf->num_queues; i++) {
virtio_del_queue(vdev, i); virtio_del_queue(vdev, i);
} }
qemu_coroutine_decrease_pool_batch_size(conf->num_queues * conf->queue_size qemu_coroutine_dec_pool_size(conf->num_queues * conf->queue_size / 2);
/ 2);
qemu_del_vm_change_state_handler(s->change); qemu_del_vm_change_state_handler(s->change);
blockdev_mark_auto_del(s->blk); blockdev_mark_auto_del(s->blk);
virtio_cleanup(vdev); virtio_cleanup(vdev);

View File

@ -334,12 +334,12 @@ void coroutine_fn yield_until_fd_readable(int fd);
/** /**
* Increase coroutine pool size * Increase coroutine pool size
*/ */
void qemu_coroutine_increase_pool_batch_size(unsigned int additional_pool_size); void qemu_coroutine_inc_pool_size(unsigned int additional_pool_size);
/** /**
* Devcrease coroutine pool size * Decrease coroutine pool size
*/ */
void qemu_coroutine_decrease_pool_batch_size(unsigned int additional_pool_size); void qemu_coroutine_dec_pool_size(unsigned int additional_pool_size);
#include "qemu/lockable.h" #include "qemu/lockable.h"

View File

@ -212,12 +212,12 @@ AioContext *coroutine_fn qemu_coroutine_get_aio_context(Coroutine *co)
return co->ctx; return co->ctx;
} }
void qemu_coroutine_increase_pool_batch_size(unsigned int additional_pool_size) void qemu_coroutine_inc_pool_size(unsigned int additional_pool_size)
{ {
qatomic_add(&pool_batch_size, additional_pool_size); qatomic_add(&pool_batch_size, additional_pool_size);
} }
void qemu_coroutine_decrease_pool_batch_size(unsigned int removing_pool_size) void qemu_coroutine_dec_pool_size(unsigned int removing_pool_size)
{ {
qatomic_sub(&pool_batch_size, removing_pool_size); qatomic_sub(&pool_batch_size, removing_pool_size);
} }