perf tools: modify error code when perf_session__new() fail.
PATCH 1/1 perf tools: modify error code when perf_session__new() fail.
Because perf_session__new() could fail for more reasons than just ENOMEM, I modified error code(ENOMEM or EINVAL) into -1.
Signed-off-by Taeung Song <[email protected]>
--- tools/perf/builtin-annotate.c | 2 +- tools/perf/builtin-diff.c | 2 +- tools/perf/builtin-evlist.c | 2 +- tools/perf/builtin-inject.c | 2 +- tools/perf/builtin-kmem.c | 2 +- tools/perf/builtin-kvm.c | 4 ++-- tools/perf/builtin-lock.c | 2 +- tools/perf/builtin-mem.c | 2 +- tools/perf/builtin-report.c | 2 +- tools/perf/builtin-script.c | 2 +- tools/perf/builtin-timechart.c | 2 +- tools/perf/builtin-top.c | 2 +- tools/perf/builtin-trace.c | 2 +- 13 files changed, 14 insertions(+), 14 deletions(-)
tools/perf/builtin-annotate.c +1 -1
@@ -340,7 +340,7 @@ int cmd_annotate(int argc, const char **argv, const char *prefix __maybe_unused) annotate.session =perf_session__new (&file, false, &annotate.tool);if (annotate.session ==NULL ) -return -ENOMEM ; +return -1 ; symbol_conf.priv_size =sizeof (struct annotation ); symbol_conf.try_vmlinux_path = true;
tools/perf/builtin-diff.c +1 -1
@@ -683,7 +683,7 @@ static int __cmd_diff(void) d->session =perf_session__new (&d->file, false, &tool);if (!d->session) {pr_err ("Failed to open %s\n" , d->file.path); - ret = -ENOMEM ; + ret =-1 ; goto out_delete; }
tools/perf/builtin-evlist.c +1 -1
@@ -28,7 +28,7 @@ static int __cmd_evlist(const char *file_name, struct perf_attr_details *details session =perf_session__new (&file,0 ,NULL );if (session ==NULL ) -return -ENOMEM ; +return -1 ;evlist__for_each (session->evlist, pos)perf_evsel__fprintf (pos, details, stdout);
tools/perf/builtin-inject.c +1 -1
@@ -460,7 +460,7 @@ int cmd_inject(int argc, const char **argv, const char *prefix __maybe_unused) file.path = inject.input_name; inject.session =perf_session__new (&file, true, &inject.tool);if (inject.session ==NULL ) -return -ENOMEM ; +return -1 ;if (symbol__init (&inject.session->header.env) <0 )return -1 ;
tools/perf/builtin-kmem.c +1 -1
@@ -698,7 +698,7 @@ int cmd_kmem(int argc, const char **argv, const char *prefix __maybe_unused) session =perf_session__new (&file, false, &perf_kmem);if (session ==NULL ) -return -ENOMEM ; +return -1 ;symbol__init (&session->header.env);
tools/perf/builtin-kvm.c +2 -2
@@ -1062,7 +1062,7 @@ static int read_events(struct perf_kvm_stat *kvm) kvm->session =perf_session__new (&file, false, &kvm->tool);if (!kvm->session) {pr_err ("Initializing perf session failed\n" ); -return -EINVAL ; +return -1 ; }symbol__init (&kvm->session->header.env);
@@ -1365,7 +1365,7 @@ static int kvm_events_live(struct perf_kvm_stat *kvm,*/ kvm->session =perf_session__new (&file, false, &kvm->tool);if (kvm->session ==NULL ) { - err = -ENOMEM ; + err =-1 ; goto out; } kvm->session->evlist = kvm->evlist;
tools/perf/builtin-lock.c +1 -1
@@ -862,7 +862,7 @@ static int __cmd_report(bool display_info) session =perf_session__new (&file, false, &eops);if (!session) {pr_err ("Initializing perf session failed\n" ); -return -ENOMEM ; +return -1 ; }symbol__init (&session->header.env);
tools/perf/builtin-mem.c +1 -1
@@ -124,7 +124,7 @@ static int report_raw_events(struct perf_mem *mem) &mem->tool);if (session ==NULL ) -return -ENOMEM ; +return -1 ;if (mem->cpu_list) { ret = perf_session__cpu_bitmap(session, mem->cpu_list,
tools/perf/builtin-report.c +1 -1
@@ -720,7 +720,7 @@ int cmd_report(int argc, const char **argv, const char *prefix __maybe_unused) repeat: session =perf_session__new (&file, false, &report.tool);if (session ==NULL ) -return -ENOMEM ; +return -1 ;if (report.queue_size) { ordered_events__set_alloc_size(&session->ordered_events,
tools/perf/builtin-script.c +1 -1
@@ -1744,7 +1744,7 @@ int cmd_script(int argc, const char **argv, const char *prefix __maybe_unused) session =perf_session__new (&file, false, &script.tool);if (session ==NULL ) -return -ENOMEM ; +return -1 ;if (header || header_only) {perf_session__fprintf_info (session, stdout, show_full_info);
tools/perf/builtin-timechart.c +1 -1
@@ -1605,7 +1605,7 @@ static int __cmd_timechart(struct timechart *tchart, const char *output_name)int ret = -EINVAL ;if (session ==NULL ) -return -ENOMEM ; +return -1 ;symbol__init (&session->header.env);
tools/perf/builtin-top.c +1 -1
@@ -929,7 +929,7 @@ static int __cmd_top(struct perf_top *top) top->session =perf_session__new (NULL , false,NULL );if (top->session ==NULL ) -return -ENOMEM ; +return -1 ;machines__set_symbol_filter (&top->session->machines, symbol_filter);
tools/perf/builtin-trace.c +1 -1
@@ -2245,7 +2245,7 @@ static int trace__replay(struct trace *trace) session =perf_session__new (&file, false, &trace->tool);if (session ==NULL ) -return -ENOMEM ; +return -1 ;if (symbol__init (&session->header.env) <0 ) goto out;
Signature · 1 line
1.8.3.2
Hi Taeung,
Quoted 4 lines · Taeung Song
Because
perf_session__new()could fail for more reasons than just ENOMEM, I modified error code(ENOMEM or EINVAL) into -1.Signed-off-by Taeung Song <[email protected]>
Acked-by Namhyung Kim <[email protected]>
Thanks,
Namhyung
Quoted 194 lines
--- tools/perf/builtin-annotate.c | 2 +- tools/perf/builtin-diff.c | 2 +- tools/perf/builtin-evlist.c | 2 +- tools/perf/builtin-inject.c | 2 +- tools/perf/builtin-kmem.c | 2 +- tools/perf/builtin-kvm.c | 4 ++-- tools/perf/builtin-lock.c | 2 +- tools/perf/builtin-mem.c | 2 +- tools/perf/builtin-report.c | 2 +- tools/perf/builtin-script.c | 2 +- tools/perf/builtin-timechart.c | 2 +- tools/perf/builtin-top.c | 2 +- tools/perf/builtin-trace.c | 2 +- 13 files changed, 14 insertions(+), 14 deletions(-)tools/perf/builtin-annotate.c +1
-1@@ -340,7 +340,7 @@ int cmd_annotate(int argc, const char **argv, const char *prefix __maybe_unused) annotate.session =perf_session__new (&file, false, &annotate.tool);if (annotate.session ==NULL ) -return -ENOMEM ; +return -1 ; symbol_conf.priv_size =sizeof (struct annotation ); symbol_conf.try_vmlinux_path = true;tools/perf/builtin-diff.c +1
-1@@ -683,7 +683,7 @@ static int __cmd_diff(void) d->session =perf_session__new (&d->file, false, &tool);if (!d->session) {pr_err ("Failed to open %s\n" , d->file.path); - ret = -ENOMEM ; + ret =-1 ; goto out_delete; }tools/perf/builtin-evlist.c +1
-1@@ -28,7 +28,7 @@ static int __cmd_evlist(const char *file_name, struct perf_attr_details *details session =perf_session__new (&file,0 ,NULL );if (session ==NULL ) -return -ENOMEM ; +return -1 ;evlist__for_each (session->evlist, pos)perf_evsel__fprintf (pos, details, stdout);tools/perf/builtin-inject.c +1
-1@@ -460,7 +460,7 @@ int cmd_inject(int argc, const char **argv, const char *prefix __maybe_unused) file.path = inject.input_name; inject.session =perf_session__new (&file, true, &inject.tool);if (inject.session ==NULL ) -return -ENOMEM ; +return -1 ;if (symbol__init (&inject.session->header.env) <0 )return -1 ;tools/perf/builtin-kmem.c +1
-1@@ -698,7 +698,7 @@ int cmd_kmem(int argc, const char **argv, const char *prefix __maybe_unused) session =perf_session__new (&file, false, &perf_kmem);if (session ==NULL ) -return -ENOMEM ; +return -1 ;symbol__init (&session->header.env);tools/perf/builtin-kvm.c +2
-2@@ -1062,7 +1062,7 @@ static int read_events(struct perf_kvm_stat *kvm) kvm->session =perf_session__new (&file, false, &kvm->tool);if (!kvm->session) {pr_err ("Initializing perf session failed\n" ); -return -EINVAL ; +return -1 ; }symbol__init (&kvm->session->header.env);@@ -1365,7 +1365,7 @@ static int kvm_events_live(struct perf_kvm_stat *kvm,*/ kvm->session =perf_session__new (&file, false, &kvm->tool);if (kvm->session ==NULL ) { - err = -ENOMEM ; + err =-1 ; goto out; } kvm->session->evlist = kvm->evlist;tools/perf/builtin-lock.c +1
-1@@ -862,7 +862,7 @@ static int __cmd_report(bool display_info) session =perf_session__new (&file, false, &eops);if (!session) {pr_err ("Initializing perf session failed\n" ); -return -ENOMEM ; +return -1 ; }symbol__init (&session->header.env);tools/perf/builtin-mem.c +1
-1@@ -124,7 +124,7 @@ static int report_raw_events(struct perf_mem *mem) &mem->tool);if (session ==NULL ) -return -ENOMEM ; +return -1 ;if (mem->cpu_list) { ret = perf_session__cpu_bitmap(session, mem->cpu_list,tools/perf/builtin-report.c +1
-1@@ -720,7 +720,7 @@ int cmd_report(int argc, const char **argv, const char *prefix __maybe_unused) repeat: session =perf_session__new (&file, false, &report.tool);if (session ==NULL ) -return -ENOMEM ; +return -1 ;if (report.queue_size) { ordered_events__set_alloc_size(&session->ordered_events,tools/perf/builtin-script.c +1
-1@@ -1744,7 +1744,7 @@ int cmd_script(int argc, const char **argv, const char *prefix __maybe_unused) session =perf_session__new (&file, false, &script.tool);if (session ==NULL ) -return -ENOMEM ; +return -1 ;if (header || header_only) {perf_session__fprintf_info (session, stdout, show_full_info);tools/perf/builtin-timechart.c +1
-1@@ -1605,7 +1605,7 @@ static int __cmd_timechart(struct timechart *tchart, const char *output_name)int ret = -EINVAL ;if (session ==NULL ) -return -ENOMEM ; +return -1 ;symbol__init (&session->header.env);tools/perf/builtin-top.c +1
-1@@ -929,7 +929,7 @@ static int __cmd_top(struct perf_top *top) top->session =perf_session__new (NULL , false,NULL );if (top->session ==NULL ) -return -ENOMEM ; +return -1 ;machines__set_symbol_filter (&top->session->machines, symbol_filter);tools/perf/builtin-trace.c +1
-1@@ -2245,7 +2245,7 @@ static int trace__replay(struct trace *trace) session =perf_session__new (&file, false, &trace->tool);if (session ==NULL ) -return -ENOMEM ; +return -1 ;if (symbol__init (&session->header.env) <0 ) goto out;
tip-bot for Taeung Song
merge bot[tip:perf/core] perf tools: Modify error code for when perf_session__new() fails
In reply to Taeung Songperf tools: Modify error code for when perf_session__new() fails
Commit-ID: 52e0283497ccb1e675d56c9499cc2cc5ec271094 Gitweb: http://git.kernel.org/tip/52e0283497ccb1e675d56c9499cc2cc5ec271094 Author: Taeung Song <[email protected]> AuthorDate: Wed, 24 Sep 2014 10:33:37 +0900 Committer: Arnaldo Carvalho de Melo <[email protected]> CommitDate: Fri, 26 Sep 2014 12:32:58 -0300
perf tools: Modify error code for when perf_session__new() fails
Because perf_session__new() can fail for more reasons than just ENOMEM, modify error code(ENOMEM or EINVAL) to -1.
Signed-off-by Taeung Song <[email protected]>
Acked-by Jiri Olsa <[email protected]>
Acked-by Namhyung Kim <[email protected]>
Cc Jiri Olsa <[email protected]>
Cc Namhyung Kim <[email protected]>
Signed-off-by Arnaldo Carvalho de Melo <[email protected]>
--- tools/perf/builtin-annotate.c | 2 +- tools/perf/builtin-diff.c | 2 +- tools/perf/builtin-evlist.c | 2 +- tools/perf/builtin-inject.c | 2 +- tools/perf/builtin-kmem.c | 2 +- tools/perf/builtin-kvm.c | 4 ++-- tools/perf/builtin-lock.c | 2 +- tools/perf/builtin-mem.c | 2 +- tools/perf/builtin-report.c | 2 +- tools/perf/builtin-script.c | 2 +- tools/perf/builtin-timechart.c | 2 +- tools/perf/builtin-top.c | 2 +- tools/perf/builtin-trace.c | 2 +- 13 files changed, 14 insertions(+), 14 deletions(-)
tools/perf/builtin-annotate.c +1 -1
@@ -340,7 +340,7 @@ int cmd_annotate(int argc, const char **argv, const char *prefix __maybe_unused) annotate.session =perf_session__new (&file, false, &annotate.tool);if (annotate.session ==NULL ) -return -ENOMEM ; +return -1 ; symbol_conf.priv_size =sizeof (struct annotation ); symbol_conf.try_vmlinux_path = true;
tools/perf/builtin-diff.c +1 -1
@@ -683,7 +683,7 @@ static int __cmd_diff(void) d->session =perf_session__new (&d->file, false, &tool);if (!d->session) {pr_err ("Failed to open %s\n" , d->file.path); - ret = -ENOMEM ; + ret =-1 ; goto out_delete; }
tools/perf/builtin-evlist.c +1 -1
@@ -28,7 +28,7 @@ static int __cmd_evlist(const char *file_name, struct perf_attr_details *details session =perf_session__new (&file,0 ,NULL );if (session ==NULL ) -return -ENOMEM ; +return -1 ;evlist__for_each (session->evlist, pos)perf_evsel__fprintf (pos, details, stdout);
tools/perf/builtin-inject.c +1 -1
@@ -460,7 +460,7 @@ int cmd_inject(int argc, const char **argv, const char *prefix __maybe_unused) file.path = inject.input_name; inject.session =perf_session__new (&file, true, &inject.tool);if (inject.session ==NULL ) -return -ENOMEM ; +return -1 ;if (symbol__init (&inject.session->header.env) <0 )return -1 ;
tools/perf/builtin-kmem.c +1 -1
@@ -698,7 +698,7 @@ int cmd_kmem(int argc, const char **argv, const char *prefix __maybe_unused) session =perf_session__new (&file, false, &perf_kmem);if (session ==NULL ) -return -ENOMEM ; +return -1 ;symbol__init (&session->header.env);
tools/perf/builtin-kvm.c +2 -2
@@ -1058,7 +1058,7 @@ static int read_events(struct perf_kvm_stat *kvm) kvm->session =perf_session__new (&file, false, &kvm->tool);if (!kvm->session) {pr_err ("Initializing perf session failed\n" ); -return -EINVAL ; +return -1 ; }symbol__init (&kvm->session->header.env);
@@ -1361,7 +1361,7 @@ static int kvm_events_live(struct perf_kvm_stat *kvm,*/ kvm->session =perf_session__new (&file, false, &kvm->tool);if (kvm->session ==NULL ) { - err = -ENOMEM ; + err =-1 ; goto out; } kvm->session->evlist = kvm->evlist;
tools/perf/builtin-lock.c +1 -1
@@ -862,7 +862,7 @@ static int __cmd_report(bool display_info) session =perf_session__new (&file, false, &eops);if (!session) {pr_err ("Initializing perf session failed\n" ); -return -ENOMEM ; +return -1 ; }symbol__init (&session->header.env);
tools/perf/builtin-mem.c +1 -1
@@ -124,7 +124,7 @@ static int report_raw_events(struct perf_mem *mem) &mem->tool);if (session ==NULL ) -return -ENOMEM ; +return -1 ;if (mem->cpu_list) { ret = perf_session__cpu_bitmap(session, mem->cpu_list,
tools/perf/builtin-report.c +1 -1
@@ -720,7 +720,7 @@ int cmd_report(int argc, const char **argv, const char *prefix __maybe_unused) repeat: session =perf_session__new (&file, false, &report.tool);if (session ==NULL ) -return -ENOMEM ; +return -1 ;if (report.queue_size) { ordered_events__set_alloc_size(&session->ordered_events,
tools/perf/builtin-script.c +1 -1
@@ -1744,7 +1744,7 @@ int cmd_script(int argc, const char **argv, const char *prefix __maybe_unused) session =perf_session__new (&file, false, &script.tool);if (session ==NULL ) -return -ENOMEM ; +return -1 ;if (header || header_only) {perf_session__fprintf_info (session, stdout, show_full_info);
tools/perf/builtin-timechart.c +1 -1
@@ -1605,7 +1605,7 @@ static int __cmd_timechart(struct timechart *tchart, const char *output_name)int ret = -EINVAL ;if (session ==NULL ) -return -ENOMEM ; +return -1 ;symbol__init (&session->header.env);
tools/perf/builtin-top.c +1 -1
@@ -929,7 +929,7 @@ static int __cmd_top(struct perf_top *top) top->session =perf_session__new (NULL , false,NULL );if (top->session ==NULL ) -return -ENOMEM ; +return -1 ;machines__set_symbol_filter (&top->session->machines, symbol_filter);
tools/perf/builtin-trace.c +1 -1
@@ -2250,7 +2250,7 @@ static int trace__replay(struct trace *trace) session =perf_session__new (&file, false, &trace->tool);if (session ==NULL ) -return -ENOMEM ; +return -1 ;if (symbol__init (&session->header.env) <0 ) goto out;