util/vhost-user-server: rename refcount to in_flight counter

The VuServer object has a refcount field and ref/unref APIs. The name is
confusing because it's actually an in-flight request counter instead of
a refcount.

Normally a refcount destroys the object upon reaching zero. The VuServer
counter is used to wake up the vhost-user coroutine when there are no
more requests.

Avoid confusing by renaming refcount and ref/unref to in_flight and
inc/dec.

Reviewed-by: Paolo Bonzini <pbonzini@redhat.com>
Reviewed-by: Philippe Mathieu-Daudé <philmd@linaro.org>
Signed-off-by: Stefan Hajnoczi <stefanha@redhat.com>
Reviewed-by: Kevin Wolf <kwolf@redhat.com>
Message-Id: <20230516190238.8401-6-stefanha@redhat.com>
Signed-off-by: Kevin Wolf <kwolf@redhat.com>
This commit is contained in:
Stefan Hajnoczi 2023-05-16 15:02:23 -04:00 committed by Kevin Wolf
parent ca66df878e
commit 75d33e8525
3 changed files with 17 additions and 14 deletions

View file

@ -75,16 +75,16 @@ static void panic_cb(VuDev *vu_dev, const char *buf)
error_report("vu_panic: %s", buf);
}
void vhost_user_server_ref(VuServer *server)
void vhost_user_server_inc_in_flight(VuServer *server)
{
assert(!server->wait_idle);
server->refcount++;
server->in_flight++;
}
void vhost_user_server_unref(VuServer *server)
void vhost_user_server_dec_in_flight(VuServer *server)
{
server->refcount--;
if (server->wait_idle && !server->refcount) {
server->in_flight--;
if (server->wait_idle && !server->in_flight) {
aio_co_wake(server->co_trip);
}
}
@ -192,13 +192,13 @@ static coroutine_fn void vu_client_trip(void *opaque)
/* Keep running */
}
if (server->refcount) {
if (server->in_flight) {
/* Wait for requests to complete before we can unmap the memory */
server->wait_idle = true;
qemu_coroutine_yield();
server->wait_idle = false;
}
assert(server->refcount == 0);
assert(server->in_flight == 0);
vu_deinit(vu_dev);