Groups | Search | Server Info | Keyboard shortcuts | Login | Register [http] [https] [nntp] [nntps]

Groups > linux.kernel > #1679164

[PATCH 03/30] perf help: Elliminate dup code for reporting

From Arnaldo Carvalho de Melo <acme@kernel.org>
Newsgroups linux.kernel
Subject [PATCH 03/30] perf help: Elliminate dup code for reporting
Date 2017-07-01 00:30 +0200
Message-ID <tYcAh-2OP-9@gated-at.bofh.it> (permalink)
References <tYcAh-2OP-3@gated-at.bofh.it>
Organization linux.* mail to news gateway

Show all headers | View raw

From: Arnaldo Carvalho de Melo <acme@redhat.com>

And switch from warning() to pr_warning(), to elliminate another
duplication: too many error reporting facilities.

Cc: Adrian Hunter <adrian.hunter@intel.com>
Cc: David Ahern <dsahern@gmail.com>
Cc: Jiri Olsa <jolsa@kernel.org>
Cc: Namhyung Kim <namhyung@kernel.org>
Cc: Wang Nan <wangnan0@huawei.com>
Link: http://lkml.kernel.org/n/tip-pkzcjrhek3uuqc4i5i9ealwd@git.kernel.org
Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
---
 tools/perf/builtin-help.c | 14 ++++++++------
 1 file changed, 8 insertions(+), 6 deletions(-)

diff --git a/tools/perf/builtin-help.c b/tools/perf/builtin-help.c
index e82fa0d5866e..ff53e9800b8b 100644
--- a/tools/perf/builtin-help.c
+++ b/tools/perf/builtin-help.c
@@ -210,6 +210,12 @@ static void do_add_man_viewer_info(const char *name,
 	man_viewer_info_list = new;
 }
 
+static void unsupported_man_viewer(const char *name, const char *var)
+{
+	pr_warning("'%s': path for unsupported man viewer.\n"
+		   "Please consider using 'man.<tool>.%s' instead.", name, var);
+}
+
 static int add_man_viewer_path(const char *name,
 			       size_t len,
 			       const char *value)
@@ -217,9 +223,7 @@ static int add_man_viewer_path(const char *name,
 	if (supported_man_viewer(name, len))
 		do_add_man_viewer_info(name, len, value);
 	else
-		warning("'%s': path for unsupported man viewer.\n"
-			"Please consider using 'man.<tool>.cmd' instead.",
-			name);
+		unsupported_man_viewer(name, "cmd");
 
 	return 0;
 }
