From nobody Wed Nov 5 09:26:54 2025 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) client-ip=208.118.235.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Authentication-Results: mx.zohomail.com; spf=pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org Return-Path: Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) by mx.zohomail.com with SMTPS id 1534483246528755.0977858559467; Thu, 16 Aug 2018 22:20:46 -0700 (PDT) Received: from localhost ([::1]:59990 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1fqXBj-0003Mv-FH for importer@patchew.org; Fri, 17 Aug 2018 01:20:43 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:36279) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1fqXA8-0000d8-OR for qemu-devel@nongnu.org; Fri, 17 Aug 2018 01:19:05 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1fqXA5-0005Yd-F3 for qemu-devel@nongnu.org; Fri, 17 Aug 2018 01:19:04 -0400 Received: from out1-smtp.messagingengine.com ([66.111.4.25]:49223) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1fqXA2-0005VS-Is for qemu-devel@nongnu.org; Fri, 17 Aug 2018 01:18:59 -0400 Received: from compute4.internal (compute4.nyi.internal [10.202.2.44]) by mailout.nyi.internal (Postfix) with ESMTP id 11CAC21BE6; Fri, 17 Aug 2018 01:18:57 -0400 (EDT) Received: from mailfrontend2 ([10.202.2.163]) by compute4.internal (MEProxy); Fri, 17 Aug 2018 01:18:57 -0400 Received: from localhost (flamenco.cs.columbia.edu [128.59.20.216]) by mail.messagingengine.com (Postfix) with ESMTPA id 7989310293; Fri, 17 Aug 2018 01:18:56 -0400 (EDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=braap.org; h=cc :date:from:in-reply-to:message-id:references:subject:to :x-me-sender:x-me-sender:x-sasl-enc; s=mesmtp; bh=9SBl3tTN/ua/8h KpdVVXJi6PTTvwW0kwifqPGHJwFsU=; b=fLwqSsbysxsNFLLFP4KDTz6QRAMvA7 RqL+e/uvYPTtzk+2vDteRrDOYREkzS6KSl3RIU3C4DGwUP3WFa8kHu9937KnKv2j GiFKtx8QscmxrnQ29Jettgrq/NCxwWu11ekCLg5IYSLj+FlM70DI/G7sv51Cl2aV k/tL41hrthJ+I= DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d= messagingengine.com; h=cc:date:from:in-reply-to:message-id :references:subject:to:x-me-sender:x-me-sender:x-sasl-enc; s= fm3; bh=9SBl3tTN/ua/8hKpdVVXJi6PTTvwW0kwifqPGHJwFsU=; b=DENvjveF bGzqcRFZhRs3HC+PE81XGbFPazwix+Hr/BfG1EBK6JuftZ9y2dlY5lSPKDzL2wBj GjYO4xHMBYa0IYdKcbGkhh1F64cd/b1opgjtvo1KGQKEv6wvo4xEmjkeW11OG6Ji Ja28BdbB8x7vPLUT2U5Y81X4e4d9nYaCnRBtsg2PxfIsvbyLVjKBkgJrlfwKc+dw A359xOQ8SlV5sPMK6M+KOxu0gfxBbp2BLhZpEKDw/kd6OqwjlAgxlj7JVJto+rYe KTxWBIDOD0sHE4BGVIrLZ52+WA/XbXPDZOv49IzMoUA5mEzukKdz+CYdnOxrBKSc mM/tFHjhFCkC2Q== X-ME-Proxy: X-ME-Sender: From: "Emilio G. Cota" To: qemu-devel@nongnu.org Date: Fri, 17 Aug 2018 01:18:46 -0400 Message-Id: <20180817051853.23792-3-cota@braap.org> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20180817051853.23792-1-cota@braap.org> References: <20180817051853.23792-1-cota@braap.org> X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 66.111.4.25 Subject: [Qemu-devel] [PATCH 2/9] qsp: add sort_by option to qsp_report X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Fam Zheng , Peter Crosthwaite , Stefan Weil , "Dr. David Alan Gilbert" , Peter Xu , Markus Armbruster , Paolo Bonzini , Richard Henderson Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail: RSF_0 Z_629925259 SPT_0 Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Signed-off-by: Emilio G. Cota --- include/qemu/qsp.h | 8 +++++++- util/qsp.c | 33 +++++++++++++++++++++++++++------ 2 files changed, 34 insertions(+), 7 deletions(-) diff --git a/include/qemu/qsp.h b/include/qemu/qsp.h index 9c2bb60ff0..209480b687 100644 --- a/include/qemu/qsp.h +++ b/include/qemu/qsp.h @@ -13,7 +13,13 @@ =20 #include "qemu/fprintf-fn.h" =20 -void qsp_report(FILE *f, fprintf_function cpu_fprintf, size_t max); +enum QSPSortBy { + QSP_SORT_BY_TOTAL_WAIT_TIME, + QSP_SORT_BY_AVG_WAIT_TIME, +}; + +void qsp_report(FILE *f, fprintf_function cpu_fprintf, size_t max, + enum QSPSortBy sort_by); =20 bool qsp_is_enabled(void); void qsp_enable(void); diff --git a/util/qsp.c b/util/qsp.c index a02c925fe6..b04d4d9986 100644 --- a/util/qsp.c +++ b/util/qsp.c @@ -379,14 +379,34 @@ static gint qsp_tree_cmp(gconstpointer ap, gconstpoin= ter bp, gpointer up) { const QSPEntry *a =3D ap; const QSPEntry *b =3D bp; + enum QSPSortBy sort_by =3D *(enum QSPSortBy *)up; const QSPCallSite *ca; const QSPCallSite *cb; =20 - if (a->ns > b->ns) { - return -1; - } else if (a->ns < b->ns) { - return 1; + switch (sort_by) { + case QSP_SORT_BY_TOTAL_WAIT_TIME: + if (a->ns > b->ns) { + return -1; + } else if (a->ns < b->ns) { + return 1; + } + break; + case QSP_SORT_BY_AVG_WAIT_TIME: + { + double avg_a =3D a->n_acqs ? a->ns / a->n_acqs : 0; + double avg_b =3D b->n_acqs ? b->ns / b->n_acqs : 0; + + if (avg_a > avg_b) { + return -1; + } else if (avg_a < avg_b) { + return 1; + } + break; } + default: + g_assert_not_reached(); + } + ca =3D a->callsite; cb =3D b->callsite; /* Break the tie with the object's address */ @@ -564,9 +584,10 @@ static void report_destroy(QSPReport *rep) g_free(rep->entries); } =20 -void qsp_report(FILE *f, fprintf_function cpu_fprintf, size_t max) +void qsp_report(FILE *f, fprintf_function cpu_fprintf, size_t max, + enum QSPSortBy sort_by) { - GTree *tree =3D g_tree_new_full(qsp_tree_cmp, NULL, g_free, NULL); + GTree *tree =3D g_tree_new_full(qsp_tree_cmp, &sort_by, g_free, NULL); QSPReport rep; =20 qsp_init(); --=20 2.17.1