lisa/android_kernel_xiaomi_sm8350
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

perf record: Move sb_evlist to 'struct record'

Browse Source 
[ Upstream commit bc477d7983e345262757568ec27be0395dc2fe73 ]

Where state related to a 'perf record' session is grouped.

Acked-by: Jiri Olsa <jolsa@redhat.com>
Cc: Adrian Hunter <adrian.hunter@intel.com>
Cc: Namhyung Kim <namhyung@kernel.org>
Cc: Song Liu <songliubraving@fb.com>
Link: http://lore.kernel.org/lkml/20200429131106.27974-2-acme@kernel.org
Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
Stable-dep-of: 9c51f8788b5d ("perf env: Avoid recursively taking env->bpf_progs.lock")
Signed-off-by: Sasha Levin <sashal@kernel.org>
This commit is contained in:
Arnaldo Carvalho de Melo 2020-04-24 10:24:04 -03:00 committed by Greg Kroah-Hartman
parent 14a9769a76
commit 2d59b6ed99
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
tools/perf/builtin-record.c
View File

@ -80,6 +80,7 @@ struct record {
struct auxtrace_record *itr; struct auxtrace_record *itr;
struct evlist *evlist; struct evlist *evlist;
struct perf_session *session; struct perf_session *session;
struct evlist *sb_evlist;
int realtime_prio; int realtime_prio;
bool no_buildid; bool no_buildid;
bool no_buildid_set; bool no_buildid_set;
@ -1343,7 +1344,6 @@ static int __cmd_record(struct record *rec, int argc, const char **argv)
struct perf_data *data = &rec->data; struct perf_data *data = &rec->data;
struct perf_session *session; struct perf_session *session;
bool disabled = false, draining = false; bool disabled = false, draining = false;
struct evlist *sb_evlist = NULL;
int fd; int fd;
float ratio = 0; float ratio = 0;
@ -1455,9 +1455,9 @@ static int __cmd_record(struct record *rec, int argc, const char **argv)
} }
if (!opts->no_bpf_event) if (!opts->no_bpf_event)
bpf_event__add_sb_event(&sb_evlist, &session->header.env); bpf_event__add_sb_event(&rec->sb_evlist, &session->header.env);
if (perf_evlist__start_sb_thread(sb_evlist, &rec->opts.target)) { if (perf_evlist__start_sb_thread(rec->sb_evlist, &rec->opts.target)) {
pr_debug("Couldn't start the BPF side band thread:\nBPF programs starting from now on won't be annotatable\n"); pr_debug("Couldn't start the BPF side band thread:\nBPF programs starting from now on won't be annotatable\n");
opts->no_bpf_event = true; opts->no_bpf_event = true;
} }
@ -1731,7 +1731,7 @@ out_delete_session:
perf_session__delete(session); perf_session__delete(session);
if (!opts->no_bpf_event) if (!opts->no_bpf_event)
perf_evlist__stop_sb_thread(sb_evlist); perf_evlist__stop_sb_thread(rec->sb_evlist);
return status; return status;
} }