diff options
author | Namhyung Kim <namhyung.kim@lge.com> | 2012-09-11 22:11:06 -0400 |
---|---|---|
committer | Arnaldo Carvalho de Melo <acme@redhat.com> | 2012-09-14 14:48:38 -0400 |
commit | 60b7d14af46ef07778e89556429ec9ab5a7fad0b (patch) | |
tree | a2a8292af5ef6e17a6b373d8a17e11628ad807c4 /tools/perf/builtin-sched.c | |
parent | bb77ac3a36f896bc6acdfcafdebfa1434f775ed4 (diff) |
perf sched: Fixup for the die() removal
The commit a116e05dcf61 ("perf sched: Remove die() calls") replaced
die() call to pr_debug + return -1, but it should be pr_err otherwise
it'll not show up unless -v option is given. Fix it.
Signed-off-by: Namhyung Kim <namhyung@kernel.org>
Cc: Ingo Molnar <mingo@kernel.org>
Cc: Paul Mackerras <paulus@samba.org>
Cc: Peter Zijlstra <a.p.zijlstra@chello.nl>
Link: http://lkml.kernel.org/r/1347415866-303-2-git-send-email-namhyung@kernel.org
Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
Diffstat (limited to 'tools/perf/builtin-sched.c')
-rw-r--r-- | tools/perf/builtin-sched.c | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/tools/perf/builtin-sched.c b/tools/perf/builtin-sched.c index af305f57bd22..9b9e32eaa805 100644 --- a/tools/perf/builtin-sched.c +++ b/tools/perf/builtin-sched.c | |||
@@ -438,8 +438,8 @@ static int self_open_counters(void) | |||
438 | fd = sys_perf_event_open(&attr, 0, -1, -1, 0); | 438 | fd = sys_perf_event_open(&attr, 0, -1, -1, 0); |
439 | 439 | ||
440 | if (fd < 0) | 440 | if (fd < 0) |
441 | pr_debug("Error: sys_perf_event_open() syscall returned" | 441 | pr_err("Error: sys_perf_event_open() syscall returned " |
442 | "with %d (%s)\n", fd, strerror(errno)); | 442 | "with %d (%s)\n", fd, strerror(errno)); |
443 | return fd; | 443 | return fd; |
444 | } | 444 | } |
445 | 445 | ||
@@ -700,7 +700,7 @@ static int replay_switch_event(struct perf_sched *sched, | |||
700 | delta = 0; | 700 | delta = 0; |
701 | 701 | ||
702 | if (delta < 0) { | 702 | if (delta < 0) { |
703 | pr_debug("hm, delta: %" PRIu64 " < 0 ?\n", delta); | 703 | pr_err("hm, delta: %" PRIu64 " < 0 ?\n", delta); |
704 | return -1; | 704 | return -1; |
705 | } | 705 | } |
706 | 706 | ||
@@ -990,7 +990,7 @@ static int latency_runtime_event(struct perf_sched *sched, | |||
990 | return -1; | 990 | return -1; |
991 | atoms = thread_atoms_search(&sched->atom_root, thread, &sched->cmp_pid); | 991 | atoms = thread_atoms_search(&sched->atom_root, thread, &sched->cmp_pid); |
992 | if (!atoms) { | 992 | if (!atoms) { |
993 | pr_debug("in-event: Internal tree error"); | 993 | pr_err("in-event: Internal tree error"); |
994 | return -1; | 994 | return -1; |
995 | } | 995 | } |
996 | if (add_sched_out_event(atoms, 'R', timestamp)) | 996 | if (add_sched_out_event(atoms, 'R', timestamp)) |
@@ -1024,7 +1024,7 @@ static int latency_wakeup_event(struct perf_sched *sched, | |||
1024 | return -1; | 1024 | return -1; |
1025 | atoms = thread_atoms_search(&sched->atom_root, wakee, &sched->cmp_pid); | 1025 | atoms = thread_atoms_search(&sched->atom_root, wakee, &sched->cmp_pid); |
1026 | if (!atoms) { | 1026 | if (!atoms) { |
1027 | pr_debug("wakeup-event: Internal tree error"); | 1027 | pr_err("wakeup-event: Internal tree error"); |
1028 | return -1; | 1028 | return -1; |
1029 | } | 1029 | } |
1030 | if (add_sched_out_event(atoms, 'S', timestamp)) | 1030 | if (add_sched_out_event(atoms, 'S', timestamp)) |
@@ -1079,7 +1079,7 @@ static int latency_migrate_task_event(struct perf_sched *sched, | |||
1079 | register_pid(sched, migrant->pid, migrant->comm); | 1079 | register_pid(sched, migrant->pid, migrant->comm); |
1080 | atoms = thread_atoms_search(&sched->atom_root, migrant, &sched->cmp_pid); | 1080 | atoms = thread_atoms_search(&sched->atom_root, migrant, &sched->cmp_pid); |
1081 | if (!atoms) { | 1081 | if (!atoms) { |
1082 | pr_debug("migration-event: Internal tree error"); | 1082 | pr_err("migration-event: Internal tree error"); |
1083 | return -1; | 1083 | return -1; |
1084 | } | 1084 | } |
1085 | if (add_sched_out_event(atoms, 'R', timestamp)) | 1085 | if (add_sched_out_event(atoms, 'R', timestamp)) |
@@ -1286,7 +1286,7 @@ static int map_switch_event(struct perf_sched *sched, struct perf_evsel *evsel, | |||
1286 | delta = 0; | 1286 | delta = 0; |
1287 | 1287 | ||
1288 | if (delta < 0) { | 1288 | if (delta < 0) { |
1289 | pr_debug("hm, delta: %" PRIu64 " < 0 ?\n", delta); | 1289 | pr_err("hm, delta: %" PRIu64 " < 0 ?\n", delta); |
1290 | return -1; | 1290 | return -1; |
1291 | } | 1291 | } |
1292 | 1292 | ||