motorhead/qemu
1
0
Fork 0
mirror of https://github.com/Motorhead1991/qemu.git synced 2025-08-05 00:33:55 -06:00
Code Issues Projects Releases Packages Wiki Activity Actions

hw/rdma: Replace QList by GQueue

Browse source 
RdmaProtectedQList provides a thread-safe queue of int64_t on top of a
QList.

rdma_protected_qlist_destroy() calls qlist_destroy_obj() directly.
qlist_destroy_obj() is actually for use by qobject_destroy() only.
The next commit will make that obvious.

The minimal fix would be calling qobject_unref() instead.  But QList
is actually a bad fit here.  It's designed for representing JSON
arrays.  We're better off with a GQueue here.  Replace.

Cc: Yuval Shaia <yuval.shaia.ml@gmail.com>
Cc: Marcel Apfelbaum <marcel.apfelbaum@gmail.com>
Signed-off-by: Markus Armbruster <armbru@redhat.com>
Message-Id: <20201211171152.146877-8-armbru@redhat.com>
This commit is contained in:
Markus Armbruster 2020-12-11 18:11:39 +01:00
parent 88e25b1e6d
commit bce800869b
4 changed files with 30 additions and 26 deletions
Download patch file Download diff file Expand all files Collapse all files

29
hw/rdma/rdma_utils.c
View file

@ -14,8 +14,6 @@
*/
#include "qemu/osdep.h"
#include "qapi/qmp/qlist.h"
#include "qapi/qmp/qnum.h"
#include "trace.h"
#include "rdma_utils.h"
@ -54,41 +52,46 @@ void rdma_pci_dma_unmap(PCIDevice *dev, void *buffer, dma_addr_t len)
}
}
void rdma_protected_qlist_init(RdmaProtectedQList *list)
void rdma_protected_gqueue_init(RdmaProtectedGQueue *list)
{
qemu_mutex_init(&list->lock);
list->list = qlist_new();
list->list = g_queue_new();
}
void rdma_protected_qlist_destroy(RdmaProtectedQList *list)
void rdma_protected_gqueue_destroy(RdmaProtectedGQueue *list)
{
if (list->list) {
qlist_destroy_obj(QOBJECT(list->list));
g_queue_free_full(list->list, g_free);
qemu_mutex_destroy(&list->lock);
list->list = NULL;
}
}
void rdma_protected_qlist_append_int64(RdmaProtectedQList *list, int64_t value)
void rdma_protected_gqueue_append_int64(RdmaProtectedGQueue *list,
int64_t value)
{
qemu_mutex_lock(&list->lock);
qlist_append_int(list->list, value);
g_queue_push_tail(list->list, g_memdup(&value, sizeof(value)));
qemu_mutex_unlock(&list->lock);
}
int64_t rdma_protected_qlist_pop_int64(RdmaProtectedQList *list)
int64_t rdma_protected_gqueue_pop_int64(RdmaProtectedGQueue *list)
{
QObject *obj;
int64_t *valp;
int64_t val;
qemu_mutex_lock(&list->lock);
obj = qlist_pop(list->list);
valp = g_queue_pop_head(list->list);
qemu_mutex_unlock(&list->lock);
if (!obj) {
if (!valp) {
return -ENOENT;
}
return qnum_get_uint(qobject_to(QNum, obj));
val = *valp;
g_free(valp);
return val;
}
void rdma_protected_gslist_init(RdmaProtectedGSList *list)