perf evsel: Fall back to global 'perf_env' in perf_evsel__env()
The following commit has been merged into the perf/urgent branch of tip:
Commit-ID: 9db0e3635fb35b6695275774ab909c51221b66ad Gitweb: https://git.kernel.org/tip/9db0e3635fb35b6695275774ab909c51221b66ad Author: Arnaldo Carvalho de Melo <[email protected]> AuthorDate: Mon, 30 Sep 2019 11:48:32 -03:00 Committer: Arnaldo Carvalho de Melo <[email protected]> CommitterDate: Mon, 30 Sep 2019 17:29:57 -03:00
perf evsel: Fall back to global 'perf_env' in perf_evsel__env()
I.e. if evsel->evlist or evsel->evlist->env isn't set, return the environment for the running machine, as that would be set if reading from a perf.data file.
Cc Adrian Hunter <[email protected]>
Cc Jiri Olsa <[email protected]>
Cc Namhyung Kim <[email protected]>
Signed-off-by Arnaldo Carvalho de Melo <[email protected]>
--- tools/perf/util/evsel.c | 3 ++- tools/perf/util/python.c | 6 ++++++ 2 files changed, 8 insertions(+), 1 deletion(-)
tools/perf/util/evsel.c +2 -1
@@ -30,6 +30,7 @@#include "counts.h" #include "event.h" #include "evsel.h" +#include "util/env.h" #include "util/evsel_config.h" #include "util/evsel_fprintf.h" #include "evlist.h"
@@ -2512,7 +2513,7 @@ struct perf_env *perf_evsel__env(struct evsel *evsel) {if (evsel && evsel->evlist)return evsel->evlist->env; -return NULL ; +return &perf_env; }static int store_evsel_ids (struct evsel *evsel,struct evlist *evlist)
tools/perf/util/python.c +6 -0
@@ -14,6 +14,7 @@#include "thread_map.h" #include "trace-event.h" #include "mmap.h" +#include "util/env.h" #include <internal/lib.h> #include "../perf-sys.h"
@@ -54,6 +55,11 @@ int parse_callchain_record(const char *arg __maybe_unused, }/* +* Add this one here not to drag util/env.c +*/ +struct perf_env perf_env; + +/* * Support debug printing even though util/debug.c is not linked. That means * implementing 'verbose' and 'eprintf'. */