From: Markus Armbruster <armbru@redhat.com>
To: "Dr. David Alan Gilbert" <dgilbert@redhat.com>
Cc: lvivier@redhat.com, thuth@redhat.com, berrange@redhat.com,
ehabkost@redhat.com, qemu-devel@nongnu.org,
Markus Armbruster <armbru@redhat.com>,
pbonzini@redhat.com, alex.bennee@linaro.org
Subject: Re: [PATCH for-5.1 5/5] qom: Make info qom-tree sort children more efficiently
Date: Tue, 21 Jul 2020 17:39:20 +0200 [thread overview]
Message-ID: <87k0yw513r.fsf@dusky.pond.sub.org> (raw)
In-Reply-To: <20200721153214.GB27840@work-vm> (David Alan Gilbert's message of "Tue, 21 Jul 2020 16:32:14 +0100")
"Dr. David Alan Gilbert" <dgilbert@redhat.com> writes:
> * Markus Armbruster (armbru@redhat.com) wrote:
>> Commit e8c9e65816 "qom: Make "info qom-tree" show children sorted"
>> sorts children the simple, stupid, quadratic way. I thought the
>> number of children would be small enough for this not to matter. I
>> was wrong: there are outliers with several hundred children, e.g ARM
>> machines nuri and smdkc210 each have a node with 513 children.
>
> Big Power systems can have thousands.
>
>> While n^2 sorting isn't noticeable in normal, human usage even for
>> n=513, it can be quite noticeable in certain automated tests. In
>> particular, the sort made device-introspect-test even slower. Commit
>> 3e7b80f84d "tests: improve performance of device-introspect-test" just
>> fixed that by cutting back its excessive use of "info qom-tree".
>> Sorting more efficiently makes sense regardless, so do it.
>>
>> Signed-off-by: Markus Armbruster <armbru@redhat.com>
>> ---
>> qom/qom-hmp-cmds.c | 25 +++++++++++++------------
>> 1 file changed, 13 insertions(+), 12 deletions(-)
>>
>> diff --git a/qom/qom-hmp-cmds.c b/qom/qom-hmp-cmds.c
>> index 4032c96089..8861a109d5 100644
>> --- a/qom/qom-hmp-cmds.c
>> +++ b/qom/qom-hmp-cmds.c
>> @@ -94,25 +94,23 @@ typedef struct QOMCompositionState {
>>
>> static void print_qom_composition(Monitor *mon, Object *obj, int indent);
>>
>> -static int qom_composition_compare(const void *a, const void *b, void *ignore)
>> +static int qom_composition_compare(const void *a, const void *b)
>> {
>> - return g_strcmp0(object_get_canonical_path_component(a),
>> - object_get_canonical_path_component(b));
>> + return g_strcmp0(object_get_canonical_path_component(*(Object **)a),
>> + object_get_canonical_path_component(*(Object **)b));
>> }
>>
>> static int insert_qom_composition_child(Object *obj, void *opaque)
>> {
>> - GQueue *children = opaque;
>> -
>> - g_queue_insert_sorted(children, obj, qom_composition_compare, NULL);
>> + g_array_append_val(opaque, obj);
>> return 0;
>> }
>>
>> static void print_qom_composition(Monitor *mon, Object *obj, int indent)
>> {
>> + GArray *children = g_array_new(false, false, sizeof(Object *));
>> const char *name;
>> - GQueue children;
>> - Object *child;
>> + int i;
>>
>> if (obj == object_get_root()) {
>> name = "";
>> @@ -122,11 +120,14 @@ static void print_qom_composition(Monitor *mon, Object *obj, int indent)
>> monitor_printf(mon, "%*s/%s (%s)\n", indent, "", name,
>> object_get_typename(obj));
>>
>> - g_queue_init(&children);
>> - object_child_foreach(obj, insert_qom_composition_child, &children);
>> - while ((child = g_queue_pop_head(&children))) {
>> - print_qom_composition(mon, child, indent + 2);
>> + object_child_foreach(obj, insert_qom_composition_child, children);
>> + g_array_sort(children, qom_composition_compare);
>> +
>> + for (i = 0; i < children->len; i++) {
>> + print_qom_composition(mon, g_array_index(children, Object *, i),
>> + indent + 2);
>> }
>> + g_array_free(children, TRUE);
>
> So I think that's OK, so :
>
> Reviewed-by: Dr. David Alan Gilbert <dgilbert@redhat.com>
>
> Can you just convince me that 'TRUE' in the array_free?
g_array_free(children, TRUE) frees both children and children->data. It
returns null. This is what we want here.
g_array_free(children, FALSE) frees only children, and returns
children->data. Occasionally useful.
https://developer.gnome.org/glib/2.62/glib-Arrays.html#g-array-free
I definitely would have made this two separate functions.
Thanks!
prev parent reply other threads:[~2020-07-21 15:40 UTC|newest]
Thread overview: 18+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-07-14 16:01 [PATCH for-5.1 0/5] qom: HMP command fixes Markus Armbruster
2020-07-14 16:01 ` [PATCH for-5.1 1/5] qdev: Fix device_add DRIVER, help to print to monitor Markus Armbruster
2020-07-14 16:22 ` Philippe Mathieu-Daudé
2020-07-15 15:18 ` Li Qiang
2020-07-21 15:17 ` Dr. David Alan Gilbert
2020-07-14 16:01 ` [PATCH for-5.1 2/5] qom: Plug memory leak in "info qom-tree" Markus Armbruster
2020-07-14 16:16 ` Philippe Mathieu-Daudé
2020-07-14 16:46 ` Philippe Mathieu-Daudé
2020-07-15 15:19 ` Li Qiang
2020-07-16 9:05 ` Thomas Huth
2020-07-14 16:02 ` [PATCH for-5.1 3/5] qom: Change object_get_canonical_path_component() not to malloc Markus Armbruster
2020-07-14 16:21 ` Philippe Mathieu-Daudé
2020-07-15 15:26 ` Li Qiang
2020-07-14 16:02 ` [PATCH for-5.1 4/5] qom: Document object_get_canonical_path() returns malloced string Markus Armbruster
2020-07-14 16:23 ` Philippe Mathieu-Daudé
2020-07-14 16:02 ` [PATCH for-5.1 5/5] qom: Make info qom-tree sort children more efficiently Markus Armbruster
2020-07-21 15:32 ` Dr. David Alan Gilbert
2020-07-21 15:39 ` Markus Armbruster [this message]
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=87k0yw513r.fsf@dusky.pond.sub.org \
--to=armbru@redhat.com \
--cc=alex.bennee@linaro.org \
--cc=berrange@redhat.com \
--cc=dgilbert@redhat.com \
--cc=ehabkost@redhat.com \
--cc=lvivier@redhat.com \
--cc=pbonzini@redhat.com \
--cc=qemu-devel@nongnu.org \
--cc=thuth@redhat.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).