Skip to content

Commit

Permalink
qapi: Add qobject_is_equal()
Browse files Browse the repository at this point in the history
This generic function (along with its implementations for different
types) determines whether two QObjects are equal.

Signed-off-by: Max Reitz <mreitz@redhat.com>
Reviewed-by: Eric Blake <eblake@redhat.com>
Reviewed-by: Alberto Garcia <berto@igalia.com>
Reviewed-by: Markus Armbruster <armbru@redhat.com>
Message-id: 20171114180128.17076-4-mreitz@redhat.com
Signed-off-by: Max Reitz <mreitz@redhat.com>
  • Loading branch information
XanClic committed Nov 17, 2017
1 parent 254bf80 commit b38dd67
Show file tree
Hide file tree
Showing 14 changed files with 186 additions and 0 deletions.
1 change: 1 addition & 0 deletions include/qapi/qmp/qbool.h
Expand Up @@ -24,6 +24,7 @@ typedef struct QBool {
QBool *qbool_from_bool(bool value);
bool qbool_get_bool(const QBool *qb);
QBool *qobject_to_qbool(const QObject *obj);
bool qbool_is_equal(const QObject *x, const QObject *y);
void qbool_destroy_obj(QObject *obj);

#endif /* QBOOL_H */
1 change: 1 addition & 0 deletions include/qapi/qmp/qdict.h
Expand Up @@ -43,6 +43,7 @@ void qdict_del(QDict *qdict, const char *key);
int qdict_haskey(const QDict *qdict, const char *key);
QObject *qdict_get(const QDict *qdict, const char *key);
QDict *qobject_to_qdict(const QObject *obj);
bool qdict_is_equal(const QObject *x, const QObject *y);
void qdict_iter(const QDict *qdict,
void (*iter)(const char *key, QObject *obj, void *opaque),
void *opaque);
Expand Down
1 change: 1 addition & 0 deletions include/qapi/qmp/qlist.h
Expand Up @@ -61,6 +61,7 @@ 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);
bool qlist_is_equal(const QObject *x, const QObject *y);
void qlist_destroy_obj(QObject *obj);

static inline const QListEntry *qlist_first(const QList *qlist)
Expand Down
2 changes: 2 additions & 0 deletions include/qapi/qmp/qnull.h
Expand Up @@ -27,4 +27,6 @@ static inline QNull *qnull(void)
return &qnull_;
}

bool qnull_is_equal(const QObject *x, const QObject *y);

#endif /* QNULL_H */
1 change: 1 addition & 0 deletions include/qapi/qmp/qnum.h
Expand Up @@ -69,6 +69,7 @@ double qnum_get_double(QNum *qn);
char *qnum_to_string(QNum *qn);

QNum *qobject_to_qnum(const QObject *obj);
bool qnum_is_equal(const QObject *x, const QObject *y);
void qnum_destroy_obj(QObject *obj);

#endif /* QNUM_H */
9 changes: 9 additions & 0 deletions include/qapi/qmp/qobject.h
Expand Up @@ -67,6 +67,15 @@ static inline void qobject_incref(QObject *obj)
obj->refcnt++;
}

/**
* qobject_is_equal(): Return whether the two objects are equal.
*
* Any of the pointers may be NULL; return true if both are. Always
* return false if only one is (therefore a QNull object is not
* considered equal to a NULL pointer).
*/
bool qobject_is_equal(const QObject *x, const QObject *y);

/**
* qobject_destroy(): Free resources used by the object
*/
Expand Down
1 change: 1 addition & 0 deletions include/qapi/qmp/qstring.h
Expand Up @@ -31,6 +31,7 @@ void qstring_append_int(QString *qstring, int64_t value);
void qstring_append(QString *qstring, const char *str);
void qstring_append_chr(QString *qstring, int c);
QString *qobject_to_qstring(const QObject *obj);
bool qstring_is_equal(const QObject *x, const QObject *y);
void qstring_destroy_obj(QObject *obj);

#endif /* QSTRING_H */
8 changes: 8 additions & 0 deletions qobject/qbool.c
Expand Up @@ -51,6 +51,14 @@ QBool *qobject_to_qbool(const QObject *obj)
return container_of(obj, QBool, base);
}

/**
* qbool_is_equal(): Test whether the two QBools are equal
*/
bool qbool_is_equal(const QObject *x, const QObject *y)
{
return qobject_to_qbool(x)->value == qobject_to_qbool(y)->value;
}

/**
* qbool_destroy_obj(): Free all memory allocated by a
* QBool object
Expand Down
29 changes: 29 additions & 0 deletions qobject/qdict.c
Expand Up @@ -402,6 +402,35 @@ void qdict_del(QDict *qdict, const char *key)
}
}

/**
* qdict_is_equal(): Test whether the two QDicts are equal
*
* Here, equality means whether they contain the same keys and whether
* the respective values are in turn equal (i.e. invoking
* qobject_is_equal() on them yields true).
*/
bool qdict_is_equal(const QObject *x, const QObject *y)
{
const QDict *dict_x = qobject_to_qdict(x);
const QDict *dict_y = qobject_to_qdict(y);
const QDictEntry *e;

if (qdict_size(dict_x) != qdict_size(dict_y)) {
return false;
}

for (e = qdict_first(dict_x); e; e = qdict_next(dict_x, e)) {
const QObject *obj_x = qdict_entry_value(e);
const QObject *obj_y = qdict_get(dict_y, qdict_entry_key(e));

if (!qobject_is_equal(obj_x, obj_y)) {
return false;
}
}

return true;
}

