From patchwork Wed Mar 1 05:27:24 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Len Brown X-Patchwork-Id: 9597577 X-Patchwork-Delegate: rjw@sisk.pl Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id F0506600CB for ; Wed, 1 Mar 2017 05:38:49 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id E3A4926E56 for ; Wed, 1 Mar 2017 05:38:49 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id D86732842B; Wed, 1 Mar 2017 05:38:49 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-6.3 required=2.0 tests=BAYES_00,DKIM_SIGNED, RCVD_IN_DNSWL_HI, RCVD_IN_SORBS_SPAM, T_DKIM_INVALID autolearn=ham version=3.3.1 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 8A82D26E56 for ; Wed, 1 Mar 2017 05:38:49 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752028AbdCAFis (ORCPT ); Wed, 1 Mar 2017 00:38:48 -0500 Received: from mail-qk0-f196.google.com ([209.85.220.196]:36800 "EHLO mail-qk0-f196.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1750988AbdCAFil (ORCPT ); Wed, 1 Mar 2017 00:38:41 -0500 Received: by mail-qk0-f196.google.com with SMTP id u188so8232197qkc.3; Tue, 28 Feb 2017 21:36:22 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references :in-reply-to:references:reply-to:organization; bh=EyAKYucJLRoqhWDiV0+K6VSEvJF1hE/JFvUGlCPbMso=; b=AsUZEh18OsJuzmT7B599mJIiGN5pn30RcWnHm2larQTrgrBIt0wl7yGds/JCqNBNRS V2y26pF2/iCnt3bFGgFpv1K8FfktzessCKLjSlBxUHgBiYgXW7Q2YnE4jPez8jxeoUn1 GJF7ufWZ8r71fm6nsArTzclaZrKXye1suxNuuNGECBO/SnDAA57v0bDLIXh20KnPfebb kXGPqwu+fnpElXXs5HkXl9DE0X2D/snZsBJUlX8lLBFaEPZy4UNkY8znsk2GKout6sro nZ1GCDSiYboFEDvcDbR0FHRROA7l1FI8jEq+vCZamO1CISeU0bUaZTHeCnmeXDRzHC4t 17sA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:sender:from:to:cc:subject:date:message-id :in-reply-to:references:in-reply-to:references:reply-to:organization; bh=EyAKYucJLRoqhWDiV0+K6VSEvJF1hE/JFvUGlCPbMso=; b=A7Y3n+mISQYFs5iK6DjTeKsltfc8QS3A/OHIxLH+YGI3SZTorlmHCJLA2N3cZtG109 RVpXCTrnksN9sYzPFJ73PHB02v88QDzfKAnFxLtAV0iDBXJuGUBbtEprUM1cGqrT2oZC My7vb8tkupoaaJ9/ZgWHdiyvVhsoDrOqRcMCFuRB7PqNJX9gV+Qor90ArJnLpW3p6sXX gIyEX2Clj+3Zih/lnF1+iGH5/u1pwwYseDjNYe4gNuz5yayhfJTAaJwyc8/nJZL5fzUy evYVLqQcGe720eiB1IvQrAGS7UOdL37t4SnwGrd+WDT5Cd2DcV2JuryP6p5MNkekR7+v 49sA== X-Gm-Message-State: AMke39nOYnA4tc1s4scOx6O/PDdp2lFw5bv0s7LegYRsntHzPzJ2Z2wy5QCPcdDIzLK7fw== X-Received: by 10.200.55.55 with SMTP id o52mr7751715qtb.279.1488346115911; Tue, 28 Feb 2017 21:28:35 -0800 (PST) Received: from z87.localdomain (pool-96-230-116-151.bstnma.fios.verizon.net. [96.230.116.151]) by smtp.gmail.com with ESMTPSA id c141sm2530517qkb.10.2017.02.28.21.28.35 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Tue, 28 Feb 2017 21:28:35 -0800 (PST) From: Len Brown To: linux-pm@vger.kernel.org Cc: linux-kernel@vger.kernel.org, Len Brown Subject: [PATCH 20/44] tools/power turbostat: show all columns, independent of --debug Date: Wed, 1 Mar 2017 00:27:24 -0500 Message-Id: X-Mailer: git-send-email 2.11.0.161.g6610af872 In-Reply-To: <20170301052748.27810-1-lenb@kernel.org> References: <20170301052748.27810-1-lenb@kernel.org> In-Reply-To: <678a3bd1b3de6d2ebf604e7d708bc8150bb667e9.1488345270.git.len.brown@intel.com> References: <678a3bd1b3de6d2ebf604e7d708bc8150bb667e9.1488345270.git.len.brown@intel.com> Reply-To: Len Brown Organization: Intel Open Source Technology Center Sender: linux-pm-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-pm@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP From: Len Brown Some time ago, turbostat overflowed 80 columns. So on the assumption that a "casual" user would always want topology and frequency columns, we hid the rest of the columns and the system configuration decoding behind the --debug option. Not everybody liked that change -- including me. I use --debug 99% of the time... Well, now we have "-o file" to put turbostat output into a file, so unless you are watching real-time in a small window, column count is less frequently a factor. And more recently, we got the "--hide columnA,columnB" option to specify columns to skip. So now we "un-hide" the rest of the columns from behind --debug, and show them all, by default. Signed-off-by: Len Brown --- tools/power/x86/turbostat/turbostat.c | 7 ------- 1 file changed, 7 deletions(-) diff --git a/tools/power/x86/turbostat/turbostat.c b/tools/power/x86/turbostat/turbostat.c index 2f033f3d2a21..c50b452a404e 100644 --- a/tools/power/x86/turbostat/turbostat.c +++ b/tools/power/x86/turbostat/turbostat.c @@ -479,9 +479,6 @@ void print_header(void) if (DO_BIC(BIC_TSC_MHz)) outp += sprintf(outp, "\tTSC_MHz"); - if (!debug) - goto done; - if (DO_BIC(BIC_IRQ)) outp += sprintf(outp, "\tIRQ"); if (DO_BIC(BIC_SMI)) @@ -593,7 +590,6 @@ void print_header(void) } } -done: outp += sprintf(outp, "\n"); } @@ -741,9 +737,6 @@ int format_counters(struct thread_data *t, struct core_data *c, if (DO_BIC(BIC_TSC_MHz)) outp += sprintf(outp, "\t%.0f", 1.0 * t->tsc/units/interval_float); - if (!debug) - goto done; - /* IRQ */ if (DO_BIC(BIC_IRQ)) outp += sprintf(outp, "\t%d", t->irq_count);