perf report/top TUI: Replace pr_err() with ui__error() (ae87405f) · Commits · 戴 / test

pr_err() in TUI mode does not print anyting on the screen and just quits. Replace such pr_err() with ui__error(). Before: $ perf report -s + $ After: $ perf report -s + ┌─Error:────────────────┐ │Invalid --sort key: `+'│ │ │ │Press any key... │ └───────────────────────┘ Signed-off-by:

Ravi Bangoria <ravi.bangoria@linux.ibm.com> Acked-by:

Jiri Olsa <jolsa@kernel.org> Tested-by:

Arnaldo Carvalho de Melo <acme@redhat.com> Cc: Alexander Shishkin <alexander.shishkin@linux.intel.com> Cc: Andi Kleen <ak@linux.intel.com> Cc: Jin Yao <yao.jin@linux.intel.com> Cc: Kan Liang <kan.liang@linux.intel.com> Cc: Mark Rutland <mark.rutland@arm.com> Cc: Namhyung Kim <namhyung@kernel.org> Link: http://lore.kernel.org/lkml/20191114132213.5419-2-ravi.bangoria@linux.ibm.com Signed-off-by:

Arnaldo Carvalho de Melo <acme@redhat.com>

tools/perf/util/sort.c

+5 −5

Original line number	Diff line number	Diff line
		@@ -2681,12 +2681,12 @@ static int setup_sort_list(struct perf_hpp_list list, char str,
		ret = sort_dimension__add(list, tok, evlist, level);
		if (ret == -EINVAL) {
		if (!cacheline_size() && !strncasecmp(tok, "dcacheline", strlen(tok)))
		pr_err("The \"dcacheline\" --sort key needs to know the cacheline size and it couldn't be determined on this system");
		ui__error("The \"dcacheline\" --sort key needs to know the cacheline size and it couldn't be determined on this system");
		else
		pr_err("Invalid --sort key: `%s'", tok);
		ui__error("Invalid --sort key: `%s'", tok);
		break;
		} else if (ret == -ESRCH) {
		pr_err("Unknown --sort key: `%s'", tok);
		ui__error("Unknown --sort key: `%s'", tok);
		break;
		}
		}
		@@ -2743,7 +2743,7 @@ static int setup_sort_order(struct evlist *evlist)
		return 0;

		if (sort_order[1] == '\0') {
		pr_err("Invalid --sort key: `+'");
		ui__error("Invalid --sort key: `+'");
		return -EINVAL;
		}

		@@ -3034,7 +3034,7 @@ static int __setup_output_field(void)
		strp++;

		if (!strlen(strp)) {
		pr_err("Invalid --fields key: `+'");
		ui__error("Invalid --fields key: `+'");
		goto out;
		}

Admin message