Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1755861AbcDGNuy (ORCPT ); Thu, 7 Apr 2016 09:50:54 -0400 Received: from mail.kernel.org ([198.145.29.136]:40198 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1750993AbcDGNuw (ORCPT ); Thu, 7 Apr 2016 09:50:52 -0400 Date: Thu, 7 Apr 2016 10:50:47 -0300 From: Arnaldo Carvalho de Melo To: Jiri Olsa Cc: lkml , David Ahern , Ingo Molnar , Namhyung Kim , Peter Zijlstra , Andreas Hollmann , Milian Wolff Subject: Re: [PATCH 1/3] perf tools: Introduce trim function Message-ID: <20160407135047.GF5945@kernel.org> References: <1460013073-18444-1-git-send-email-jolsa@kernel.org> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <1460013073-18444-1-git-send-email-jolsa@kernel.org> X-Url: http://acmel.wordpress.com User-Agent: Mutt/1.5.24 (2015-08-30) Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 2067 Lines: 65 Em Thu, Apr 07, 2016 at 09:11:11AM +0200, Jiri Olsa escreveu: > To be used in cases for both sides trim. > > Link: http://lkml.kernel.org/n/tip-7fuk01zwjefo0aoqo42co0vy@git.kernel.org > Signed-off-by: Jiri Olsa Thanks, applied. Will try Milian's 'perf trace' callchain patch soon, any updates on that one? - Arnaldo > tools/perf/ui/browsers/hists.c | 3 +-- > tools/perf/ui/stdio/hist.c | 3 +-- > tools/perf/util/util.h | 5 +++++ > 3 files changed, 7 insertions(+), 4 deletions(-) > > diff --git a/tools/perf/ui/browsers/hists.c b/tools/perf/ui/browsers/hists.c > index 2a83414159a6..e70df2e54d66 100644 > --- a/tools/perf/ui/browsers/hists.c > +++ b/tools/perf/ui/browsers/hists.c > @@ -1607,9 +1607,8 @@ static int hists_browser__scnprintf_hierarchy_headers(struct hist_browser *brows > > ret = fmt->header(fmt, &dummy_hpp, hists_to_evsel(hists)); > dummy_hpp.buf[ret] = '\0'; > - rtrim(dummy_hpp.buf); > > - start = ltrim(dummy_hpp.buf); > + start = trim(dummy_hpp.buf); > ret = strlen(start); > > if (start != dummy_hpp.buf) > diff --git a/tools/perf/ui/stdio/hist.c b/tools/perf/ui/stdio/hist.c > index 7aff5acf3265..560eb47d56f9 100644 > --- a/tools/perf/ui/stdio/hist.c > +++ b/tools/perf/ui/stdio/hist.c > @@ -569,9 +569,8 @@ static int print_hierarchy_header(struct hists *hists, struct perf_hpp *hpp, > first_col = false; > > fmt->header(fmt, hpp, hists_to_evsel(hists)); > - rtrim(hpp->buf); > > - header_width += fprintf(fp, "%s", ltrim(hpp->buf)); > + header_width += fprintf(fp, "%s", trim(hpp->buf)); > } > } > > diff --git a/tools/perf/util/util.h b/tools/perf/util/util.h > index 8298d607c738..3bf3de86d429 100644 > --- a/tools/perf/util/util.h > +++ b/tools/perf/util/util.h > @@ -254,6 +254,11 @@ int hex2u64(const char *ptr, u64 *val); > char *ltrim(char *s); > char *rtrim(char *s); > > +static inline char *trim(char *s) > +{ > + return ltrim(rtrim(s)); > +} > + > void dump_stack(void); > void sighandler_dump_stack(int sig); > > -- > 2.4.11