| Message ID | 1460131992-32278-10-git-send-email-eblake@redhat.com |
|---|---|
| State | New |
| Headers | show |
Eric Blake <eblake@redhat.com> writes: > Add a new test, for checking reference counting of qnull(). As > part of the new file, move a previous reference counting change > added in commit a861564 into a more logical place. into or to? Those darn prepositions... > Signed-off-by: Eric Blake <eblake@redhat.com> > > --- > v14: no change > v13: no change > v12: new patch > --- > tests/check-qnull.c | 60 +++++++++++++++++++++++++++++++++++++++++ > tests/test-qmp-output-visitor.c | 2 -- > tests/.gitignore | 1 + > tests/Makefile | 6 ++++- > 4 files changed, 66 insertions(+), 3 deletions(-) > create mode 100644 tests/check-qnull.c > > diff --git a/tests/check-qnull.c b/tests/check-qnull.c > new file mode 100644 > index 0000000..b0fb1e6 > --- /dev/null > +++ b/tests/check-qnull.c > @@ -0,0 +1,60 @@ > +/* > + * QNull unit-tests. > + * > + * Copyright (C) 2016 Red Hat Inc. > + * > + * 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. > + */ > +#include "qemu/osdep.h" > +#include <glib.h> > + > +#include "qapi/qmp/qobject.h" > +#include "qemu-common.h" > +#include "qapi/qmp-output-visitor.h" > + > +/* > + * Public Interface test-cases > + * > + * (with some violations to access 'private' data) > + */ > + > +static void qnull_ref_test(void) > +{ > + QObject *obj; > + > + g_assert(qnull_.refcnt == 1); > + obj = qnull(); > + g_assert(obj); > + g_assert(obj == &qnull_); This one's an implementation detail, but the reference count checks that follow need to rely on it. Okay. > + g_assert(qnull_.refcnt == 2); > + g_assert(qobject_type(obj) == QTYPE_QNULL); > + qobject_decref(obj); > + g_assert(qnull_.refcnt == 1); > +} > + > +static void qnull_visit_test(void) > +{ > + QObject *obj; > + QmpOutputVisitor *qov; > + > + g_assert(qnull_.refcnt == 1); > + qov = qmp_output_visitor_new(); > + /* FIXME: Empty visits are ugly, we should have a visit_type_null(). */ > + obj = qmp_output_get_qobject(qov); > + g_assert(obj == &qnull_); > + qobject_decref(obj); > + > + qmp_output_visitor_cleanup(qov); > + g_assert(qnull_.refcnt == 1); > +} > + > +int main(int argc, char **argv) > +{ > + g_test_init(&argc, &argv, NULL); > + > + g_test_add_func("/public/qnull_ref", qnull_ref_test); > + g_test_add_func("/public/qnull_visit", qnull_visit_test); > + > + return g_test_run(); > +} [...] Nice & simple patch, welcome relief after the big & subtle PATCH 08.
There's one unusual bit: the other check-q*.c leave the visitor stuff to the test-*-visitor.c, but this one doesn't. Hmm.
On 04/14/2016 11:37 AM, Markus Armbruster wrote: > There's one unusual bit: the other check-q*.c leave the visitor stuff to > the test-*-visitor.c, but this one doesn't. Hmm. Yeah, but the other test-*-visitor don't muck with internal reference counts of qnull_. I guess I just call it out more prominently in the commit message?
diff --git a/tests/check-qnull.c b/tests/check-qnull.c new file mode 100644 index 0000000..b0fb1e6 --- /dev/null +++ b/tests/check-qnull.c @@ -0,0 +1,60 @@ +/* + * QNull unit-tests. + * + * Copyright (C) 2016 Red Hat Inc. + * + * 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. + */ +#include "qemu/osdep.h" +#include <glib.h> + +#include "qapi/qmp/qobject.h" +#include "qemu-common.h" +#include "qapi/qmp-output-visitor.h" + +/* + * Public Interface test-cases + * + * (with some violations to access 'private' data) + */ + +static void qnull_ref_test(void) +{ + QObject *obj; + + g_assert(qnull_.refcnt == 1); + obj = qnull(); + g_assert(obj); + g_assert(obj == &qnull_); + g_assert(qnull_.refcnt == 2); + g_assert(qobject_type(obj) == QTYPE_QNULL); + qobject_decref(obj); + g_assert(qnull_.refcnt == 1); +} + +static void qnull_visit_test(void) +{ + QObject *obj; + QmpOutputVisitor *qov; + + g_assert(qnull_.refcnt == 1); + qov = qmp_output_visitor_new(); + /* FIXME: Empty visits are ugly, we should have a visit_type_null(). */ + obj = qmp_output_get_qobject(qov); + g_assert(obj == &qnull_); + qobject_decref(obj); + + qmp_output_visitor_cleanup(qov); + g_assert(qnull_.refcnt == 1); +} + +int main(int argc, char **argv) +{ + g_test_init(&argc, &argv, NULL); + + g_test_add_func("/public/qnull_ref", qnull_ref_test); + g_test_add_func("/public/qnull_visit", qnull_visit_test); + + return g_test_run(); +} diff --git a/tests/test-qmp-output-visitor.c b/tests/test-qmp-output-visitor.c index c709267..fddb5a6 100644 --- a/tests/test-qmp-output-visitor.c +++ b/tests/test-qmp-output-visitor.c @@ -484,8 +484,6 @@ static void test_visitor_out_empty(TestOutputVisitorData *data, arg = qmp_output_get_qobject(data->qov); g_assert(qobject_type(arg) == QTYPE_QNULL); - /* Check that qnull reference counting is sane */ - g_assert(arg->refcnt == 2); qobject_decref(arg); } diff --git a/tests/.gitignore b/tests/.gitignore index 9eed229..a06a8ba 100644 --- a/tests/.gitignore +++ b/tests/.gitignore @@ -3,6 +3,7 @@ check-qfloat check-qint check-qjson check-qlist +check-qnull check-qstring check-qom-interface check-qom-proplist diff --git a/tests/Makefile b/tests/Makefile index 9de9598..efdb9fb 100644 --- a/tests/Makefile +++ b/tests/Makefile @@ -16,6 +16,8 @@ check-unit-y += tests/check-qstring$(EXESUF) gcov-files-check-qstring-y = qobject/qstring.c check-unit-y += tests/check-qlist$(EXESUF) gcov-files-check-qlist-y = qobject/qlist.c +check-unit-y += tests/check-qnull$(EXESUF) +gcov-files-check-qnull-y = qobject/qnull.c check-unit-y += tests/check-qjson$(EXESUF) gcov-files-check-qjson-y = qobject/qjson.c check-unit-y += tests/test-qmp-output-visitor$(EXESUF) @@ -380,7 +382,8 @@ GENERATED_HEADERS += tests/test-qapi-types.h tests/test-qapi-visit.h \ tests/test-qmp-introspect.h test-obj-y = tests/check-qint.o tests/check-qstring.o tests/check-qdict.o \ - tests/check-qlist.o tests/check-qfloat.o tests/check-qjson.o \ + tests/check-qlist.o tests/check-qfloat.o tests/check-qnull.o \ + tests/check-qjson.o \ tests/test-coroutine.o tests/test-string-output-visitor.o \ tests/test-string-input-visitor.o tests/test-qmp-output-visitor.o \ tests/test-qmp-input-visitor.o tests/test-qmp-input-strict.o \ @@ -408,6 +411,7 @@ tests/check-qstring$(EXESUF): tests/check-qstring.o $(test-util-obj-y) tests/check-qdict$(EXESUF): tests/check-qdict.o $(test-util-obj-y) tests/check-qlist$(EXESUF): tests/check-qlist.o $(test-util-obj-y) tests/check-qfloat$(EXESUF): tests/check-qfloat.o $(test-util-obj-y) +tests/check-qnull$(EXESUF): tests/check-qnull.o $(test-util-obj-y) tests/check-qjson$(EXESUF): tests/check-qjson.o $(test-util-obj-y) tests/check-qom-interface$(EXESUF): tests/check-qom-interface.o $(test-qom-obj-y) tests/check-qom-proplist$(EXESUF): tests/check-qom-proplist.o $(test-qom-obj-y)
Add a new test, for checking reference counting of qnull(). As part of the new file, move a previous reference counting change added in commit a861564 into a more logical place. Signed-off-by: Eric Blake <eblake@redhat.com> --- v14: no change v13: no change v12: new patch --- tests/check-qnull.c | 60 +++++++++++++++++++++++++++++++++++++++++ tests/test-qmp-output-visitor.c | 2 -- tests/.gitignore | 1 + tests/Makefile | 6 ++++- 4 files changed, 66 insertions(+), 3 deletions(-) create mode 100644 tests/check-qnull.c