From patchwork Wed Nov 23 18:01:54 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Namhyung Kim X-Patchwork-Id: 25123 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:adf:f944:0:0:0:0:0 with SMTP id q4csp2942623wrr; Wed, 23 Nov 2022 10:06:07 -0800 (PST) X-Google-Smtp-Source: AA0mqf5dV2HLz8m/RQqJrME+r8OLaKdZHFruesCGhTrFsiQSYLv1Btr0YPLEugJwYEE8K/RnyjZz X-Received: by 2002:a05:6402:10d1:b0:467:7508:89ca with SMTP id p17-20020a05640210d100b00467750889camr12020457edu.284.1669226767765; Wed, 23 Nov 2022 10:06:07 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1669226767; cv=none; d=google.com; s=arc-20160816; b=DiioKFEpoNkQQJVRYmsU2zq//3UI9Gb4gtusi740tKvw5m6wGVOA1T6x0ILc2VSVJ8 wcMsBoEvtcSLPMp9Oxd1GQvm1R21IDAXarXcyt6iI3xCd7qv3epnDD/tETh24gykjBsE 21jzQ98bCM0UbPke4NHZ6e5xNUCwvpE26uRKkkbBiiw5spelh6vE1XPviBnWtx8X8b5G eMiEQQ57s7t2PTRwZwmy3MOTgTIkC9wX3lQEc0D5fp6T42chdMPIXc2DMs08f2He0mvW f8S12FuIiG1QobXsK7kKv614QL2TyUJna0aHxNfJgLo6ijoinW12iyogOIgegcrFYx/w ykfg== 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=E05AU6ZdRoSB14xGjx/8Ofyvzr/jUJ5BgfZd3HvnFGE=; b=lYZciotqBeuMxelhsb5ED/Mh9U/UDfBugGJ7E1ZURG8akguhR9wPNeT06CvaIyZcjC atwDJNkbAheaihUW7qWGA3BucRLnWThZFJla0CU6oDA3hEW6xLaKBwi6iomcsJdT9ok2 V4WChCwW8Pig5wQbS45jk0ROPw+uoKohQslk0T3lssqOt7DOupXdd+cQ/0TJ24IidE9v YGJWaOw7Y5mjNvL0rsCC8WLveiJEGHnmLy2A7XHbnDOk/gy82U2uPW0ym2uhz5Op5gxC BHspkS5gUlu63Hfx6M9mTBUuaATaaDke5/0NJ6zftZ26lri898lQA4jdgz3YL42H6z8a vOHQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@gmail.com header.s=20210112 header.b=YN510YrG; 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 w22-20020a05640234d600b0045b293121f1si8448975edc.12.2022.11.23.10.05.31; Wed, 23 Nov 2022 10:06:07 -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=YN510YrG; 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 S239428AbiKWSCd (ORCPT + 99 others); Wed, 23 Nov 2022 13:02:33 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:53532 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S239316AbiKWSCN (ORCPT ); Wed, 23 Nov 2022 13:02:13 -0500 Received: from mail-pj1-x1034.google.com (mail-pj1-x1034.google.com [IPv6:2607:f8b0:4864:20::1034]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 4466093715; Wed, 23 Nov 2022 10:02:13 -0800 (PST) Received: by mail-pj1-x1034.google.com with SMTP id w4-20020a17090ac98400b002186f5d7a4cso2837996pjt.0; Wed, 23 Nov 2022 10:02:13 -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=E05AU6ZdRoSB14xGjx/8Ofyvzr/jUJ5BgfZd3HvnFGE=; b=YN510YrGVv73yVz1JaUZ70Vb4Uu5LIUt0zqlUDyzLeUIjx6DuTXI5DJn3hrPqQ7g06 oI2GQU4iaJDKP1NmgR85782K/zSMstYqX85lg64uzCgyHATPgDiwfgKSNLSk0D0MHTkl PSYwy7K6bRtqLS9eZfIq59EUTsQo8X3ZrOsI97b2AHc18p4S6s9Q0+AoApNrd7wQFnRd rdcV9O7wbNNQrvaYcyiv3ppEAO90Zp3NpdIh2Je0/i055XnyT4mvsgO/VmAl5yN5D77c iOsBzfVwNOnZhh+cpDB77mvZkdrB6NB+7wkPesVnbqsb1yrrlXwn4Yd7hDNxX768E78M wcAA== 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=E05AU6ZdRoSB14xGjx/8Ofyvzr/jUJ5BgfZd3HvnFGE=; b=P5mUpZTsD3D5m1FowstDhJ0i7Ha9oTGaY0CyxrCgxw2/dtOTWeh8YTVC/P30hqk7zY t5LuP0IenQn2DbuBQt2Sc7RQFt2oIMrjRayu8E3E33NcYFqNoMo1YK5PNEtGcvn2jke1 rR6qPvriPaXxC+yfSVbBS4KDOnhyyX6mgFh4GPr8JfVt43faTVVsKH+ktgArX8aZCBUW u1DQn5rZN7UPqPUGo7tVCIp50Q5l3cMjVc7N+Mle2xA5v6oNSPQ6iV+yHSiNC/oye9rc sqlxchUh9Ux5DSJ+izsOGa7XDdyNzWvpDHG4NDs+DuXrM29jn6xYFk4fVgduA1chPl2T QcGA== X-Gm-Message-State: ANoB5pkkMeqkBI7/WsK5HsB0XbBVSrErviDZd5UgL6cThTYjsI1qD9ok kSYA/6bpwAzRiihliKBJLvs= X-Received: by 2002:a17:902:bd04:b0:189:38a1:30fe with SMTP id p4-20020a170902bd0400b0018938a130femr7013774pls.47.1669226532681; Wed, 23 Nov 2022 10:02:12 -0800 (PST) Received: from balhae.hsd1.ca.comcast.net ([2601:647:6780:a80:c968:76:254b:3790]) by smtp.gmail.com with ESMTPSA id i15-20020a655b8f000000b00470275c8d6dsm10792364pgr.10.2022.11.23.10.02.11 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 23 Nov 2022 10:02:12 -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 , Athira Jajeev Subject: [PATCH 01/15] perf stat: Fix cgroup display in JSON output Date: Wed, 23 Nov 2022 10:01:54 -0800 Message-Id: <20221123180208.2068936-2-namhyung@kernel.org> X-Mailer: git-send-email 2.38.1.584.g0f3c55d4c2-goog In-Reply-To: <20221123180208.2068936-1-namhyung@kernel.org> References: <20221123180208.2068936-1-namhyung@kernel.org> MIME-Version: 1.0 X-Spam-Status: No, score=-1.6 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?1750311127106685626?= X-GMAIL-MSGID: =?utf-8?q?1750311127106685626?= It missed the 'else' keyword after checking json output mode. Fixes: 41cb875242e7 ("perf stat: Split print_cgroup() function") Signed-off-by: Namhyung Kim Acked-by: Ian Rogers --- tools/perf/util/stat-display.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tools/perf/util/stat-display.c b/tools/perf/util/stat-display.c index f5501760ff2e..46e90f0bb423 100644 --- a/tools/perf/util/stat-display.c +++ b/tools/perf/util/stat-display.c @@ -175,7 +175,7 @@ static void print_cgroup(struct perf_stat_config *config, struct cgroup *cgrp) if (config->json_output) print_cgroup_json(config, cgrp_name); - if (config->csv_output) + else if (config->csv_output) print_cgroup_csv(config, cgrp_name); else print_cgroup_std(config, cgrp_name);