From patchwork Mon Nov 7 21:33:09 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Namhyung Kim X-Patchwork-Id: 16733 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a5d:6687:0:0:0:0:0 with SMTP id l7csp2308945wru; Mon, 7 Nov 2022 13:36:34 -0800 (PST) X-Google-Smtp-Source: AMsMyM5C8BNRwSBbLfh+gQ9qjKRaoJlYvm6juBpI+ktAF7hueMxBJc1Gkgh37fAMfjZUl0ToLrfg X-Received: by 2002:a17:906:4bd3:b0:731:3bdf:b95c with SMTP id x19-20020a1709064bd300b007313bdfb95cmr51056134ejv.677.1667856994635; Mon, 07 Nov 2022 13:36:34 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1667856994; cv=none; d=google.com; s=arc-20160816; b=X0eCmZiyZqj/rsTRyD2yti3jK8FcGfSZ+UyZE/OYypL1Uvg/zTZrVObCMB+hi+aGXT m1sWcTue8xWMr2H2eplpovsf7qDvJpNzdMK0qdaFTAONkDcTvK5poIRV6z491BJoQY4R T21AW2hVhytuJLg6MOQjSGvi20JLZNh0WNBu8amGyCWjjmQkiDIBDuqNVTT5C2tS/zcH U3+MCvyW/+62gB9L2l4QlfjRd2jn5OGjpAxPp8Y6Wdm6WQYIJNB86akr8mTKWCKSSWbH k2SVeBP4knvYdZX8/awPphX20aMo8M3bbesDey4Ck+HewLRjyuvTr54AdLSr8XRC7kyf SopA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from:sender :dkim-signature; bh=AIzOeW4bqFAI0ZH2XjiJS5dG7CBesFCQCZcY4ffv/5k=; b=D9Qccxd0VaALT4ZHF7a3+8CVOxZ6Kt9RLpczsYdPdxzMPCs0nEybJISQjd4WrFM/zL q2H3S3FA6LPI9hdRz18idum2y5nQ0CpxS1oGwChseMQe2FXPPJhoW/JBK10JJklQPMPm 0/cdE3nLzPhudP9300SndDZuGpitErktWSchIMSE2WBU6tl5zXBMvCP23RRV4fsNEtfP 6nUqtD5S6JOcGirdG4Kx0M+/lWzRWe1hXDq+k188DGIoGmIQVbBxHtozqjaPriwDc2Q0 Z8lGHZv4ebT+KBUTrBqKPhBCtXFMb+OEZt0zte7rQNLBN/sGpZDevx3CK8F0xNPKKWzW e4cg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@gmail.com header.s=20210112 header.b=Rdq9AtpQ; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=kernel.org Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id z10-20020a170906714a00b0078a891e407dsi8174595ejj.974.2022.11.07.13.36.11; Mon, 07 Nov 2022 13:36:34 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; dkim=pass header.i=@gmail.com header.s=20210112 header.b=Rdq9AtpQ; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S233532AbiKGVdu (ORCPT + 99 others); Mon, 7 Nov 2022 16:33:50 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:54650 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S233477AbiKGVd3 (ORCPT ); Mon, 7 Nov 2022 16:33:29 -0500 Received: from mail-pg1-x535.google.com (mail-pg1-x535.google.com [IPv6:2607:f8b0:4864:20::535]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 6A39FDA2; Mon, 7 Nov 2022 13:33:24 -0800 (PST) Received: by mail-pg1-x535.google.com with SMTP id v3so11629342pgh.4; Mon, 07 Nov 2022 13:33:24 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:sender:from:to:cc:subject:date :message-id:reply-to; bh=AIzOeW4bqFAI0ZH2XjiJS5dG7CBesFCQCZcY4ffv/5k=; b=Rdq9AtpQ8XqcN3B/WunTUwRM/esIVOLGUjjW0IkrxsTEQDcHBwSY2wQIXEWg/sdJS5 rarfpDM9YCvt5+LMJohUnxBSQXo6pgGP2kxUFXcwA0cj408Z5u2TR9GedsgRndqnO79I 9REV/ya38OwppOAY5PKuKzVk4GTzrm1DTfk07FRrzUeKtLqaV8kS3aY31LXl3O3Ik8a/ E1y0DdGllTSXmnh/wit5D7kyii3XanD79Voxw+NqwLlGvlRrF9it3SKKBOJ3NWl8vvGd vQc8upcdNm8xB9fdsed8VEbpGlDKGHtjeFC8p8nM0b7mlHivMZfn9G1F0QpPektOlTsn 59lA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:sender:x-gm-message-state:from :to:cc:subject:date:message-id:reply-to; bh=AIzOeW4bqFAI0ZH2XjiJS5dG7CBesFCQCZcY4ffv/5k=; b=QBWJISr+Etq3HBF+F6pMPoC7gBY4Gy13pTJ3Mo4e6ynOJPD094G/DIq2K3pE+X57dZ sYTzfPwqdBtz87wZrpjfjdCn01J3CXEq93HA1gcmrgpqrzBeRlYeVTjoh54uR/1s0e9n +nhAzI2zlLRXTFdWs0ZiruGJJLSxrAFUFRkaOcNB0CyYUQjtDxaDiZBwUFASogKEyQ3N K3fYiXJUYQqzmgm5hLpo9xv/G/8wwyA+kR1jrX2a6+i5QSOJFzrl8YgXWSo+CS9Hps7a RWC5oS1JzZVG/HWb1UZ7HxR7WSvZH7X5ECoeGLfY312nec3r9yDjI+yMX2YDUKcgNzMg 2Abw== X-Gm-Message-State: ACrzQf1kv48I5JoI21YX8J+ZFM9b0N4iaLiXT63UEnPoWnEu6jjwE5Ug cNSoev++4WxzDssYtp2a6ySrLdxMsqE= X-Received: by 2002:a05:6a00:240b:b0:56c:f55a:65b4 with SMTP id z11-20020a056a00240b00b0056cf55a65b4mr887433pfh.35.1667856803802; Mon, 07 Nov 2022 13:33:23 -0800 (PST) Received: from youngsil.svl.corp.google.com ([2620:15c:2d4:203:5850:5958:9c77:f623]) by smtp.gmail.com with ESMTPSA id a1-20020a1709027e4100b0017f5ba1fffasm5366413pln.297.2022.11.07.13.33.22 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 07 Nov 2022 13:33:23 -0800 (PST) Sender: Namhyung Kim From: Namhyung Kim To: Arnaldo Carvalho de Melo , Jiri Olsa Cc: Ingo Molnar , Peter Zijlstra , LKML , Ian Rogers , Adrian Hunter , linux-perf-users@vger.kernel.org, Kan Liang , Zhengjun Xing , James Clark Subject: [PATCH 4/9] perf stat: Move common code in print_metric_headers() Date: Mon, 7 Nov 2022 13:33:09 -0800 Message-Id: <20221107213314.3239159-5-namhyung@kernel.org> X-Mailer: git-send-email 2.38.1.431.g37b22c650d-goog In-Reply-To: <20221107213314.3239159-1-namhyung@kernel.org> References: <20221107213314.3239159-1-namhyung@kernel.org> MIME-Version: 1.0 X-Spam-Status: No, score=-1.5 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_EF,FREEMAIL_FORGED_FROMDOMAIN,FREEMAIL_FROM, HEADER_FROM_DIFFERENT_DOMAINS,RCVD_IN_DNSWL_NONE,SPF_HELO_NONE, SPF_PASS autolearn=no autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-getmail-retrieved-from-mailbox: =?utf-8?q?INBOX?= X-GMAIL-THRID: =?utf-8?q?1748874816119540596?= X-GMAIL-MSGID: =?utf-8?q?1748874816119540596?= The struct perf_stat_output_ctx is set in a loop with the same values. Move the code out of the loop and keep the loop minimal. Signed-off-by: Namhyung Kim Acked-by: Ian Rogers --- tools/perf/util/stat-display.c | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) diff --git a/tools/perf/util/stat-display.c b/tools/perf/util/stat-display.c index d4936a502560..115477461224 100644 --- a/tools/perf/util/stat-display.c +++ b/tools/perf/util/stat-display.c @@ -837,11 +837,16 @@ static void print_metric_headers(struct perf_stat_config *config, struct evlist *evlist, const char *prefix, bool no_indent) { - struct perf_stat_output_ctx out; struct evsel *counter; struct outstate os = { .fh = config->output }; + struct perf_stat_output_ctx out = { + .ctx = &os, + .print_metric = print_metric_header, + .new_line = new_line_metric, + .force_header = true, + }; bool first = true; if (config->json_output && !config->interval) @@ -865,13 +870,11 @@ static void print_metric_headers(struct perf_stat_config *config, /* Print metrics headers only */ evlist__for_each_entry(evlist, counter) { os.evsel = counter; - out.ctx = &os; - out.print_metric = print_metric_header; + if (!first && config->json_output) fprintf(config->output, ", "); first = false; - out.new_line = new_line_metric; - out.force_header = true; + perf_stat__print_shadow_stats(config, counter, 0, 0, &out,