Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 62d94b00 authored by Arnaldo Carvalho de Melo's avatar Arnaldo Carvalho de Melo
Browse files

perf tools: Replace error() with pr_err() 

To consolidate the error reporting facility.

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-b41iot1094katoffdf19w9zk@git.kernel.org


Signed-off-by: default avatarArnaldo Carvalho de Melo <acme@redhat.com>
parent b211d79a

tools/perf/builtin-c2c.c

+2 −2
Original line number Original line Diff line number Diff line
@@ -1725,10 +1725,10 @@ static int c2c_hists__init_sort(struct perf_hpp_list *hpp_list, char *name) 
				tok; tok = strtok_r(NULL, ", ", &tmp)) {	\

				tok; tok = strtok_r(NULL, ", ", &tmp)) {	\

			ret = _fn(hpp_list, tok);				\

			ret = _fn(hpp_list, tok);				\

			if (ret == -EINVAL) {					\

			if (ret == -EINVAL) {					\

				error("Invalid --fields key: `%s'", tok);	\

				pr_err("Invalid --fields key: `%s'", tok);	\

				break;						\

				break;						\

			} else if (ret == -ESRCH) {				\

			} else if (ret == -ESRCH) {				\

				error("Unknown --fields key: `%s'", tok);	\

				pr_err("Unknown --fields key: `%s'", tok);	\

				break;						\

				break;						\

			}							\

			}							\

		}								\

		}								\

tools/perf/builtin-help.c

+5 −3
Original line number Original line Diff line number Diff line
@@ -245,8 +245,10 @@ static int add_man_viewer_info(const char *var, const char *value) 
	const char *name = var + 4;

	const char *name = var + 4;

	const char *subkey = strrchr(name, '.');

	const char *subkey = strrchr(name, '.');





	if (!subkey)

	if (!subkey) {

		return error("Config with no key for man viewer: %s", name);

		pr_err("Config with no key for man viewer: %s", name);

		return -1;

	}





	if (!strcmp(subkey, ".path")) {

	if (!strcmp(subkey, ".path")) {

		if (!value)

		if (!value)
@@ -330,7 +332,7 @@ static void setup_man_path(void) 
		setenv("MANPATH", new_path, 1);

		setenv("MANPATH", new_path, 1);

		free(new_path);

		free(new_path);

	} else {

	} else {

		error("Unable to setup man path");

		pr_err("Unable to setup man path");

	}

	}

}

}

tools/perf/builtin-kmem.c

+2 −2
Original line number Original line Diff line number Diff line
@@ -1715,7 +1715,7 @@ static int setup_slab_sorting(struct list_head *sort_list, const char *arg) 
		if (!tok)

		if (!tok)

			break;

			break;

		if (slab_sort_dimension__add(tok, sort_list) < 0) {

		if (slab_sort_dimension__add(tok, sort_list) < 0) {

			error("Unknown slab --sort key: '%s'", tok);

			pr_err("Unknown slab --sort key: '%s'", tok);

			free(str);

			free(str);

			return -1;

			return -1;

		}

		}
@@ -1741,7 +1741,7 @@ static int setup_page_sorting(struct list_head *sort_list, const char *arg) 
		if (!tok)

		if (!tok)

			break;

			break;

		if (page_sort_dimension__add(tok, sort_list) < 0) {

		if (page_sort_dimension__add(tok, sort_list) < 0) {

			error("Unknown page --sort key: '%s'", tok);

			pr_err("Unknown page --sort key: '%s'", tok);

			free(str);

			free(str);

			return -1;

			return -1;

		}

		}

tools/perf/builtin-record.c

+2 −2
Original line number Original line Diff line number Diff line
@@ -453,7 +453,7 @@ static int record__open(struct record *rec) 
	}

	}





	if (perf_evlist__apply_filters(evlist, &pos)) {

	if (perf_evlist__apply_filters(evlist, &pos)) {

		error("failed to set filter \"%s\" on event %s with %d (%s)\n",

		pr_err("failed to set filter \"%s\" on event %s with %d (%s)\n",

			pos->filter, perf_evsel__name(pos), errno,

			pos->filter, perf_evsel__name(pos), errno,

			str_error_r(errno, msg, sizeof(msg)));

			str_error_r(errno, msg, sizeof(msg)));

		rc = -1;

		rc = -1;
@@ -461,7 +461,7 @@ static int record__open(struct record *rec) 
	}

	}





	if (perf_evlist__apply_drv_configs(evlist, &pos, &err_term)) {

	if (perf_evlist__apply_drv_configs(evlist, &pos, &err_term)) {

		error("failed to set config \"%s\" on event %s with %d (%s)\n",

		pr_err("failed to set config \"%s\" on event %s with %d (%s)\n",

		      err_term->val.drv_cfg, perf_evsel__name(pos), errno,

		      err_term->val.drv_cfg, perf_evsel__name(pos), errno,

		      str_error_r(errno, msg, sizeof(msg)));

		      str_error_r(errno, msg, sizeof(msg)));

		rc = -1;

		rc = -1;

tools/perf/builtin-sched.c

+1 −1
Original line number Original line Diff line number Diff line
@@ -2066,7 +2066,7 @@ static void save_task_callchain(struct perf_sched *sched, 
	if (thread__resolve_callchain(thread, cursor, evsel, sample,

	if (thread__resolve_callchain(thread, cursor, evsel, sample,

				      NULL, NULL, sched->max_stack + 2) != 0) {

				      NULL, NULL, sched->max_stack + 2) != 0) {

		if (verbose > 0)

		if (verbose > 0)

			error("Failed to resolve callchain. Skipping\n");

			pr_err("Failed to resolve callchain. Skipping\n");





		return;

		return;

	}

	}