@@ -229,9 +233,7 @@ static int add_man_viewer_cmd(const char *name,
 			      const char *value)
 {
 	if (supported_man_viewer(name, len))
-		warning("'%s': cmd for supported man viewer.\n"
-			"Please consider using 'man.<tool>.path' instead.",
-			name);
+		unsupported_man_viewer(name, "path");
 	else
 		do_add_man_viewer_info(name, len, value);
 
-- 
2.9.4

Back to linux.kernel | Previous | Next — Previous in thread | Next in thread | Find similar | Unroll thread

Thread

[GIT PULL 00/30] perf/core improvements and fixes Arnaldo Carvalho de Melo <acme@kernel.org> - 2017-07-01 00:30 +0200
  [PATCH 03/30] perf help: Elliminate dup code for reporting Arnaldo Carvalho de Melo <acme@kernel.org> - 2017-07-01 00:30 +0200
  [PATCH 12/30] x86/insn: perf tools: Add new ptwrite instruction Arnaldo Carvalho de Melo <acme@kernel.org> - 2017-07-01 00:30 +0200
  [PATCH 19/30] perf intel-pt: Factor out common code synthesizing event samples Arnaldo Carvalho de Melo <acme@kernel.org> - 2017-07-01 00:30 +0200
  [PATCH 30/30] perf auxtrace: Add CPU filter support Arnaldo Carvalho de Melo <acme@kernel.org> - 2017-07-01 00:30 +0200
  [PATCH 08/30] perf tools: Replace error() with pr_err() Arnaldo Carvalho de Melo <acme@kernel.org> - 2017-07-01 00:30 +0200
  [PATCH 05/30] perf config: Use pr_warning() Arnaldo Carvalho de Melo <acme@kernel.org> - 2017-07-01 00:30 +0200
  [PATCH 22/30] perf intel-pt: Tidy Intel PT evsel lookup into separate function Arnaldo Carvalho de Melo <acme@kernel.org> - 2017-07-01 00:30 +0200
  [PATCH 25/30] perf intel-pt: Move code in intel_pt_synth_events() to simplify attr setting Arnaldo Carvalho de Melo <acme@kernel.org> - 2017-07-01 00:30 +0200
  [PATCH 11/30] perf jit: fix typo: "incalid" -> "invalid" Arnaldo Carvalho de Melo <acme@kernel.org> - 2017-07-01 00:30 +0200
  [PATCH 24/30] perf intel-pt: Factor out intel_pt_set_event_name() Arnaldo Carvalho de Melo <acme@kernel.org> - 2017-07-01 00:30 +0200
  [PATCH 20/30] perf intel-pt: Remove unused instructions_sample_period Arnaldo Carvalho de Melo <acme@kernel.org> - 2017-07-01 00:30 +0200
  [PATCH 14/30] tools include: Add byte-swapping macros to kernel.h Arnaldo Carvalho de Melo <acme@kernel.org> - 2017-07-01 00:30 +0200
  [PATCH 04/30] perf help: Use pr_warning() Arnaldo Carvalho de Melo <acme@kernel.org> - 2017-07-01 00:30 +0200
  [PATCH 27/30] perf intel-pt: Add example script for power events and PTWRITE Arnaldo Carvalho de Melo <acme@kernel.org> - 2017-07-01 00:30 +0200
  [PATCH 29/30] perf intel-pt: Do not use TSC packets for calculating CPU cycles to TSC Arnaldo Carvalho de Melo <acme@kernel.org> - 2017-07-01 00:30 +0200
  [PATCH 17/30] perf script: Add 'synth' field for synthesized event payloads Arnaldo Carvalho de Melo <acme@kernel.org> - 2017-07-01 00:30 +0200
  [PATCH 26/30] perf intel-pt: Synthesize new power and "ptwrite" events Arnaldo Carvalho de Melo <acme@kernel.org> - 2017-07-01 00:30 +0200
  [PATCH 15/30] perf auxtrace: Add itrace option to output ptwrite events Arnaldo Carvalho de Melo <acme@kernel.org> - 2017-07-01 00:30 +0200
  [PATCH 01/30] perf tests: Add platform dependency to test 15 Arnaldo Carvalho de Melo <acme@kernel.org> - 2017-07-01 00:30 +0200
  [PATCH 23/30] perf intel-pt: Tidy messages into called function intel_pt_synth_event() Arnaldo Carvalho de Melo <acme@kernel.org> - 2017-07-01 00:30 +0200
  [PATCH 28/30] perf intel-pt: Update documentation to include new ptwrite and power events Arnaldo Carvalho de Melo <acme@kernel.org> - 2017-07-01 00:30 +0200
  [PATCH 21/30] perf intel-pt: Join needlessly wrapped lines Arnaldo Carvalho de Melo <acme@kernel.org> - 2017-07-01 00:30 +0200
  [PATCH 18/30] perf script: Add synthesized Intel PT power and ptwrite events Arnaldo Carvalho de Melo <acme@kernel.org> - 2017-07-01 00:30 +0200
  [PATCH 13/30] perf script: Add 'synth' event type for synthesized events Arnaldo Carvalho de Melo <acme@kernel.org> - 2017-07-01 00:40 +0200
  [PATCH 02/30] perf help: Introduce exec_failed() to avoid code duplication Arnaldo Carvalho de Melo <acme@kernel.org> - 2017-07-01 00:40 +0200
  [PATCH 10/30] perf tools: Kill die() Arnaldo Carvalho de Melo <acme@kernel.org> - 2017-07-01 00:40 +0200
  [PATCH 07/30] perf tools: Remove warning() Arnaldo Carvalho de Melo <acme@kernel.org> - 2017-07-01 00:40 +0200
  [PATCH 09/30] perf config: Do not die when parsing u64 or int config values Arnaldo Carvalho de Melo <acme@kernel.org> - 2017-07-01 00:40 +0200
  [PATCH 16/30] perf auxtrace: Add itrace option to output power events Arnaldo Carvalho de Melo <acme@kernel.org> - 2017-07-01 00:40 +0200
  Re: [GIT PULL 00/30] perf/core improvements and fixes Ingo Molnar <mingo@kernel.org> - 2017-07-01 10:50 +0200

csiph-web