Perf:Return error code for perf_session__new function on failure
PATCH v2 1/1 Perf:Return error code for perf_session__new function on failure
This Patch is to return error code of perf_new_session function on failure instead of NULL
----------------------------------------------
Test Results:
Before Fix:
$ perf c2c report -input failed to open nput: No such file or directory
$ echo $? 0 ------------------------------------------ After Fix:
$ ./perf c2c report -input failed to open nput: No such file or directory
$ echo $? 254
--- tools/perf/builtin-annotate.c | 5 +++-- tools/perf/builtin-buildid-cache.c | 5 +++-- tools/perf/builtin-buildid-list.c | 5 +++-- tools/perf/builtin-c2c.c | 6 ++++-- tools/perf/builtin-diff.c | 9 +++++---- tools/perf/builtin-evlist.c | 5 +++-- tools/perf/builtin-inject.c | 5 +++-- tools/perf/builtin-kmem.c | 5 +++-- tools/perf/builtin-kvm.c | 9 +++++---- tools/perf/builtin-lock.c | 5 +++-- tools/perf/builtin-mem.c | 5 +++-- tools/perf/builtin-record.c | 5 +++-- tools/perf/builtin-report.c | 4 ++-- tools/perf/builtin-sched.c | 11 ++++++----- tools/perf/builtin-script.c | 9 +++++---- tools/perf/builtin-stat.c | 11 ++++++----- tools/perf/builtin-timechart.c | 5 +++-- tools/perf/builtin-top.c | 5 +++-- tools/perf/builtin-trace.c | 4 ++-- tools/perf/util/data-convert-bt.c | 5 ++++- tools/perf/util/session.c | 15 +++++++++++---- 21 files changed, 83 insertions(+), 55 deletions(-)
tools/perf/builtin-annotate.c +3 -2
@@ -33,6 +33,7 @@#include "util/data.h" #include "arch/common.h" #include "util/block-range.h" +#include <linux/err.h> #include <dlfcn.h> #include <errno.h>
@@ -581,8 +582,8 @@ int cmd_annotate(int argc, const char **argv) data.path = input_name; annotate.session =perf_session__new (&data, false, &annotate.tool); -if (annotate.session ==NULL ) -return -1 ; +if (IS_ERR (annotate.session)) +return PTR_ERR (annotate.session); annotate.has_br_stack =perf_header__has_feat (&annotate.session->header,HEADER_BRANCH_STACK );
tools/perf/builtin-buildid-cache.c +3 -2
@@ -26,6 +26,7 @@#include "util/symbol.h" #include "util/time-utils.h" #include "util/probe-file.h" +#include <linux/err.h> static int build_id_cache__kcore_buildid (const char *proc_dir,char *sbuildid) {
@@ -420,8 +421,8 @@ int cmd_buildid_cache(int argc, const char **argv) data.force = force; session =perf_session__new (&data, false,NULL ); -if (session ==NULL ) -return -1 ; +if (IS_ERR (session)) +return PTR_ERR (session); }if (symbol__init (session ? &session->header.env :NULL ) <0 )
tools/perf/builtin-buildid-list.c +3 -2
@@ -18,6 +18,7 @@#include "util/symbol.h" #include "util/data.h" #include <errno.h> +#include <linux/err.h> static int sysfs__fprintf_build_id (FILE *fp) {
@@ -65,8 +66,8 @@ static int perf_session__list_build_ids(bool force, bool with_hits) goto out; session =perf_session__new (&data, false, &build_id__mark_dso_hit_ops); -if (session ==NULL ) -return -1 ; +if (IS_ERR (session)) +return PTR_ERR (session);/* * We take all buildids when the file contains AUX area tracing data
tools/perf/builtin-c2c.c +4 -2
@@ -34,6 +34,7 @@#include "thread.h" #include "mem2node.h" #include "symbol.h" +#include <linux/err.h> struct c2c_hists {struct hists hists;
@@ -2774,8 +2775,9 @@ static int perf_c2c__report(int argc, const char **argv) } session =perf_session__new (&data,0 , &c2c.tool); -if (session ==NULL ) { -pr_debug ("No memory for session\n" ); +if (IS_ERR (session)) { + err =PTR_ERR (session); +pr_debug ("Error creating perf session\n" ); goto out; }
tools/perf/builtin-diff.c +5 -4
@@ -22,6 +22,7 @@#include "util/annotate.h" #include "util/map.h" #include <linux/zalloc.h> +#include <linux/err.h> #include <errno.h> #include <inttypes.h>
@@ -1149,9 +1150,9 @@ static int check_file_brstack(void)data__for_each_file (i, d) { d->session =perf_session__new (&d->data, false, &pdiff.tool); -if (!d->session) { +if (IS_ERR (d->session)) {pr_err ("Failed to open %s\n" , d->data.path); -return -1 ; +return PTR_ERR (d->session); } has_br_stack = perf_header__has_feat(&d->session->header,
@@ -1181,9 +1182,9 @@ static int __cmd_diff(void)data__for_each_file (i, d) { d->session =perf_session__new (&d->data, false, &pdiff.tool); -if (!d->session) { +if (IS_ERR (d->session)) { + ret =PTR_ERR (d->session);pr_err ("Failed to open %s\n" , d->data.path); - ret =-1 ; goto out_delete; }
tools/perf/builtin-evlist.c +3 -2
@@ -17,6 +17,7 @@#include "util/session.h" #include "util/data.h" #include "util/debug.h" +#include <linux/err.h> static int __cmd_evlist (const char *file_name,struct perf_attr_details *details) {
@@ -30,8 +31,8 @@ static int __cmd_evlist(const char *file_name, struct perf_attr_details *detailsbool has_tracepoint = false; session =perf_session__new (&data,0 ,NULL ); -if (session ==NULL ) -return -1 ; +if (IS_ERR (session)) +return PTR_ERR (session);evlist__for_each_entry (session->evlist, pos) {perf_evsel__fprintf (pos, details, stdout);
tools/perf/builtin-inject.c +3 -2
@@ -22,6 +22,7 @@#include "util/jit.h" #include "util/symbol.h" #include "util/thread.h" +#include <linux/err.h> #include <subcmd/parse-options.h>
@@ -834,8 +835,8 @@ int cmd_inject(int argc, const char **argv) data.path = inject.input_name; inject.session =perf_session__new (&data, true, &inject.tool); -if (inject.session ==NULL ) -return -1 ; +if (IS_ERR (inject.session)) +return PTR_ERR (inject.session);if (zstd_init (&(inject.session->zstd_data),0 ) <0 )pr_warning ("Decompression initialization failed.\n" );
tools/perf/builtin-kmem.c +3 -2
@@ -13,6 +13,7 @@#include "util/tool.h" #include "util/callchain.h" #include "util/time-utils.h" +#include <linux/err.h> #include <subcmd/parse-options.h> #include "util/trace-event.h"
@@ -1953,8 +1954,8 @@ int cmd_kmem(int argc, const char **argv) data.path = input_name; kmem_session = session =perf_session__new (&data, false, &perf_kmem); -if (session ==NULL ) -return -1 ; +if (IS_ERR (session)) +return PTR_ERR (session); ret =-1 ;
tools/perf/builtin-kvm.c +5 -4
@@ -19,6 +19,7 @@#include "util/top.h" #include "util/data.h" #include "util/ordered-events.h" +#include <linux/err.h> #include <sys/prctl.h> #ifdef HAVE_TIMERFD_SUPPORT
@@ -1087,9 +1088,9 @@ static int read_events(struct perf_kvm_stat *kvm) kvm->tool = eops; kvm->session =perf_session__new (&file, false, &kvm->tool); -if (!kvm->session) { +if (IS_ERR (kvm->session)) {pr_err ("Initializing perf session failed\n" ); -return -1 ; +return PTR_ERR (kvm->session); }symbol__init (&kvm->session->header.env);
@@ -1442,8 +1443,8 @@ static int kvm_events_live(struct perf_kvm_stat *kvm,* perf session */ kvm->session =perf_session__new (&data, false, &kvm->tool); -if (kvm->session ==NULL ) { - err =-1 ; +if (IS_ERR (kvm->session)) { + err =PTR_ERR (kvm->session); goto out; } kvm->session->evlist = kvm->evlist;
tools/perf/builtin-lock.c +3 -2
@@ -30,6 +30,7 @@#include <linux/hash.h> #include <linux/kernel.h> #include <linux/zalloc.h> +#include <linux/err.h> static struct perf_session *session;
@@ -872,9 +873,9 @@ static int __cmd_report(bool display_info) }; session =perf_session__new (&data, false, &eops); -if (!session) { +if (IS_ERR (session)) {pr_err ("Initializing perf session failed\n" ); -return -1 ; +return PTR_ERR (session); }symbol__init (&session->header.env);
tools/perf/builtin-mem.c +3 -2
@@ -15,6 +15,7 @@#include "util/debug.h" #include "util/map.h" #include "util/symbol.h" +#include <linux/err.h> #define MEM_OPERATION_LOAD 0x1#define MEM_OPERATION_STORE 0x2
@@ -247,8 +248,8 @@ static int report_raw_events(struct perf_mem *mem)struct perf_session *session =perf_session__new (&data, false, &mem->tool); -if (session ==NULL ) -return -1 ; +if (IS_ERR (session)) +return PTR_ERR (session);if (mem->cpu_list) { ret = perf_session__cpu_bitmap(session, mem->cpu_list,
tools/perf/builtin-record.c +3 -2
@@ -42,6 +42,7 @@#include "util/units.h" #include "util/bpf-event.h" #include "asm/bug.h" +#include <linux/err.h> #include <errno.h> #include <inttypes.h>
@@ -1360,9 +1361,9 @@ static int __cmd_record(struct record *rec, int argc, const char **argv) } session =perf_session__new (data, false, tool); -if (session ==NULL ) { +if (IS_ERR (session)) {pr_err ("Perf session creation failed.\n" ); -return -1 ; +return PTR_ERR (session); } fd =perf_data__fd (data);
tools/perf/builtin-report.c +2 -2
@@ -1260,8 +1260,8 @@ int cmd_report(int argc, const char **argv) repeat: session =perf_session__new (&data, false, &report.tool); -if (session ==NULL ) -return -1 ; +if (IS_ERR (session)) +return PTR_ERR (session); ret =evswitch__init (&report.evswitch, session->evlist, stderr);if (ret)
tools/perf/builtin-sched.c +6 -5
@@ -36,6 +36,7 @@#include <math.h> #include <api/fs/fs.h> #include <linux/time64.h> +#include <linux/err.h> #include <linux/ctype.h>
@@ -1793,9 +1794,9 @@ static int perf_sched__read_events(struct perf_sched *sched)int rc =-1 ; session =perf_session__new (&data, false, &sched->tool); -if (session ==NULL ) { -pr_debug ("No Memory for session\n" ); -return -1 ; +if (IS_ERR (session)) { +pr_debug ("Error creating perf session" ); +return PTR_ERR (session); }symbol__init (&session->header.env);
@@ -2985,8 +2986,8 @@ static int perf_sched__timehist(struct perf_sched *sched) symbol_conf.use_callchain = sched->show_callchain; session =perf_session__new (&data, false, &sched->tool); -if (session ==NULL ) -return -ENOMEM ; +if (IS_ERR (session)) +return PTR_ERR (session); evlist = session->evlist;
tools/perf/builtin-script.c +5 -4
@@ -50,6 +50,7 @@#include <unistd.h> #include <subcmd/pager.h> #include <perf/evlist.h> +#include <linux/err.h> #include <linux/ctype.h>
@@ -3078,8 +3079,8 @@ int find_scripts(char **scripts_array, char **scripts_path_array, int num,int i =0 ; session =perf_session__new (&data, false,NULL ); -if (!session) -return -1 ; +if (IS_ERR (session)) +return PTR_ERR (session);snprintf (scripts_path,MAXPATHLEN ,"%s/scripts" ,get_argv_exec_path ());
@@ -3749,8 +3750,8 @@ int cmd_script(int argc, const char **argv) } session =perf_session__new (&data, false, &script.tool); -if (session ==NULL ) -return -1 ; +if (IS_ERR (session)) +return PTR_ERR (session);if (header || header_only) { script.tool.show_feat_hdr =SHOW_FEAT_HEADER ;
tools/perf/builtin-stat.c +6 -5
@@ -81,6 +81,7 @@#include <unistd.h> #include <sys/time.h> #include <sys/resource.h> +#include <linux/err.h> #include <linux/ctype.h> #include <perf/evlist.h>
@@ -1446,9 +1447,9 @@ static int __cmd_record(int argc, const char **argv) } session =perf_session__new (data, false,NULL ); -if (session ==NULL ) { -pr_err ("Perf session creation failed.\n" ); -return -1 ; +if (IS_ERR (session)) { +pr_err ("Perf session creation failed\n" ); +return PTR_ERR (session); }init_features (session);
@@ -1645,8 +1646,8 @@ static int __cmd_report(int argc, const char **argv) perf_stat.data.mode =PERF_DATA_MODE_READ ; session =perf_session__new (&perf_stat.data, false, &perf_stat.tool); -if (session ==NULL ) -return -1 ; +if (IS_ERR (session)) +return PTR_ERR (session); perf_stat.session = session; stat_config.output = stderr;
tools/perf/builtin-timechart.c +3 -2
@@ -36,6 +36,7 @@#include "util/tool.h" #include "util/data.h" #include "util/debug.h" +#include <linux/err.h> #ifdef LACKS_OPEN_MEMSTREAM_PROTOTYPE FILE *open_memstream (char **ptr,size_t *sizeloc);
@@ -1605,8 +1606,8 @@ static int __cmd_timechart(struct timechart *tchart, const char *output_name) &tchart->tool);int ret = -EINVAL ; -if (session ==NULL ) -return -1 ; +if (IS_ERR (session)) +return PTR_ERR (session);symbol__init (&session->header.env);
tools/perf/builtin-top.c +3 -2
@@ -74,6 +74,7 @@#include <linux/stringify.h> #include <linux/time64.h> #include <linux/types.h> +#include <linux/err.h> #include <linux/ctype.h>
@@ -1675,8 +1676,8 @@ int cmd_top(int argc, const char **argv) } top.session =perf_session__new (NULL , false,NULL ); -if (top.session ==NULL ) { - status =-1 ; +if (IS_ERR (top.session)) { + status =PTR_ERR (top.session); goto out_delete_evlist; }
tools/perf/builtin-trace.c +2 -2
@@ -3578,8 +3578,8 @@ static int trace__replay(struct trace *trace) trace->multiple_threads = true; session =perf_session__new (&data, false, &trace->tool); -if (session ==NULL ) -return -1 ; +if (IS_ERR (session)) +return PTR_ERR (session);if (trace->opts.target.pid) symbol_conf.pid_list_str =strdup (trace->opts.target.pid);
tools/perf/util/data-convert-bt.c +4 -1
@@ -30,6 +30,7 @@#include "machine.h" #include "config.h" #include <linux/ctype.h> +#include <linux/err.h> #define pr_N (n, fmt, ...) \ eprintf(n, debug_data_convert, fmt, ##__VA_ARGS__)
@@ -1619,8 +1620,10 @@ int bt_convert__perf2ctf(const char *input, const char *path, err =-1 ;/* perf.data session */ session =perf_session__new (&data,0 , &c.tool); -if (!session) +if (IS_ERR (session)) { + err =PTR_ERR (session); goto free_writer; + }if (c.queue_size) { ordered_events__set_alloc_size(&session->ordered_events,
tools/perf/util/session.c +11 -4
@@ -30,6 +30,7 @@#include "sample-raw.h" #include "stat.h" #include "arch/common.h" +#include <linux/err.h> #ifdef HAVE_ZSTD_SUPPORT static int perf_session__process_compressed_event(struct perf_session *session,
@@ -183,6 +184,7 @@ static int ordered_events__deliver_event(struct ordered_events *oe,struct perf_session *perf_session__new (struct perf_data *data,bool repipe,struct perf_tool *tool) { +int ret = -ENOMEM ;struct perf_session *session =zalloc (sizeof (*session));if (!session)
@@ -197,13 +199,15 @@ struct perf_session *perf_session__new(struct perf_data *data,perf_env__init (&session->header.env);if (data) { -if (perf_data__open (data)) + ret =perf_data__open (data); +if (ret <0 ) goto out_delete; session->data = data;if (perf_data__is_read (data)) { -if (perf_session__open (session) <0 ) + ret =perf_session__open (session); +if (ret <0 ) goto out_delete;/*
@@ -218,8 +222,11 @@ struct perf_session *perf_session__new(struct perf_data *data,perf_evlist__init_trace_event_sample_raw (session->evlist);/* Open the directory data. */ -if (data->is_dir &&perf_data__open_dir (data)) +if (data->is_dir) { + ret =perf_data__open_dir (data); +if (ret) goto out_delete; + } } }else { session->machines.host.env = &perf_env;
@@ -252,7 +259,7 @@ struct perf_session *perf_session__new(struct perf_data *data, out_delete:perf_session__delete (session); out: -return NULL ; +return ERR_PTR (ret); }static void perf_session__delete_threads (struct perf_session *session)
Quoted 15 lines · Mamatha Inamdar
This Patch is to return error code of
perf_new_sessionfunction on failure instead of NULL
----------------------------------------------
Test Results:Before Fix:
$ perf c2c report -input failed to open nput: No such file or directory$ echo $? 0 ------------------------------------------ After Fix:
Quoted 5 lines
$ ./perf c2c report -input failed to open nput: No such file or directory$ echo $? 254
[root@krava perf]# ./perf c2c report -input
failed to open nput: No such file or directory
[root@krava perf]# echo $?
255
hum, not sure why I'm getting 255.. but it looks good now
thanks,
jirka
Quoted 600 lines
Signed-off-by Mamatha Inamdar <[email protected]>Acked-by Ravi Bangoria <[email protected]>Reported-by Nageswara R Sastry <[email protected]>Tested-by Nageswara R Sastry <[email protected]>--- tools/perf/builtin-annotate.c | 5 +++-- tools/perf/builtin-buildid-cache.c | 5 +++-- tools/perf/builtin-buildid-list.c | 5 +++-- tools/perf/builtin-c2c.c | 6 ++++-- tools/perf/builtin-diff.c | 9 +++++---- tools/perf/builtin-evlist.c | 5 +++-- tools/perf/builtin-inject.c | 5 +++-- tools/perf/builtin-kmem.c | 5 +++-- tools/perf/builtin-kvm.c | 9 +++++---- tools/perf/builtin-lock.c | 5 +++-- tools/perf/builtin-mem.c | 5 +++-- tools/perf/builtin-record.c | 5 +++-- tools/perf/builtin-report.c | 4 ++-- tools/perf/builtin-sched.c | 11 ++++++----- tools/perf/builtin-script.c | 9 +++++---- tools/perf/builtin-stat.c | 11 ++++++----- tools/perf/builtin-timechart.c | 5 +++-- tools/perf/builtin-top.c | 5 +++-- tools/perf/builtin-trace.c | 4 ++-- tools/perf/util/data-convert-bt.c | 5 ++++- tools/perf/util/session.c | 15 +++++++++++---- 21 files changed, 83 insertions(+), 55 deletions(-)tools/perf/builtin-annotate.c +3
-2@@ -33,6 +33,7 @@#include "util/data.h" #include "arch/common.h" #include "util/block-range.h" +#include <linux/err.h> #include <dlfcn.h> #include <errno.h> @@ -581,8 +582,8 @@ int cmd_annotate(int argc, const char **argv) data.path = input_name; annotate.session =perf_session__new (&data, false, &annotate.tool); -if (annotate.session ==NULL ) -return -1 ; +if (IS_ERR (annotate.session)) +return PTR_ERR (annotate.session); annotate.has_br_stack =perf_header__has_feat (&annotate.session->header,HEADER_BRANCH_STACK );tools/perf/builtin-buildid-cache.c +3
-2@@ -26,6 +26,7 @@#include "util/symbol.h" #include "util/time-utils.h" #include "util/probe-file.h" +#include <linux/err.h> static int build_id_cache__kcore_buildid (const char *proc_dir,char *sbuildid) {@@ -420,8 +421,8 @@ int cmd_buildid_cache(int argc, const char **argv) data.force = force; session =perf_session__new (&data, false,NULL ); -if (session ==NULL ) -return -1 ; +if (IS_ERR (session)) +return PTR_ERR (session); }if (symbol__init (session ? &session->header.env :NULL ) <0 )tools/perf/builtin-buildid-list.c +3
-2@@ -18,6 +18,7 @@#include "util/symbol.h" #include "util/data.h" #include <errno.h> +#include <linux/err.h> static int sysfs__fprintf_build_id (FILE *fp) {@@ -65,8 +66,8 @@ static int perf_session__list_build_ids(bool force, bool with_hits) goto out; session =perf_session__new (&data, false, &build_id__mark_dso_hit_ops); -if (session ==NULL ) -return -1 ; +if (IS_ERR (session)) +return PTR_ERR (session);/* * We take all buildids when the file contains AUX area tracing data tools/perf/builtin-c2c.c +4
-2@@ -34,6 +34,7 @@#include "thread.h" #include "mem2node.h" #include "symbol.h" +#include <linux/err.h> struct c2c_hists {struct hists hists;@@ -2774,8 +2775,9 @@ static int perf_c2c__report(int argc, const char **argv) } session =perf_session__new (&data,0 , &c2c.tool); -if (session ==NULL ) { -pr_debug ("No memory for session\n" ); +if (IS_ERR (session)) { + err =PTR_ERR (session); +pr_debug ("Error creating perf session\n" ); goto out; }tools/perf/builtin-diff.c +5
-4@@ -22,6 +22,7 @@#include "util/annotate.h" #include "util/map.h" #include <linux/zalloc.h> +#include <linux/err.h> #include <errno.h> #include <inttypes.h> @@ -1149,9 +1150,9 @@ static int check_file_brstack(void)data__for_each_file (i, d) { d->session =perf_session__new (&d->data, false, &pdiff.tool); -if (!d->session) { +if (IS_ERR (d->session)) {pr_err ("Failed to open %s\n" , d->data.path); -return -1 ; +return PTR_ERR (d->session); } has_br_stack = perf_header__has_feat(&d->session->header,@@ -1181,9 +1182,9 @@ static int __cmd_diff(void)data__for_each_file (i, d) { d->session =perf_session__new (&d->data, false, &pdiff.tool); -if (!d->session) { +if (IS_ERR (d->session)) { + ret =PTR_ERR (d->session);pr_err ("Failed to open %s\n" , d->data.path); - ret =-1 ; goto out_delete; }tools/perf/builtin-evlist.c +3
-2@@ -17,6 +17,7 @@#include "util/session.h" #include "util/data.h" #include "util/debug.h" +#include <linux/err.h> static int __cmd_evlist (const char *file_name,struct perf_attr_details *details) {@@ -30,8 +31,8 @@ static int __cmd_evlist(const char *file_name, struct perf_attr_details *detailsbool has_tracepoint = false; session =perf_session__new (&data,0 ,NULL ); -if (session ==NULL ) -return -1 ; +if (IS_ERR (session)) +return PTR_ERR (session);evlist__for_each_entry (session->evlist, pos) {perf_evsel__fprintf (pos, details, stdout);tools/perf/builtin-inject.c +3
-2@@ -22,6 +22,7 @@#include "util/jit.h" #include "util/symbol.h" #include "util/thread.h" +#include <linux/err.h> #include <subcmd/parse-options.h> @@ -834,8 +835,8 @@ int cmd_inject(int argc, const char **argv) data.path = inject.input_name; inject.session =perf_session__new (&data, true, &inject.tool); -if (inject.session ==NULL ) -return -1 ; +if (IS_ERR (inject.session)) +return PTR_ERR (inject.session);if (zstd_init (&(inject.session->zstd_data),0 ) <0 )pr_warning ("Decompression initialization failed.\n" );tools/perf/builtin-kmem.c +3
-2@@ -13,6 +13,7 @@#include "util/tool.h" #include "util/callchain.h" #include "util/time-utils.h" +#include <linux/err.h> #include <subcmd/parse-options.h> #include "util/trace-event.h" @@ -1953,8 +1954,8 @@ int cmd_kmem(int argc, const char **argv) data.path = input_name; kmem_session = session =perf_session__new (&data, false, &perf_kmem); -if (session ==NULL ) -return -1 ; +if (IS_ERR (session)) +return PTR_ERR (session); ret =-1 ;tools/perf/builtin-kvm.c +5
-4@@ -19,6 +19,7 @@#include "util/top.h" #include "util/data.h" #include "util/ordered-events.h" +#include <linux/err.h> #include <sys/prctl.h> #ifdef HAVE_TIMERFD_SUPPORT @@ -1087,9 +1088,9 @@ static int read_events(struct perf_kvm_stat *kvm) kvm->tool = eops; kvm->session =perf_session__new (&file, false, &kvm->tool); -if (!kvm->session) { +if (IS_ERR (kvm->session)) {pr_err ("Initializing perf session failed\n" ); -return -1 ; +return PTR_ERR (kvm->session); }symbol__init (&kvm->session->header.env);@@ -1442,8 +1443,8 @@ static int kvm_events_live(struct perf_kvm_stat *kvm,* perf session */ kvm->session =perf_session__new (&data, false, &kvm->tool); -if (kvm->session ==NULL ) { - err =-1 ; +if (IS_ERR (kvm->session)) { + err =PTR_ERR (kvm->session); goto out; } kvm->session->evlist = kvm->evlist;tools/perf/builtin-lock.c +3
-2@@ -30,6 +30,7 @@#include <linux/hash.h> #include <linux/kernel.h> #include <linux/zalloc.h> +#include <linux/err.h> static struct perf_session *session;@@ -872,9 +873,9 @@ static int __cmd_report(bool display_info) }; session =perf_session__new (&data, false, &eops); -if (!session) { +if (IS_ERR (session)) {pr_err ("Initializing perf session failed\n" ); -return -1 ; +return PTR_ERR (session); }symbol__init (&session->header.env);tools/perf/builtin-mem.c +3
-2@@ -15,6 +15,7 @@#include "util/debug.h" #include "util/map.h" #include "util/symbol.h" +#include <linux/err.h> #define MEM_OPERATION_LOAD 0x1#define MEM_OPERATION_STORE 0x2@@ -247,8 +248,8 @@ static int report_raw_events(struct perf_mem *mem)struct perf_session *session =perf_session__new (&data, false, &mem->tool); -if (session ==NULL ) -return -1 ; +if (IS_ERR (session)) +return PTR_ERR (session);if (mem->cpu_list) { ret = perf_session__cpu_bitmap(session, mem->cpu_list,tools/perf/builtin-record.c +3
-2@@ -42,6 +42,7 @@#include "util/units.h" #include "util/bpf-event.h" #include "asm/bug.h" +#include <linux/err.h> #include <errno.h> #include <inttypes.h> @@ -1360,9 +1361,9 @@ static int __cmd_record(struct record *rec, int argc, const char **argv) } session =perf_session__new (data, false, tool); -if (session ==NULL ) { +if (IS_ERR (session)) {pr_err ("Perf session creation failed.\n" ); -return -1 ; +return PTR_ERR (session); } fd =perf_data__fd (data);tools/perf/builtin-report.c +2
-2@@ -1260,8 +1260,8 @@ int cmd_report(int argc, const char **argv) repeat: session =perf_session__new (&data, false, &report.tool); -if (session ==NULL ) -return -1 ; +if (IS_ERR (session)) +return PTR_ERR (session); ret =evswitch__init (&report.evswitch, session->evlist, stderr);if (ret)tools/perf/builtin-sched.c +6
-5@@ -36,6 +36,7 @@#include <math.h> #include <api/fs/fs.h> #include <linux/time64.h> +#include <linux/err.h> #include <linux/ctype.h> @@ -1793,9 +1794,9 @@ static int perf_sched__read_events(struct perf_sched *sched)int rc =-1 ; session =perf_session__new (&data, false, &sched->tool); -if (session ==NULL ) { -pr_debug ("No Memory for session\n" ); -return -1 ; +if (IS_ERR (session)) { +pr_debug ("Error creating perf session" ); +return PTR_ERR (session); }symbol__init (&session->header.env);@@ -2985,8 +2986,8 @@ static int perf_sched__timehist(struct perf_sched *sched) symbol_conf.use_callchain = sched->show_callchain; session =perf_session__new (&data, false, &sched->tool); -if (session ==NULL ) -return -ENOMEM ; +if (IS_ERR (session)) +return PTR_ERR (session); evlist = session->evlist;tools/perf/builtin-script.c +5
-4@@ -50,6 +50,7 @@#include <unistd.h> #include <subcmd/pager.h> #include <perf/evlist.h> +#include <linux/err.h> #include <linux/ctype.h> @@ -3078,8 +3079,8 @@ int find_scripts(char **scripts_array, char **scripts_path_array, int num,int i =0 ; session =perf_session__new (&data, false,NULL ); -if (!session) -return -1 ; +if (IS_ERR (session)) +return PTR_ERR (session);snprintf (scripts_path,MAXPATHLEN ,"%s/scripts" ,get_argv_exec_path ());@@ -3749,8 +3750,8 @@ int cmd_script(int argc, const char **argv) } session =perf_session__new (&data, false, &script.tool); -if (session ==NULL ) -return -1 ; +if (IS_ERR (session)) +return PTR_ERR (session);if (header || header_only) { script.tool.show_feat_hdr =SHOW_FEAT_HEADER ;tools/perf/builtin-stat.c +6
-5@@ -81,6 +81,7 @@#include <unistd.h> #include <sys/time.h> #include <sys/resource.h> +#include <linux/err.h> #include <linux/ctype.h> #include <perf/evlist.h> @@ -1446,9 +1447,9 @@ static int __cmd_record(int argc, const char **argv) } session =perf_session__new (data, false,NULL ); -if (session ==NULL ) { -pr_err ("Perf session creation failed.\n" ); -return -1 ; +if (IS_ERR (session)) { +pr_err ("Perf session creation failed\n" ); +return PTR_ERR (session); }init_features (session);@@ -1645,8 +1646,8 @@ static int __cmd_report(int argc, const char **argv) perf_stat.data.mode =PERF_DATA_MODE_READ ; session =perf_session__new (&perf_stat.data, false, &perf_stat.tool); -if (session ==NULL ) -return -1 ; +if (IS_ERR (session)) +return PTR_ERR (session); perf_stat.session = session; stat_config.output = stderr;tools/perf/builtin-timechart.c +3
-2@@ -36,6 +36,7 @@#include "util/tool.h" #include "util/data.h" #include "util/debug.h" +#include <linux/err.h> #ifdef LACKS_OPEN_MEMSTREAM_PROTOTYPE FILE *open_memstream (char **ptr,size_t *sizeloc);@@ -1605,8 +1606,8 @@ static int __cmd_timechart(struct timechart *tchart, const char *output_name) &tchart->tool);int ret = -EINVAL ; -if (session ==NULL ) -return -1 ; +if (IS_ERR (session)) +return PTR_ERR (session);symbol__init (&session->header.env);tools/perf/builtin-top.c +3
-2@@ -74,6 +74,7 @@#include <linux/stringify.h> #include <linux/time64.h> #include <linux/types.h> +#include <linux/err.h> #include <linux/ctype.h> @@ -1675,8 +1676,8 @@ int cmd_top(int argc, const char **argv) } top.session =perf_session__new (NULL , false,NULL ); -if (top.session ==NULL ) { - status =-1 ; +if (IS_ERR (top.session)) { + status =PTR_ERR (top.session); goto out_delete_evlist; }tools/perf/builtin-trace.c +2
-2@@ -3578,8 +3578,8 @@ static int trace__replay(struct trace *trace) trace->multiple_threads = true; session =perf_session__new (&data, false, &trace->tool); -if (session ==NULL ) -return -1 ; +if (IS_ERR (session)) +return PTR_ERR (session);if (trace->opts.target.pid) symbol_conf.pid_list_str =strdup (trace->opts.target.pid);tools/perf/util/data-convert-bt.c +4
-1@@ -30,6 +30,7 @@#include "machine.h" #include "config.h" #include <linux/ctype.h> +#include <linux/err.h> #define pr_N (n, fmt, ...) \ eprintf(n, debug_data_convert, fmt, ##__VA_ARGS__)@@ -1619,8 +1620,10 @@ int bt_convert__perf2ctf(const char *input, const char *path, err =-1 ;/* perf.data session */ session =perf_session__new (&data,0 , &c.tool); -if (!session) +if (IS_ERR (session)) { + err =PTR_ERR (session); goto free_writer; + }if (c.queue_size) { ordered_events__set_alloc_size(&session->ordered_events,tools/perf/util/session.c +11
-4@@ -30,6 +30,7 @@#include "sample-raw.h" #include "stat.h" #include "arch/common.h" +#include <linux/err.h> #ifdef HAVE_ZSTD_SUPPORT static int perf_session__process_compressed_event(struct perf_session *session,@@ -183,6 +184,7 @@ static int ordered_events__deliver_event(struct ordered_events *oe,struct perf_session *perf_session__new (struct perf_data *data,bool repipe,struct perf_tool *tool) { +int ret = -ENOMEM ;struct perf_session *session =zalloc (sizeof (*session));if (!session)@@ -197,13 +199,15 @@ struct perf_session *perf_session__new(struct perf_data *data,perf_env__init (&session->header.env);if (data) { -if (perf_data__open (data)) + ret =perf_data__open (data); +if (ret <0 ) goto out_delete; session->data = data;if (perf_data__is_read (data)) { -if (perf_session__open (session) <0 ) + ret =perf_session__open (session); +if (ret <0 ) goto out_delete;/* @@ -218,8 +222,11 @@ struct perf_session *perf_session__new(struct perf_data *data,perf_evlist__init_trace_event_sample_raw (session->evlist);/* Open the directory data. */ -if (data->is_dir &&perf_data__open_dir (data)) +if (data->is_dir) { + ret =perf_data__open_dir (data); +if (ret) goto out_delete; + } } }else { session->machines.host.env = &perf_env;@@ -252,7 +259,7 @@ struct perf_session *perf_session__new(struct perf_data *data, out_delete:perf_session__delete (session); out: -return NULL ; +return ERR_PTR (ret); }static void perf_session__delete_threads (struct perf_session *session)
Quoted 26 lines · Jiri Olsa
Quoted 15 lines · Mamatha Inamdar
This Patch is to return error code of
perf_new_sessionfunction on failure instead of NULL
----------------------------------------------
Test Results:Before Fix:
$ perf c2c report -input failed to open nput: No such file or directory$ echo $? 0 ------------------------------------------ After Fix:Quoted 5 lines
$ ./perf c2c report -input failed to open nput: No such file or directory$ echo $? 254[root@krava perf]# ./perf c2c report -input
failed to open nput: No such file or directory
[root@krava perf]# echo $?
255
Quoted 6 lines
hum, not sure why I'm getting 255.. but it looks good now
Reviewed-by Jiri Olsa <[email protected]>thanks,
jirka
Thank you
Em Thu, Aug 22, 2019 at 12:07:18PM +0200, Jiri Olsa escreveu:
Quoted 22 lines · Mamatha Inamdar
Quoted 15 lines
This Patch is to return error code of
perf_new_sessionfunction on failure instead of NULL
----------------------------------------------
Test Results:Before Fix:
$ perf c2c report -input failed to open nput: No such file or directory$ echo $? 0 ------------------------------------------ After Fix:Quoted 5 lines
$ ./perf c2c report -input failed to open nput: No such file or directory$ echo $? 254
Quoted 8 lines
[root@krava perf]# ./perf c2c report -input
failed to open nput: No such file or directory
[root@krava perf]# echo $?
255hum, not sure why I'm getting 255.. but it looks good now
Reviewed-by Jiri Olsa <[email protected]>
You guys missed this one, that I've corrected in my tree, i.e. TEST_ASSERT_VAL expects that second arg to be NULL in case of failure, so we need to invert the result of IS_ERR(session) to keep the expectation.
- Arnaldo
tools/perf/tests/topology.c +3 -2
@@ -8,6 +8,7 @@#include "session.h" #include "evlist.h" #include "debug.h" +#include <linux/err.h> #define TEMPL "/tmp/perf-test-XXXXXX"#define DATA_SIZE 10
@@ -39,7 +40,7 @@ static int session_write_header(char *path) }; session =perf_session__new (&data, false,NULL ); -TEST_ASSERT_VAL ("can't get session" , session); +TEST_ASSERT_VAL ("can't get session" , !IS_ERR (session)); session->evlist =perf_evlist__new_default ();TEST_ASSERT_VAL ("can't get evlist" , session->evlist);
@@ -70,7 +71,7 @@ static int check_cpu_topology(char *path, struct perf_cpu_map *map)int i; session =perf_session__new (&data, false,NULL ); -TEST_ASSERT_VAL ("can't get session" , session); +TEST_ASSERT_VAL ("can't get session" , !IS_ERR (session));/* On platforms with large numbers of CPUs process_cpu_topology() * might issue an error while reading the perf.data file section
[tip: perf/urgent] perf session: Return error code for perf_session__new() function on failure
In reply to Mamatha InamdarThe following commit has been merged into the perf/urgent branch of tip:
The following commit has been merged into the perf/urgent branch of tip:
Commit-ID: 6ef81c55a2b6584cb642917f5fdf3632ef44b670 Gitweb: https://git.kernel.org/tip/6ef81c55a2b6584cb642917f5fdf3632ef44b670 Author: Mamatha Inamdar <[email protected]> AuthorDate: Thu, 22 Aug 2019 12:50:49 +05:30 Committer: Arnaldo Carvalho de Melo <[email protected]> CommitterDate: Fri, 20 Sep 2019 15:58:11 -03:00
perf session: Return error code for perf_session__new() function on failure
This patch is to return error code of perf_new_session function on failure instead of NULL.
Test Results:
Before Fix:
$ perf c2c report -input failed to open nput: No such file or directory
$ echo $? 0 $
After Fix:
$ perf c2c report -input failed to open nput: No such file or directory
$ echo $? 254 $
Committer notes:
Fix 'perf tests topology' case, where we use that TEST_ASSERT_VAL(..., session), i.e. we need to pass zero in case of failure, which was the case before when NULL was returned by perf_session__new() for failure, but now we need to negate the result of IS_ERR(session) to respect that TEST_ASSERT_VAL) expectation of zero meaning failure.
--- tools/perf/builtin-annotate.c | 5 +++-- tools/perf/builtin-buildid-cache.c | 5 +++-- tools/perf/builtin-buildid-list.c | 5 +++-- tools/perf/builtin-c2c.c | 6 ++++-- tools/perf/builtin-diff.c | 9 +++++---- tools/perf/builtin-evlist.c | 5 +++-- tools/perf/builtin-inject.c | 5 +++-- tools/perf/builtin-kmem.c | 5 +++-- tools/perf/builtin-kvm.c | 9 +++++---- tools/perf/builtin-lock.c | 5 +++-- tools/perf/builtin-mem.c | 5 +++-- tools/perf/builtin-record.c | 5 +++-- tools/perf/builtin-report.c | 4 ++-- tools/perf/builtin-sched.c | 11 ++++++----- tools/perf/builtin-script.c | 9 +++++---- tools/perf/builtin-stat.c | 11 ++++++----- tools/perf/builtin-timechart.c | 5 +++-- tools/perf/builtin-top.c | 5 +++-- tools/perf/builtin-trace.c | 4 ++-- tools/perf/tests/topology.c | 5 +++-- tools/perf/util/data-convert-bt.c | 5 ++++- tools/perf/util/session.c | 15 +++++++++++---- 22 files changed, 86 insertions(+), 57 deletions(-)
tools/perf/builtin-annotate.c +3 -2
@@ -40,6 +40,7 @@#include <dlfcn.h> #include <errno.h> #include <linux/bitmap.h> +#include <linux/err.h> struct perf_annotate {struct perf_tool tool;
@@ -584,8 +585,8 @@ int cmd_annotate(int argc, const char **argv) data.path = input_name; annotate.session =perf_session__new (&data, false, &annotate.tool); -if (annotate.session ==NULL ) -return -1 ; +if (IS_ERR (annotate.session)) +return PTR_ERR (annotate.session); annotate.has_br_stack =perf_header__has_feat (&annotate.session->header,HEADER_BRANCH_STACK );
tools/perf/builtin-buildid-cache.c +3 -2
@@ -28,6 +28,7 @@#include "util/util.h" #include "util/probe-file.h" #include <linux/string.h> +#include <linux/err.h> static int build_id_cache__kcore_buildid (const char *proc_dir,char *sbuildid) {
@@ -422,8 +423,8 @@ int cmd_buildid_cache(int argc, const char **argv) data.force = force; session =perf_session__new (&data, false,NULL ); -if (session ==NULL ) -return -1 ; +if (IS_ERR (session)) +return PTR_ERR (session); }if (symbol__init (session ? &session->header.env :NULL ) <0 )
tools/perf/builtin-buildid-list.c +3 -2
@@ -18,6 +18,7 @@#include "util/symbol.h" #include "util/data.h" #include <errno.h> +#include <linux/err.h> static int sysfs__fprintf_build_id (FILE *fp) {
@@ -65,8 +66,8 @@ static int perf_session__list_build_ids(bool force, bool with_hits) goto out; session =perf_session__new (&data, false, &build_id__mark_dso_hit_ops); -if (session ==NULL ) -return -1 ; +if (IS_ERR (session)) +return PTR_ERR (session);/* * We take all buildids when the file contains AUX area tracing data
tools/perf/builtin-c2c.c +4 -2
@@ -13,6 +13,7 @@#include <errno.h> #include <inttypes.h> #include <linux/compiler.h> +#include <linux/err.h> #include <linux/kernel.h> #include <linux/stringify.h> #include <linux/zalloc.h>
@@ -2781,8 +2782,9 @@ static int perf_c2c__report(int argc, const char **argv) } session =perf_session__new (&data,0 , &c2c.tool); -if (session ==NULL ) { -pr_debug ("No memory for session\n" ); +if (IS_ERR (session)) { + err =PTR_ERR (session); +pr_debug ("Error creating perf session\n" ); goto out; }
tools/perf/builtin-diff.c +5 -4
@@ -23,6 +23,7 @@#include "util/time-utils.h" #include "util/annotate.h" #include "util/map.h" +#include <linux/err.h> #include <linux/zalloc.h> #include <subcmd/pager.h> #include <subcmd/parse-options.h>
@@ -1153,9 +1154,9 @@ static int check_file_brstack(void)data__for_each_file (i, d) { d->session =perf_session__new (&d->data, false, &pdiff.tool); -if (!d->session) { +if (IS_ERR (d->session)) {pr_err ("Failed to open %s\n" , d->data.path); -return -1 ; +return PTR_ERR (d->session); } has_br_stack = perf_header__has_feat(&d->session->header,
@@ -1185,9 +1186,9 @@ static int __cmd_diff(void)data__for_each_file (i, d) { d->session =perf_session__new (&d->data, false, &pdiff.tool); -if (!d->session) { +if (IS_ERR (d->session)) { + ret =PTR_ERR (d->session);pr_err ("Failed to open %s\n" , d->data.path); - ret =-1 ; goto out_delete; }
tools/perf/builtin-evlist.c +3 -2
@@ -15,6 +15,7 @@#include "util/session.h" #include "util/data.h" #include "util/debug.h" +#include <linux/err.h> static int __cmd_evlist (const char *file_name,struct perf_attr_details *details) {
@@ -28,8 +29,8 @@ static int __cmd_evlist(const char *file_name, struct perf_attr_details *detailsbool has_tracepoint = false; session =perf_session__new (&data,0 ,NULL ); -if (session ==NULL ) -return -1 ; +if (IS_ERR (session)) +return PTR_ERR (session);evlist__for_each_entry (session->evlist, pos) {perf_evsel__fprintf (pos, details, stdout);
tools/perf/builtin-inject.c +3 -2
@@ -23,6 +23,7 @@#include "util/symbol.h" #include "util/synthetic-events.h" #include "util/thread.h" +#include <linux/err.h> #include <subcmd/parse-options.h>
@@ -835,8 +836,8 @@ int cmd_inject(int argc, const char **argv) data.path = inject.input_name; inject.session =perf_session__new (&data, true, &inject.tool); -if (inject.session ==NULL ) -return -1 ; +if (IS_ERR (inject.session)) +return PTR_ERR (inject.session);if (zstd_init (&(inject.session->zstd_data),0 ) <0 )pr_warning ("Decompression initialization failed.\n" );
tools/perf/builtin-kmem.c +3 -2
@@ -14,6 +14,7 @@#include "util/tool.h" #include "util/callchain.h" #include "util/time-utils.h" +#include <linux/err.h> #include <subcmd/pager.h> #include <subcmd/parse-options.h>
@@ -1956,8 +1957,8 @@ int cmd_kmem(int argc, const char **argv) data.path = input_name; kmem_session = session =perf_session__new (&data, false, &perf_kmem); -if (session ==NULL ) -return -1 ; +if (IS_ERR (session)) +return PTR_ERR (session); ret =-1 ;
tools/perf/builtin-kvm.c +5 -4
@@ -33,6 +33,7 @@#include <sys/stat.h> #include <fcntl.h> +#include <linux/err.h> #include <linux/kernel.h> #include <linux/string.h> #include <linux/time64.h>
@@ -1091,9 +1092,9 @@ static int read_events(struct perf_kvm_stat *kvm) kvm->tool = eops; kvm->session =perf_session__new (&file, false, &kvm->tool); -if (!kvm->session) { +if (IS_ERR (kvm->session)) {pr_err ("Initializing perf session failed\n" ); -return -1 ; +return PTR_ERR (kvm->session); }symbol__init (&kvm->session->header.env);
@@ -1446,8 +1447,8 @@ static int kvm_events_live(struct perf_kvm_stat *kvm,* perf session */ kvm->session =perf_session__new (&data, false, &kvm->tool); -if (kvm->session ==NULL ) { - err =-1 ; +if (IS_ERR (kvm->session)) { + err =PTR_ERR (kvm->session); goto out; } kvm->session->evlist = kvm->evlist;
tools/perf/builtin-lock.c +3 -2
@@ -30,6 +30,7 @@#include <linux/hash.h> #include <linux/kernel.h> #include <linux/zalloc.h> +#include <linux/err.h> static struct perf_session *session;
@@ -872,9 +873,9 @@ static int __cmd_report(bool display_info) }; session =perf_session__new (&data, false, &eops); -if (!session) { +if (IS_ERR (session)) {pr_err ("Initializing perf session failed\n" ); -return -1 ; +return PTR_ERR (session); }symbol__init (&session->header.env);
tools/perf/builtin-mem.c +3 -2
@@ -17,6 +17,7 @@#include "util/dso.h" #include "util/map.h" #include "util/symbol.h" +#include <linux/err.h> #define MEM_OPERATION_LOAD 0x1#define MEM_OPERATION_STORE 0x2
@@ -249,8 +250,8 @@ static int report_raw_events(struct perf_mem *mem)struct perf_session *session =perf_session__new (&data, false, &mem->tool); -if (session ==NULL ) -return -1 ; +if (IS_ERR (session)) +return PTR_ERR (session);if (mem->cpu_list) { ret = perf_session__cpu_bitmap(session, mem->cpu_list,
tools/perf/builtin-record.c +3 -2
@@ -54,6 +54,7 @@#include <signal.h> #include <sys/mman.h> #include <sys/wait.h> +#include <linux/err.h> #include <linux/string.h> #include <linux/time64.h> #include <linux/zalloc.h>
@@ -1354,9 +1355,9 @@ static int __cmd_record(struct record *rec, int argc, const char **argv) } session =perf_session__new (data, false, tool); -if (session ==NULL ) { +if (IS_ERR (session)) {pr_err ("Perf session creation failed.\n" ); -return -1 ; +return PTR_ERR (session); } fd =perf_data__fd (data);
tools/perf/builtin-report.c +2 -2
@@ -1269,8 +1269,8 @@ int cmd_report(int argc, const char **argv) repeat: session =perf_session__new (&data, false, &report.tool); -if (session ==NULL ) -return -1 ; +if (IS_ERR (session)) +return PTR_ERR (session); ret =evswitch__init (&report.evswitch, session->evlist, stderr);if (ret)
tools/perf/builtin-sched.c +6 -5
@@ -40,6 +40,7 @@#include <api/fs/fs.h> #include <perf/cpumap.h> #include <linux/time64.h> +#include <linux/err.h> #include <linux/ctype.h>
@@ -1797,9 +1798,9 @@ static int perf_sched__read_events(struct perf_sched *sched)int rc =-1 ; session =perf_session__new (&data, false, &sched->tool); -if (session ==NULL ) { -pr_debug ("No Memory for session\n" ); -return -1 ; +if (IS_ERR (session)) { +pr_debug ("Error creating perf session" ); +return PTR_ERR (session); }symbol__init (&session->header.env);
@@ -2989,8 +2990,8 @@ static int perf_sched__timehist(struct perf_sched *sched) symbol_conf.use_callchain = sched->show_callchain; session =perf_session__new (&data, false, &sched->tool); -if (session ==NULL ) -return -ENOMEM ; +if (IS_ERR (session)) +return PTR_ERR (session); evlist = session->evlist;
tools/perf/builtin-script.c +5 -4
@@ -52,6 +52,7 @@#include <unistd.h> #include <subcmd/pager.h> #include <perf/evlist.h> +#include <linux/err.h> #include "util/record.h" #include "util/util.h" #include "perf.h"
@@ -3083,8 +3084,8 @@ int find_scripts(char **scripts_array, char **scripts_path_array, int num,int i =0 ; session =perf_session__new (&data, false,NULL ); -if (!session) -return -1 ; +if (IS_ERR (session)) +return PTR_ERR (session);snprintf (scripts_path,MAXPATHLEN ,"%s/scripts" ,get_argv_exec_path ());
@@ -3754,8 +3755,8 @@ int cmd_script(int argc, const char **argv) } session =perf_session__new (&data, false, &script.tool); -if (session ==NULL ) -return -1 ; +if (IS_ERR (session)) +return PTR_ERR (session);if (header || header_only) { script.tool.show_feat_hdr =SHOW_FEAT_HEADER ;
tools/perf/builtin-stat.c +6 -5
@@ -83,6 +83,7 @@#include <unistd.h> #include <sys/time.h> #include <sys/resource.h> +#include <linux/err.h> #include <linux/ctype.h> #include <perf/evlist.h>
@@ -1436,9 +1437,9 @@ static int __cmd_record(int argc, const char **argv) } session =perf_session__new (data, false,NULL ); -if (session ==NULL ) { -pr_err ("Perf session creation failed.\n" ); -return -1 ; +if (IS_ERR (session)) { +pr_err ("Perf session creation failed\n" ); +return PTR_ERR (session); }init_features (session);
@@ -1635,8 +1636,8 @@ static int __cmd_report(int argc, const char **argv) perf_stat.data.mode =PERF_DATA_MODE_READ ; session =perf_session__new (&perf_stat.data, false, &perf_stat.tool); -if (session ==NULL ) -return -1 ; +if (IS_ERR (session)) +return PTR_ERR (session); perf_stat.session = session; stat_config.output = stderr;
tools/perf/builtin-timechart.c +3 -2
@@ -35,6 +35,7 @@#include "util/tool.h" #include "util/data.h" #include "util/debug.h" +#include <linux/err.h> #ifdef LACKS_OPEN_MEMSTREAM_PROTOTYPE FILE *open_memstream (char **ptr,size_t *sizeloc);
@@ -1601,8 +1602,8 @@ static int __cmd_timechart(struct timechart *tchart, const char *output_name) &tchart->tool);int ret = -EINVAL ; -if (session ==NULL ) -return -1 ; +if (IS_ERR (session)) +return PTR_ERR (session);symbol__init (&session->header.env);
tools/perf/builtin-top.c +3 -2
@@ -77,6 +77,7 @@#include <linux/stringify.h> #include <linux/time64.h> #include <linux/types.h> +#include <linux/err.h> #include <linux/ctype.h>
@@ -1672,8 +1673,8 @@ int cmd_top(int argc, const char **argv) } top.session =perf_session__new (NULL , false,NULL ); -if (top.session ==NULL ) { - status =-1 ; +if (IS_ERR (top.session)) { + status =PTR_ERR (top.session); goto out_delete_evlist; }
tools/perf/builtin-trace.c +2 -2
@@ -3585,8 +3585,8 @@ static int trace__replay(struct trace *trace) trace->multiple_threads = true; session =perf_session__new (&data, false, &trace->tool); -if (session ==NULL ) -return -1 ; +if (IS_ERR (session)) +return PTR_ERR (session);if (trace->opts.target.pid) symbol_conf.pid_list_str =strdup (trace->opts.target.pid);
tools/perf/tests/topology.c +3 -2
@@ -8,6 +8,7 @@#include "session.h" #include "evlist.h" #include "debug.h" +#include <linux/err.h> #define TEMPL "/tmp/perf-test-XXXXXX"#define DATA_SIZE 10
@@ -39,7 +40,7 @@ static int session_write_header(char *path) }; session =perf_session__new (&data, false,NULL ); -TEST_ASSERT_VAL ("can't get session" , session); +TEST_ASSERT_VAL ("can't get session" , !IS_ERR (session)); session->evlist =perf_evlist__new_default ();TEST_ASSERT_VAL ("can't get evlist" , session->evlist);
@@ -70,7 +71,7 @@ static int check_cpu_topology(char *path, struct perf_cpu_map *map)int i; session =perf_session__new (&data, false,NULL ); -TEST_ASSERT_VAL ("can't get session" , session); +TEST_ASSERT_VAL ("can't get session" , !IS_ERR (session));/* On platforms with large numbers of CPUs process_cpu_topology() * might issue an error while reading the perf.data file section
tools/perf/util/data-convert-bt.c +4 -1
@@ -30,6 +30,7 @@#include "machine.h" #include "config.h" #include <linux/ctype.h> +#include <linux/err.h> #define pr_N (n, fmt, ...) \ eprintf(n, debug_data_convert, fmt, ##__VA_ARGS__)
@@ -1619,8 +1620,10 @@ int bt_convert__perf2ctf(const char *input, const char *path, err =-1 ;/* perf.data session */ session =perf_session__new (&data,0 , &c.tool); -if (!session) +if (IS_ERR (session)) { + err =PTR_ERR (session); goto free_writer; + }if (c.queue_size) { ordered_events__set_alloc_size(&session->ordered_events,
tools/perf/util/session.c +11 -4
@@ -34,6 +34,7 @@#include "../perf.h" #include "arch/common.h" #include <internal/lib.h> +#include <linux/err.h> #ifdef HAVE_ZSTD_SUPPORT static int perf_session__process_compressed_event(struct perf_session *session,
@@ -187,6 +188,7 @@ static int ordered_events__deliver_event(struct ordered_events *oe,struct perf_session *perf_session__new (struct perf_data *data,bool repipe,struct perf_tool *tool) { +int ret = -ENOMEM ;struct perf_session *session =zalloc (sizeof (*session));if (!session)
@@ -201,13 +203,15 @@ struct perf_session *perf_session__new(struct perf_data *data,perf_env__init (&session->header.env);if (data) { -if (perf_data__open (data)) + ret =perf_data__open (data); +if (ret <0 ) goto out_delete; session->data = data;if (perf_data__is_read (data)) { -if (perf_session__open (session) <0 ) + ret =perf_session__open (session); +if (ret <0 ) goto out_delete;/*
@@ -222,8 +226,11 @@ struct perf_session *perf_session__new(struct perf_data *data,perf_evlist__init_trace_event_sample_raw (session->evlist);/* Open the directory data. */ -if (data->is_dir &&perf_data__open_dir (data)) +if (data->is_dir) { + ret =perf_data__open_dir (data); +if (ret) goto out_delete; + } } }else { session->machines.host.env = &perf_env;
@@ -256,7 +263,7 @@ struct perf_session *perf_session__new(struct perf_data *data, out_delete:perf_session__delete (session); out: -return NULL ; +return ERR_PTR (ret); }static void perf_session__delete_threads (struct perf_session *session)