lkml.org 
[lkml]   [2022]   [Jun]   [14]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    Date
    Subject[PATCH v2 2/6] perf cpumap: Synthetic events and const/static
    From
    Make the cpumap arguments const to make it clearer they are in rather
    than out arguments. Make two functions static and remove external
    declarations.

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

    diff --git a/tools/perf/util/event.h b/tools/perf/util/event.h
    index cdd72e05fd28..2a69e639f6b3 100644
    --- a/tools/perf/util/event.h
    +++ b/tools/perf/util/event.h
    @@ -461,10 +461,6 @@ size_t perf_event__fprintf(union perf_event *event, struct machine *machine, FIL
    int kallsyms__get_function_start(const char *kallsyms_filename,
    const char *symbol_name, u64 *addr);

    -void *cpu_map_data__alloc(struct perf_cpu_map *map, size_t *size, u16 *type, int *max);
    -void cpu_map_data__synthesize(struct perf_record_cpu_map_data *data, struct perf_cpu_map *map,
    - u16 type, int max);
    -
    void event_attr_init(struct perf_event_attr *attr);

    int perf_event_paranoid(void);
    diff --git a/tools/perf/util/synthetic-events.c b/tools/perf/util/synthetic-events.c
    index 27acdc5e5723..b8a42a096502 100644
    --- a/tools/perf/util/synthetic-events.c
    +++ b/tools/perf/util/synthetic-events.c
    @@ -1184,7 +1184,7 @@ int perf_event__synthesize_thread_map2(struct perf_tool *tool,
    }

    static void synthesize_cpus(struct cpu_map_entries *cpus,
    - struct perf_cpu_map *map)
    + const struct perf_cpu_map *map)
    {
    int i, map_nr = perf_cpu_map__nr(map);

    @@ -1195,7 +1195,7 @@ static void synthesize_cpus(struct cpu_map_entries *cpus,
    }

    static void synthesize_mask(struct perf_record_record_cpu_map *mask,
    - struct perf_cpu_map *map, int max)
    + const struct perf_cpu_map *map, int max)
    {
    int i;

    @@ -1206,12 +1206,12 @@ static void synthesize_mask(struct perf_record_record_cpu_map *mask,
    set_bit(perf_cpu_map__cpu(map, i).cpu, mask->mask);
    }

    -static size_t cpus_size(struct perf_cpu_map *map)
    +static size_t cpus_size(const struct perf_cpu_map *map)
    {
    return sizeof(struct cpu_map_entries) + perf_cpu_map__nr(map) * sizeof(u16);
    }

    -static size_t mask_size(struct perf_cpu_map *map, int *max)
    +static size_t mask_size(const struct perf_cpu_map *map, int *max)
    {
    int i;

    @@ -1228,7 +1228,8 @@ static size_t mask_size(struct perf_cpu_map *map, int *max)
    return sizeof(struct perf_record_record_cpu_map) + BITS_TO_LONGS(*max) * sizeof(long);
    }

    -void *cpu_map_data__alloc(struct perf_cpu_map *map, size_t *size, u16 *type, int *max)
    +static void *cpu_map_data__alloc(const struct perf_cpu_map *map, size_t *size,
    + u16 *type, int *max)
    {
    size_t size_cpus, size_mask;
    bool is_dummy = perf_cpu_map__empty(map);
    @@ -1262,8 +1263,9 @@ void *cpu_map_data__alloc(struct perf_cpu_map *map, size_t *size, u16 *type, int
    return zalloc(*size);
    }

    -void cpu_map_data__synthesize(struct perf_record_cpu_map_data *data, struct perf_cpu_map *map,
    - u16 type, int max)
    +static void cpu_map_data__synthesize(struct perf_record_cpu_map_data *data,
    + const struct perf_cpu_map *map,
    + u16 type, int max)
    {
    data->type = type;

    @@ -1278,7 +1280,7 @@ void cpu_map_data__synthesize(struct perf_record_cpu_map_data *data, struct perf
    }
    }

    -static struct perf_record_cpu_map *cpu_map_event__new(struct perf_cpu_map *map)
    +static struct perf_record_cpu_map *cpu_map_event__new(const struct perf_cpu_map *map)
    {
    size_t size = sizeof(struct perf_record_cpu_map);
    struct perf_record_cpu_map *event;
    @@ -1298,7 +1300,7 @@ static struct perf_record_cpu_map *cpu_map_event__new(struct perf_cpu_map *map)
    }

    int perf_event__synthesize_cpu_map(struct perf_tool *tool,
    - struct perf_cpu_map *map,
    + const struct perf_cpu_map *map,
    perf_event__handler_t process,
    struct machine *machine)
    {
    diff --git a/tools/perf/util/synthetic-events.h b/tools/perf/util/synthetic-events.h
    index 78a0450db164..44839190234a 100644
    --- a/tools/perf/util/synthetic-events.h
    +++ b/tools/perf/util/synthetic-events.h
    @@ -46,7 +46,7 @@ typedef int (*perf_event__handler_t)(struct perf_tool *tool, union perf_event *e
    int perf_event__synthesize_attrs(struct perf_tool *tool, struct evlist *evlist, perf_event__handler_t process);
    int perf_event__synthesize_attr(struct perf_tool *tool, struct perf_event_attr *attr, u32 ids, u64 *id, perf_event__handler_t process);
    int perf_event__synthesize_build_id(struct perf_tool *tool, struct dso *pos, u16 misc, perf_event__handler_t process, struct machine *machine);
    -int perf_event__synthesize_cpu_map(struct perf_tool *tool, struct perf_cpu_map *cpus, perf_event__handler_t process, struct machine *machine);
    +int perf_event__synthesize_cpu_map(struct perf_tool *tool, const struct perf_cpu_map *cpus, perf_event__handler_t process, struct machine *machine);
    int perf_event__synthesize_event_update_cpus(struct perf_tool *tool, struct evsel *evsel, perf_event__handler_t process);
    int perf_event__synthesize_event_update_name(struct perf_tool *tool, struct evsel *evsel, perf_event__handler_t process);
    int perf_event__synthesize_event_update_scale(struct perf_tool *tool, struct evsel *evsel, perf_event__handler_t process);
    --
    2.36.1.476.g0c4daa206d-goog
    \
     
     \ /
      Last update: 2022-06-14 16:36    [W:7.152 / U:0.020 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site