/**
* qdict_destroy_obj(): Free all the memory allocated by a QDict
*/
Expand Down
32 changes: 32 additions & 0 deletions qobject/qlist.c
Expand Up @@ -139,6 +139,38 @@ QList *qobject_to_qlist(const QObject *obj)
return container_of(obj, QList, base);
}

/**
* qlist_is_equal(): Test whether the two QLists are equal
*
* In order to be considered equal, the respective two objects at each
* index of the two lists have to compare equal (regarding
* qobject_is_equal()), and both lists have to have the same number of
* elements.
* That means both lists have to contain equal objects in equal order.
*/
bool qlist_is_equal(const QObject *x, const QObject *y)
{
const QList *list_x = qobject_to_qlist(x);
const QList *list_y = qobject_to_qlist(y);
const QListEntry *entry_x, *entry_y;

entry_x = qlist_first(list_x);
entry_y = qlist_first(list_y);

while (entry_x && entry_y) {
if (!qobject_is_equal(qlist_entry_obj(entry_x),
qlist_entry_obj(entry_y)))
{
return false;
}

entry_x = qlist_next(entry_x);
entry_y = qlist_next(entry_y);
}

return !entry_x && !entry_y;
}

/**
* qlist_destroy_obj(): Free all the memory allocated by a QList
*/
Expand Down
9 changes: 9 additions & 0 deletions qobject/qnull.c
Expand Up @@ -20,3 +20,12 @@ QNull qnull_ = {
.refcnt = 1,
},
};

/**
* qnull_is_equal(): Always return true because any two QNull objects
* are equal.
*/
bool qnull_is_equal(const QObject *x, const QObject *y)
{
return true;
}
54 changes: 54 additions & 0 deletions qobject/qnum.c
Expand Up @@ -212,6 +212,60 @@ QNum *qobject_to_qnum(const QObject *obj)
return container_of(obj, QNum, base);
}

/**
* qnum_is_equal(): Test whether the two QNums are equal
*
* Negative integers are never considered equal to unsigned integers,
* but positive integers in the range [0, INT64_MAX] are considered
* equal independently of whether the QNum's kind is i64 or u64.
*
* Doubles are never considered equal to integers.
*/
bool qnum_is_equal(const QObject *x, const QObject *y)
{
QNum *num_x = qobject_to_qnum(x);
QNum *num_y = qobject_to_qnum(y);

switch (num_x->kind) {
case QNUM_I64:
switch (num_y->kind) {
case QNUM_I64:
/* Comparison in native int64_t type */
return num_x->u.i64 == num_y->u.i64;
case QNUM_U64:
/* Implicit conversion of x to uin64_t, so we have to
* check its sign before */
return num_x->u.i64 >= 0 && num_x->u.i64 == num_y->u.u64;
case QNUM_DOUBLE:
return false;
}
abort();
case QNUM_U64:
switch (num_y->kind) {
case QNUM_I64:
return qnum_is_equal(y, x);
case QNUM_U64:
/* Comparison in native uint64_t type */
return num_x->u.u64 == num_y->u.u64;
case QNUM_DOUBLE:
return false;
}
abort();
case QNUM_DOUBLE:
switch (num_y->kind) {
case QNUM_I64:
case QNUM_U64:
return false;
case QNUM_DOUBLE:
/* Comparison in native double type */
return num_x->u.dbl == num_y->u.dbl;
}
abort();
}

abort();
}

/**
* qnum_destroy_obj(): Free all memory allocated by a
* QNum object
Expand Down
29 changes: 29 additions & 0 deletions qobject/qobject.c
Expand Up @@ -27,3 +27,32 @@ void qobject_destroy(QObject *obj)
assert(QTYPE_QNULL < obj->type && obj->type < QTYPE__MAX);
qdestroy[obj->type](obj);
}


static bool (*qis_equal[QTYPE__MAX])(const QObject *, const QObject *) = {
[QTYPE_NONE] = NULL, /* No such object exists */
[QTYPE_QNULL] = qnull_is_equal,
[QTYPE_QNUM] = qnum_is_equal,
[QTYPE_QSTRING] = qstring_is_equal,
[QTYPE_QDICT] = qdict_is_equal,
[QTYPE_QLIST] = qlist_is_equal,
[QTYPE_QBOOL] = qbool_is_equal,
};

bool qobject_is_equal(const QObject *x, const QObject *y)
{
/* We cannot test x == y because an object does not need to be
* equal to itself (e.g. NaN floats are not). */

if (!x && !y) {
return true;
}

if (!x || !y || x->type != y->type) {
return false;
}

assert(QTYPE_NONE < x->type && x->type < QTYPE__MAX);

return qis_equal[x->type](x, y);
}
9 changes: 9 additions & 0 deletions qobject/qstring.c
Expand Up @@ -128,6 +128,15 @@ const char *qstring_get_str(const QString *qstring)
return qstring->string;
}

/**
* qstring_is_equal(): Test whether the two QStrings are equal
*/
bool qstring_is_equal(const QObject *x, const QObject *y)
{
return !strcmp(qobject_to_qstring(x)->string,
qobject_to_qstring(y)->string);
}

/**
* qstring_destroy_obj(): Free all memory allocated by a QString
* object
Expand Down

0 comments on commit b38dd67

Please sign in to comment.