From 48aaff1bcde75b09429d780be4b57d25be4cab9a Mon Sep 17 00:00:00 2001 From: Greg Kroah-Hartman Date: Wed, 30 May 2018 11:41:46 +0200 Subject: [PATCH] Revert "perf record: Fix crash in pipe mode" This reverts commit f766148e47d7d3b8a7128cae511971c0f793e38e which is commit ad46e48c65fa1f204fa29eaff1b91174d314a94b upstream. It breaks the build. Turns out we don't test perf on stable releases, we need to fix that :( Reported-by: Pavlos Parissis Cc: Jiri Olsa Cc: Alexander Shishkin Cc: David Ahern Cc: Namhyung Kim Cc: Peter Zijlstra Cc: Arnaldo Carvalho de Melo Cc: Sasha Levin Signed-off-by: Greg Kroah-Hartman --- tools/perf/builtin-record.c | 9 --------- tools/perf/perf.h | 1 - tools/perf/util/record.c | 8 ++------ 3 files changed, 2 insertions(+), 16 deletions(-) diff --git a/tools/perf/builtin-record.c b/tools/perf/builtin-record.c index 3b570e8..b205c13 100644 --- a/tools/perf/builtin-record.c +++ b/tools/perf/builtin-record.c @@ -926,15 +926,6 @@ static int __cmd_record(struct record *rec, int argc, const char **argv) } } - /* - * If we have just single event and are sending data - * through pipe, we need to force the ids allocation, - * because we synthesize event name through the pipe - * and need the id for that. - */ - if (data->is_pipe && rec->evlist->nr_entries == 1) - rec->opts.sample_id = true; - if (record__open(rec) != 0) { err = -1; goto out_child; diff --git a/tools/perf/perf.h b/tools/perf/perf.h index de1debc..5508638 100644 --- a/tools/perf/perf.h +++ b/tools/perf/perf.h @@ -61,7 +61,6 @@ struct record_opts { bool tail_synthesize; bool overwrite; bool ignore_missing_thread; - bool sample_id; unsigned int freq; unsigned int mmap_pages; unsigned int auxtrace_mmap_pages; diff --git a/tools/perf/util/record.c b/tools/perf/util/record.c index 6f09e49..1e97937 100644 --- a/tools/perf/util/record.c +++ b/tools/perf/util/record.c @@ -137,7 +137,6 @@ void perf_evlist__config(struct perf_evlist *evlist, struct record_opts *opts, struct perf_evsel *evsel; bool use_sample_identifier = false; bool use_comm_exec; - bool sample_id = opts->sample_id; /* * Set the evsel leader links before we configure attributes, @@ -164,7 +163,8 @@ void perf_evlist__config(struct perf_evlist *evlist, struct record_opts *opts, * match the id. */ use_sample_identifier = perf_can_sample_identifier(); - sample_id = true; + evlist__for_each_entry(evlist, evsel) + perf_evsel__set_sample_id(evsel, use_sample_identifier); } else if (evlist->nr_entries > 1) { struct perf_evsel *first = perf_evlist__first(evlist); @@ -174,10 +174,6 @@ void perf_evlist__config(struct perf_evlist *evlist, struct record_opts *opts, use_sample_identifier = perf_can_sample_identifier(); break; } - sample_id = true; - } - - if (sample_id) { evlist__for_each_entry(evlist, evsel) perf_evsel__set_sample_id(evsel, use_sample_identifier); } -- 2.7.4