perf test: Fixup for the die() removal
Namhyung Kim
maintainerPATCH 1/2 perf test: Fixup for the die() removal
From: Namhyung Kim <[email protected]>
The commit 32c7f7383a09 ("perf test: 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.
--- tools/perf/builtin-test.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-)
tools/perf/builtin-test.c +4 -4
@@ -1026,15 +1026,15 @@ static int __test__rdpmc(void) fd =sys_perf_event_open (&attr,0 ,-1 ,-1 ,0 );if (fd <0 ) { -pr_debug ("Error: sys_perf_event_open() syscall returned " -"with %d (%s)\n" , fd,strerror (errno)); +pr_err ("Error: sys_perf_event_open() syscall returned " +"with %d (%s)\n" , fd,strerror (errno));return -1 ; } addr =mmap (NULL , page_size,PROT_READ ,MAP_SHARED , fd,0 );if (addr == (void *)(-1 )) { -pr_debug ("Error: mmap() syscall returned with (%s)\n" , -strerror (errno)); +pr_err ("Error: mmap() syscall returned with (%s)\n" , +strerror (errno)); goto out_close; }
Signature · 1 line
1.7.11.4
Namhyung Kim
maintainerPATCH 2/2 perf sched: Fixup for the die() removal
From: Namhyung Kim <[email protected]>
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.
--- tools/perf/builtin-sched.c | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-)
tools/perf/builtin-sched.c +7 -7
@@ -438,8 +438,8 @@ static int self_open_counters(void) fd =sys_perf_event_open (&attr,0 ,-1 ,-1 ,0 );if (fd <0 ) -pr_debug ("Error: sys_perf_event_open() syscall returned" -"with %d (%s)\n" , fd,strerror (errno)); +pr_err ("Error: sys_perf_event_open() syscall returned " +"with %d (%s)\n" , fd,strerror (errno));return fd; }
@@ -700,7 +700,7 @@ static int replay_switch_event(struct perf_sched *sched, delta =0 ;if (delta <0 ) { -pr_debug ("hm, delta: %" PRIu64" < 0 ?\n" , delta); +pr_err ("hm, delta: %" PRIu64" < 0 ?\n" , delta);return -1 ; }
@@ -990,7 +990,7 @@ static int latency_runtime_event(struct perf_sched *sched,return -1 ; atoms =thread_atoms_search (&sched->atom_root, thread, &sched->cmp_pid);if (!atoms) { -pr_debug ("in-event: Internal tree error" ); +pr_err ("in-event: Internal tree error" );return -1 ; }if (add_sched_out_event (atoms,'R' , timestamp))
@@ -1024,7 +1024,7 @@ static int latency_wakeup_event(struct perf_sched *sched,return -1 ; atoms =thread_atoms_search (&sched->atom_root, wakee, &sched->cmp_pid);if (!atoms) { -pr_debug ("wakeup-event: Internal tree error" ); +pr_err ("wakeup-event: Internal tree error" );return -1 ; }if (add_sched_out_event (atoms,'S' , timestamp))
@@ -1079,7 +1079,7 @@ static int latency_migrate_task_event(struct perf_sched *sched,register_pid (sched, migrant->pid, migrant->comm); atoms =thread_atoms_search (&sched->atom_root, migrant, &sched->cmp_pid);if (!atoms) { -pr_debug ("migration-event: Internal tree error" ); +pr_err ("migration-event: Internal tree error" );return -1 ; }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, delta =0 ;if (delta <0 ) { -pr_debug ("hm, delta: %" PRIu64" < 0 ?\n" , delta); +pr_err ("hm, delta: %" PRIu64" < 0 ?\n" , delta);return -1 ; }
Signature · 1 line
1.7.11.4
[tip:perf/core] perf sched: Fixup for the die() removal
Commit-ID: 60b7d14af46ef07778e89556429ec9ab5a7fad0b Gitweb: http://git.kernel.org/tip/60b7d14af46ef07778e89556429ec9ab5a7fad0b Author: Namhyung Kim <[email protected]> AuthorDate: Wed, 12 Sep 2012 11:11:06 +0900 Committer: Arnaldo Carvalho de Melo <[email protected]> CommitDate: Fri, 14 Sep 2012 15:48:38 -0300
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.
--- tools/perf/builtin-sched.c | 14 +++++++------- 1 files changed, 7 insertions(+), 7 deletions(-)
tools/perf/builtin-sched.c +7 -7
@@ -438,8 +438,8 @@ static int self_open_counters(void) fd =sys_perf_event_open (&attr,0 ,-1 ,-1 ,0 );if (fd <0 ) -pr_debug ("Error: sys_perf_event_open() syscall returned" -"with %d (%s)\n" , fd,strerror (errno)); +pr_err ("Error: sys_perf_event_open() syscall returned " +"with %d (%s)\n" , fd,strerror (errno));return fd; }
@@ -700,7 +700,7 @@ static int replay_switch_event(struct perf_sched *sched, delta =0 ;if (delta <0 ) { -pr_debug ("hm, delta: %" PRIu64" < 0 ?\n" , delta); +pr_err ("hm, delta: %" PRIu64" < 0 ?\n" , delta);return -1 ; }
@@ -990,7 +990,7 @@ static int latency_runtime_event(struct perf_sched *sched,return -1 ; atoms =thread_atoms_search (&sched->atom_root, thread, &sched->cmp_pid);if (!atoms) { -pr_debug ("in-event: Internal tree error" ); +pr_err ("in-event: Internal tree error" );return -1 ; }if (add_sched_out_event (atoms,'R' , timestamp))
@@ -1024,7 +1024,7 @@ static int latency_wakeup_event(struct perf_sched *sched,return -1 ; atoms =thread_atoms_search (&sched->atom_root, wakee, &sched->cmp_pid);if (!atoms) { -pr_debug ("wakeup-event: Internal tree error" ); +pr_err ("wakeup-event: Internal tree error" );return -1 ; }if (add_sched_out_event (atoms,'S' , timestamp))
@@ -1079,7 +1079,7 @@ static int latency_migrate_task_event(struct perf_sched *sched,register_pid (sched, migrant->pid, migrant->comm); atoms =thread_atoms_search (&sched->atom_root, migrant, &sched->cmp_pid);if (!atoms) { -pr_debug ("migration-event: Internal tree error" ); +pr_err ("migration-event: Internal tree error" );return -1 ; }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, delta =0 ;if (delta <0 ) { -pr_debug ("hm, delta: %" PRIu64" < 0 ?\n" , delta); +pr_err ("hm, delta: %" PRIu64" < 0 ?\n" , delta);return -1 ; }
Commit-ID: bb77ac3a36f896bc6acdfcafdebfa1434f775ed4 Gitweb: http://git.kernel.org/tip/bb77ac3a36f896bc6acdfcafdebfa1434f775ed4 Author: Namhyung Kim <[email protected]> AuthorDate: Wed, 12 Sep 2012 11:11:05 +0900 Committer: Arnaldo Carvalho de Melo <[email protected]> CommitDate: Fri, 14 Sep 2012 15:48:27 -0300
perf test: Fixup for the die() removal
The commit 32c7f7383a09 ("perf test: 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.
--- tools/perf/builtin-test.c | 8 ++++---- 1 files changed, 4 insertions(+), 4 deletions(-)
tools/perf/builtin-test.c +4 -4
@@ -1026,15 +1026,15 @@ static int __test__rdpmc(void) fd =sys_perf_event_open (&attr,0 ,-1 ,-1 ,0 );if (fd <0 ) { -pr_debug ("Error: sys_perf_event_open() syscall returned " -"with %d (%s)\n" , fd,strerror (errno)); +pr_err ("Error: sys_perf_event_open() syscall returned " +"with %d (%s)\n" , fd,strerror (errno));return -1 ; } addr =mmap (NULL , page_size,PROT_READ ,MAP_SHARED , fd,0 );if (addr == (void *)(-1 )) { -pr_debug ("Error: mmap() syscall returned with (%s)\n" , -strerror (errno)); +pr_err ("Error: mmap() syscall returned with (%s)\n" , +strerror (errno)); goto out_close; }