xiaomi-sm8450/android_kernel_xiaomi_sm8450
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

perf script: Fixup 'struct evsel_script' method prefix

Browse Source 
[ Upstream commit 297e69bfa4c7aa27259dd456af1377e868337043 ]

They all operate on 'struct evsel_script' instances, so should be
prefixed with evsel_script__, not with perf_evsel_script__.

Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
Stable-dep-of: 36d3e4138e1b ("perf script: Fix allocation of evsel->priv related to per-event dump files")
Signed-off-by: Sasha Levin <sashal@kernel.org>
This commit is contained in:
Arnaldo Carvalho de Melo
2021-03-09 08:59:21 -03:00
committed by Greg Kroah-Hartman
parent 958acb479e
commit 647c6d35cc
1 changed files with 8 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
tools/perf/builtin-script.c
View File

@@ -295,8 +295,7 @@ static inline struct evsel_script *evsel_script(struct evsel *evsel)
return (struct evsel_script *)evsel->priv; return (struct evsel_script *)evsel->priv;
} }
static struct evsel_script *perf_evsel_script__new(struct evsel *evsel, static struct evsel_script *evsel_script__new(struct evsel *evsel, struct perf_data *data)
struct perf_data *data)
{ {
struct evsel_script *es = zalloc(sizeof(*es)); struct evsel_script *es = zalloc(sizeof(*es));
@@ -316,7 +315,7 @@ out_free:
return NULL; return NULL;
} }
static void perf_evsel_script__delete(struct evsel_script *es) static void evsel_script__delete(struct evsel_script *es)
{ {
zfree(&es->filename); zfree(&es->filename);
fclose(es->fp); fclose(es->fp);
@@ -324,7 +323,7 @@ static void perf_evsel_script__delete(struct evsel_script *es)
free(es); free(es);
} }
static int perf_evsel_script__fprintf(struct evsel_script *es, FILE *fp) static int evsel_script__fprintf(struct evsel_script *es, FILE *fp)
{ {
struct stat st; struct stat st;
@@ -2166,8 +2165,7 @@ static int process_attr(struct perf_tool *tool, union perf_event *event,
if (!evsel->priv) { if (!evsel->priv) {
if (scr->per_event_dump) { if (scr->per_event_dump) {
evsel->priv = perf_evsel_script__new(evsel, evsel->priv = evsel_script__new(evsel, scr->session->data);
scr->session->data);
} else { } else {
es = zalloc(sizeof(*es)); es = zalloc(sizeof(*es));
if (!es) if (!es)
@@ -2422,7 +2420,7 @@ static void perf_script__fclose_per_event_dump(struct perf_script *script)
evlist__for_each_entry(evlist, evsel) { evlist__for_each_entry(evlist, evsel) {
if (!evsel->priv) if (!evsel->priv)
break; break;
perf_evsel_script__delete(evsel->priv); evsel_script__delete(evsel->priv);
evsel->priv = NULL; evsel->priv = NULL;
} }
} }
@@ -2442,7 +2440,7 @@ static int perf_script__fopen_per_event_dump(struct perf_script *script)
if (evsel->priv != NULL) if (evsel->priv != NULL)
continue; continue;
evsel->priv = perf_evsel_script__new(evsel, script->session->data); evsel->priv = evsel_script__new(evsel, script->session->data);
if (evsel->priv == NULL) if (evsel->priv == NULL)
goto out_err_fclose; goto out_err_fclose;
} }
@@ -2477,8 +2475,8 @@ static void perf_script__exit_per_event_dump_stats(struct perf_script *script)
evlist__for_each_entry(script->session->evlist, evsel) { evlist__for_each_entry(script->session->evlist, evsel) {
struct evsel_script *es = evsel->priv; struct evsel_script *es = evsel->priv;
perf_evsel_script__fprintf(es, stdout); evsel_script__fprintf(es, stdout);
perf_evsel_script__delete(es); evsel_script__delete(es);
evsel->priv = NULL; evsel->priv = NULL;
} }
} }