lkml.org 
[lkml]   [2023]   [Aug]   [23]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    Date
    Subject[PATCH v1 06/25] perf pmu: Avoid passing format list to perf_pmu__format_type
    From
    Pass the pmu so the format list can be better abstracted and later
    lazily loaded.

    Signed-off-by: Ian Rogers <irogers@google.com>
    ---
    tools/perf/util/parse-events.c | 2 +-
    tools/perf/util/pmu.c | 4 ++--
    tools/perf/util/pmu.h | 2 +-
    3 files changed, 4 insertions(+), 4 deletions(-)

    diff --git a/tools/perf/util/parse-events.c b/tools/perf/util/parse-events.c
    index 00a8ec94f5b2..8ede27089766 100644
    --- a/tools/perf/util/parse-events.c
    +++ b/tools/perf/util/parse-events.c
    @@ -1159,7 +1159,7 @@ static int get_config_chgs(struct perf_pmu *pmu, struct list_head *head_config,
    list_for_each_entry(term, head_config, list) {
    switch (term->type_term) {
    case PARSE_EVENTS__TERM_TYPE_USER:
    - type = perf_pmu__format_type(&pmu->format, term->config);
    + type = perf_pmu__format_type(pmu, term->config);
    if (type != PERF_PMU_FORMAT_VALUE_CONFIG)
    continue;
    bits |= perf_pmu__format_bits(&pmu->format, term->config);
    diff --git a/tools/perf/util/pmu.c b/tools/perf/util/pmu.c
    index 89573a8eaf0b..96189afe54b0 100644
    --- a/tools/perf/util/pmu.c
    +++ b/tools/perf/util/pmu.c
    @@ -1038,9 +1038,9 @@ __u64 perf_pmu__format_bits(struct list_head *formats, const char *name)
    return bits;
    }

    -int perf_pmu__format_type(struct list_head *formats, const char *name)
    +int perf_pmu__format_type(struct perf_pmu *pmu, const char *name)
    {
    - struct perf_pmu_format *format = pmu_find_format(formats, name);
    + struct perf_pmu_format *format = pmu_find_format(&pmu->format, name);

    if (!format)
    return -1;
    diff --git a/tools/perf/util/pmu.h b/tools/perf/util/pmu.h
    index eb26c8bc079f..1ea78d2fa531 100644
    --- a/tools/perf/util/pmu.h
    +++ b/tools/perf/util/pmu.h
    @@ -222,7 +222,7 @@ int perf_pmu__config_terms(struct perf_pmu *pmu,
    struct list_head *head_terms,
    bool zero, struct parse_events_error *error);
    __u64 perf_pmu__format_bits(struct list_head *formats, const char *name);
    -int perf_pmu__format_type(struct list_head *formats, const char *name);
    +int perf_pmu__format_type(struct perf_pmu *pmu, const char *name);
    int perf_pmu__check_alias(struct perf_pmu *pmu, struct list_head *head_terms,
    struct perf_pmu_info *info);
    struct list_head *perf_pmu__alias(struct perf_pmu *pmu,
    --
    2.42.0.rc1.204.g551eb34607-goog
    \
     
     \ /
      Last update: 2023-08-23 10:17    [W:3.197 / U:0.248 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site