lkml.org 
[lkml]   [2022]   [Jan]   [26]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    Date
    Subject[PATCH v5 10/13] perf evsel: Make evsel__env always return a valid env
    From
    From: Kim Phillips <kim.phillips@amd.com>

    It's possible to have an evsel and evsel->evlist populated without
    an evsel->evlist->env, when, e.g., cmd_record is in its error path.

    Future patches will add support for evsel__open_strerror to be able
    to customize error messaging based on perf_env__{arch,cpuid}, so
    let's have evsel__env return &perf_env instead of NULL in that case.

    Signed-off-by: Kim Phillips <kim.phillips@amd.com>
    Cc: Arnaldo Carvalho de Melo <acme@redhat.com>
    Cc: Alexander Shishkin <alexander.shishkin@linux.intel.com>
    Cc: Boris Ostrovsky <boris.ostrovsky@oracle.com>
    Cc: Ian Rogers <irogers@google.com>
    Cc: Ingo Molnar <mingo@redhat.com>
    Cc: Jiri Olsa <jolsa@redhat.com>
    Cc: Joao Martins <joao.m.martins@oracle.com>
    Cc: Konrad Rzeszutek Wilk <konrad.wilk@oracle.com>
    Cc: Mark Rutland <mark.rutland@arm.com>
    Cc: Michael Petlan <mpetlan@redhat.com>
    Cc: Namhyung Kim <namhyung@kernel.org>
    Cc: Peter Zijlstra <peterz@infradead.org>
    Cc: Robert Richter <robert.richter@amd.com>
    Cc: Stephane Eranian <eranian@google.com>
    ---
    tools/perf/util/evsel.c | 2 +-
    1 file changed, 1 insertion(+), 1 deletion(-)

    diff --git a/tools/perf/util/evsel.c b/tools/perf/util/evsel.c
    index 22d3267ce294..14b0e7ffa2c7 100644
    --- a/tools/perf/util/evsel.c
    +++ b/tools/perf/util/evsel.c
    @@ -2965,7 +2965,7 @@ int evsel__open_strerror(struct evsel *evsel, struct target *target,

    struct perf_env *evsel__env(struct evsel *evsel)
    {
    - if (evsel && evsel->evlist)
    + if (evsel && evsel->evlist && evsel->evlist->env)
    return evsel->evlist->env;
    return &perf_env;
    }
    --
    2.35.0.rc0.227.g00780c9af4-goog
    \
     
     \ /
      Last update: 2022-01-27 00:36    [W:9.262 / U:0.076 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site