Messages in this thread Patch in this message |  | | From | Arnaldo Carvalho de Melo <> | Subject | [PATCH 13/13] Revert "perf evlist: Add backpointer for perf_env to evlist" | Date | Wed, 9 Sep 2015 16:50:25 -0300 |
| |
From: Arnaldo Carvalho de Melo <acme@redhat.com>
This reverts commit 2c07144dfce366e21465cc7b0ada9f0b6dc7b7ed.
We don't need it, machine->env provides what is needed.
Cc: Adrian Hunter <adrian.hunter@intel.com> Cc: Borislav Petkov <bp@suse.de> Cc: David Ahern <dsahern@gmail.com> Cc: Frederic Weisbecker <fweisbec@gmail.com> Cc: Jiri Olsa <jolsa@kernel.org> Cc: Kan Liang <kan.liang@intel.com> Cc: Namhyung Kim <namhyung@kernel.org> Cc: Stephane Eranian <eranian@google.com> Cc: Wang Nan <wangnan0@huawei.com> Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com> --- tools/perf/util/evlist.h | 1 - tools/perf/util/header.c | 2 +- 2 files changed, 1 insertion(+), 2 deletions(-)
diff --git a/tools/perf/util/evlist.h b/tools/perf/util/evlist.h index b39a6198f4ac..436e358300b1 100644 --- a/tools/perf/util/evlist.h +++ b/tools/perf/util/evlist.h @@ -56,7 +56,6 @@ struct perf_evlist { struct cpu_map *cpus; struct perf_evsel *selected; struct events_stats stats; - struct perf_env *env; }; struct perf_evsel_str_handler { diff --git a/tools/perf/util/header.c b/tools/perf/util/header.c index 085bbc35c186..64adbff36e04 100644 --- a/tools/perf/util/header.c +++ b/tools/perf/util/header.c @@ -2558,8 +2558,8 @@ int perf_session__read_header(struct perf_session *session) if (session->evlist == NULL) return -ENOMEM; - session->evlist->env = &header->env; session->machines.host.env = &header->env; + if (perf_data_file__is_pipe(file)) return perf_header__read_pipe(session); -- 2.1.0
|  |