55e1819c50
The QObject hierarchy is small enough, and unlikely to grow further (since we only use it to map to JSON and already cover all JSON types), that we can simplify things by not tracking a separate vtable, but just inline the code element of the vtable QType directly into QObject (renamed to type), and track a separate array of destroy functions. We can drop qnull_destroy_obj() in the process. The remaining QObject subclasses must export their destructor. This also has the nice benefit of moving the typename 'QType' out of the way, so that the next patch can repurpose it for a nicer name for 'qtype_code'. The various objects are still the same size (so no change in cache line pressure), but now have less indirection (although I didn't bother benchmarking to see if there is a noticeable speedup, as we don't have hard evidence that this was in a performance hotspot in the first place). A future patch could drop the refcnt size to 32 bits for a smaller struct on 64-bit architectures, if desired (we have limits on the largest JSON that we are willing to parse, and will probably never need to take full advantage of a 64-bit refcnt). Suggested-by: Markus Armbruster <armbru@redhat.com> Signed-off-by: Eric Blake <eblake@redhat.com> Message-Id: <1449033659-25497-2-git-send-email-eblake@redhat.com> Signed-off-by: Markus Armbruster <armbru@redhat.com>
65 lines
1.6 KiB
C
65 lines
1.6 KiB
C
/*
|
|
* QList Module
|
|
*
|
|
* Copyright (C) 2009 Red Hat Inc.
|
|
*
|
|
* Authors:
|
|
* Luiz Capitulino <lcapitulino@redhat.com>
|
|
*
|
|
* This work is licensed under the terms of the GNU LGPL, version 2.1 or later.
|
|
* See the COPYING.LIB file in the top-level directory.
|
|
*/
|
|
|
|
#ifndef QLIST_H
|
|
#define QLIST_H
|
|
|
|
#include "qapi/qmp/qobject.h"
|
|
#include "qemu/queue.h"
|
|
|
|
typedef struct QListEntry {
|
|
QObject *value;
|
|
QTAILQ_ENTRY(QListEntry) next;
|
|
} QListEntry;
|
|
|
|
typedef struct QList {
|
|
QObject base;
|
|
QTAILQ_HEAD(,QListEntry) head;
|
|
} QList;
|
|
|
|
#define qlist_append(qlist, obj) \
|
|
qlist_append_obj(qlist, QOBJECT(obj))
|
|
|
|
#define QLIST_FOREACH_ENTRY(qlist, var) \
|
|
for ((var) = ((qlist)->head.tqh_first); \
|
|
(var); \
|
|
(var) = ((var)->next.tqe_next))
|
|
|
|
static inline QObject *qlist_entry_obj(const QListEntry *entry)
|
|
{
|
|
return entry->value;
|
|
}
|
|
|
|
QList *qlist_new(void);
|
|
QList *qlist_copy(QList *src);
|
|
void qlist_append_obj(QList *qlist, QObject *obj);
|
|
void qlist_iter(const QList *qlist,
|
|
void (*iter)(QObject *obj, void *opaque), void *opaque);
|
|
QObject *qlist_pop(QList *qlist);
|
|
QObject *qlist_peek(QList *qlist);
|
|
int qlist_empty(const QList *qlist);
|
|
size_t qlist_size(const QList *qlist);
|
|
QList *qobject_to_qlist(const QObject *obj);
|
|
void qlist_destroy_obj(QObject *obj);
|
|
|
|
static inline const QListEntry *qlist_first(const QList *qlist)
|
|
{
|
|
return QTAILQ_FIRST(&qlist->head);
|
|
}
|
|
|
|
static inline const QListEntry *qlist_next(const QListEntry *entry)
|
|
{
|
|
return QTAILQ_NEXT(entry, next);
|
|
}
|
|
|
|
#endif /* QLIST_H */
|