From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-11.3 required=3.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH,MAILING_LIST_MULTI, SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS,USER_AGENT_SANE_1 autolearn=unavailable autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 0D42EC433E0 for ; Tue, 21 Jul 2020 15:33:12 +0000 (UTC) Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id CF417206E9 for ; Tue, 21 Jul 2020 15:33:11 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=fail reason="signature verification failed" (1024-bit key) header.d=redhat.com header.i=@redhat.com header.b="FcPLMuMn" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org CF417206E9 Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=redhat.com Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Received: from localhost ([::1]:43838 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jxuGV-0004Aq-4S for qemu-devel@archiver.kernel.org; Tue, 21 Jul 2020 11:33:11 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:53860) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1jxuFk-0003bh-N6 for qemu-devel@nongnu.org; Tue, 21 Jul 2020 11:32:24 -0400 Received: from us-smtp-2.mimecast.com ([205.139.110.61]:56084 helo=us-smtp-delivery-1.mimecast.com) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_CBC_SHA1:256) (Exim 4.90_1) (envelope-from ) id 1jxuFi-0007Dl-Sy for qemu-devel@nongnu.org; Tue, 21 Jul 2020 11:32:24 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1595345541; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: in-reply-to:in-reply-to:references:references; bh=Fg4mThdHIRgbHcssbWCf09lho9+TVfzgjRnSIYhi5jc=; b=FcPLMuMnZ/Anp3rp6Ee104sASXceul4WxTsRdYIHdgnhvlQjeag9aIQJSmiBAjCxg1iKCy k0AXKJy3lypIZuy/pMQkpQpolA/b+YRC4fPzgqaBmhZMBDZlZLpYy2Yzy9t7Tkj+As7qhu K+oSuhW2dbHLOBHH8+OaatfuTAfNb8k= Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-282-3WOOxUybNZyKnkawmYTwKw-1; Tue, 21 Jul 2020 11:32:20 -0400 X-MC-Unique: 3WOOxUybNZyKnkawmYTwKw-1 Received: from smtp.corp.redhat.com (int-mx06.intmail.prod.int.phx2.redhat.com [10.5.11.16]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 1ECBA19253C5; Tue, 21 Jul 2020 15:32:19 +0000 (UTC) Received: from work-vm (ovpn-114-151.ams2.redhat.com [10.36.114.151]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 7AB7C17514; Tue, 21 Jul 2020 15:32:17 +0000 (UTC) Date: Tue, 21 Jul 2020 16:32:14 +0100 From: "Dr. David Alan Gilbert" To: Markus Armbruster Subject: Re: [PATCH for-5.1 5/5] qom: Make info qom-tree sort children more efficiently Message-ID: <20200721153214.GB27840@work-vm> References: <20200714160202.3121879-1-armbru@redhat.com> <20200714160202.3121879-6-armbru@redhat.com> MIME-Version: 1.0 In-Reply-To: <20200714160202.3121879-6-armbru@redhat.com> User-Agent: Mutt/1.14.5 (2020-06-23) X-Scanned-By: MIMEDefang 2.79 on 10.5.11.16 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Type: text/plain; charset=us-ascii Content-Disposition: inline Received-SPF: pass client-ip=205.139.110.61; envelope-from=dgilbert@redhat.com; helo=us-smtp-delivery-1.mimecast.com X-detected-operating-system: by eggs.gnu.org: First seen = 2020/07/21 10:17:05 X-ACL-Warn: Detected OS = Linux 2.2.x-3.x [generic] [fuzzy] X-Spam_score_int: -40 X-Spam_score: -4.1 X-Spam_bar: ---- X-Spam_report: (-4.1 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-1, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, RCVD_IN_MSPIKE_H2=-1, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: lvivier@redhat.com, thuth@redhat.com, berrange@redhat.com, ehabkost@redhat.com, qemu-devel@nongnu.org, pbonzini@redhat.com, alex.bennee@linaro.org Errors-To: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Sender: "Qemu-devel" * 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 > --- > 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 Can you just convince me that 'TRUE' in the array_free? Dave > } > > void hmp_info_qom_tree(Monitor *mon, const QDict *dict) > -- > 2.26.2 > > -- Dr. David Alan Gilbert / dgilbert@redhat.com / Manchester, UK