lkml.org 
[lkml]   [2023]   [Nov]   [29]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    Date
    Subject[PATCH v1 01/14] libperf cpumap: Rename perf_cpu_map__dummy_new
    From
    Rename perf_cpu_map__dummy_new to perf_cpu_map__new_any_cpu to better
    indicate this is creating a CPU map for the perf_event_open "any" CPU
    case.

    Signed-off-by: Ian Rogers <irogers@google.com>
    ---
    tools/lib/perf/Documentation/libperf.txt | 2 +-
    tools/lib/perf/cpumap.c | 4 ++--
    tools/lib/perf/evsel.c | 2 +-
    tools/lib/perf/include/perf/cpumap.h | 4 ++--
    tools/lib/perf/libperf.map | 2 +-
    tools/lib/perf/tests/test-cpumap.c | 2 +-
    tools/lib/perf/tests/test-evlist.c | 2 +-
    tools/perf/tests/cpumap.c | 2 +-
    tools/perf/tests/sw-clock.c | 2 +-
    tools/perf/tests/task-exit.c | 2 +-
    tools/perf/util/evlist.c | 2 +-
    tools/perf/util/evsel.c | 2 +-
    12 files changed, 14 insertions(+), 14 deletions(-)

    diff --git a/tools/lib/perf/Documentation/libperf.txt b/tools/lib/perf/Documentation/libperf.txt
    index a8f1a237931b..a256a26598b0 100644
    --- a/tools/lib/perf/Documentation/libperf.txt
    +++ b/tools/lib/perf/Documentation/libperf.txt
    @@ -37,7 +37,7 @@ SYNOPSIS

    struct perf_cpu_map;

    - struct perf_cpu_map *perf_cpu_map__dummy_new(void);
    + struct perf_cpu_map *perf_cpu_map__new_any_cpu(void);
    struct perf_cpu_map *perf_cpu_map__new(const char *cpu_list);
    struct perf_cpu_map *perf_cpu_map__read(FILE *file);
    struct perf_cpu_map *perf_cpu_map__get(struct perf_cpu_map *map);
    diff --git a/tools/lib/perf/cpumap.c b/tools/lib/perf/cpumap.c
    index 2a5a29217374..2bd6aba3d8c9 100644
    --- a/tools/lib/perf/cpumap.c
    +++ b/tools/lib/perf/cpumap.c
    @@ -27,7 +27,7 @@ struct perf_cpu_map *perf_cpu_map__alloc(int nr_cpus)
    return result;
    }

    -struct perf_cpu_map *perf_cpu_map__dummy_new(void)
    +struct perf_cpu_map *perf_cpu_map__new_any_cpu(void)
    {
    struct perf_cpu_map *cpus = perf_cpu_map__alloc(1);

    @@ -271,7 +271,7 @@ struct perf_cpu_map *perf_cpu_map__new(const char *cpu_list)
    else if (*cpu_list != '\0')
    cpus = cpu_map__default_new();
    else
    - cpus = perf_cpu_map__dummy_new();
    + cpus = perf_cpu_map__new_any_cpu();
    invalid:
    free(tmp_cpus);
    out:
    diff --git a/tools/lib/perf/evsel.c b/tools/lib/perf/evsel.c
    index 8b51b008a81f..c07160953224 100644
    --- a/tools/lib/perf/evsel.c
    +++ b/tools/lib/perf/evsel.c
    @@ -120,7 +120,7 @@ int perf_evsel__open(struct perf_evsel *evsel, struct perf_cpu_map *cpus,
    static struct perf_cpu_map *empty_cpu_map;

    if (empty_cpu_map == NULL) {
    - empty_cpu_map = perf_cpu_map__dummy_new();
    + empty_cpu_map = perf_cpu_map__new_any_cpu();
    if (empty_cpu_map == NULL)
    return -ENOMEM;
    }
    diff --git a/tools/lib/perf/include/perf/cpumap.h b/tools/lib/perf/include/perf/cpumap.h
    index e38d859a384d..d0bf218ada11 100644
    --- a/tools/lib/perf/include/perf/cpumap.h
    +++ b/tools/lib/perf/include/perf/cpumap.h
    @@ -19,9 +19,9 @@ struct perf_cache {
    struct perf_cpu_map;

    /**
    - * perf_cpu_map__dummy_new - a map with a singular "any CPU"/dummy -1 value.
    + * perf_cpu_map__new_any_cpu - a map with a singular "any CPU"/dummy -1 value.
    */
    -LIBPERF_API struct perf_cpu_map *perf_cpu_map__dummy_new(void);
    +LIBPERF_API struct perf_cpu_map *perf_cpu_map__new_any_cpu(void);
    LIBPERF_API struct perf_cpu_map *perf_cpu_map__default_new(void);
    LIBPERF_API struct perf_cpu_map *perf_cpu_map__new(const char *cpu_list);
    LIBPERF_API struct perf_cpu_map *perf_cpu_map__read(FILE *file);
    diff --git a/tools/lib/perf/libperf.map b/tools/lib/perf/libperf.map
    index 190b56ae923a..a8ff64baea3e 100644
    --- a/tools/lib/perf/libperf.map
    +++ b/tools/lib/perf/libperf.map
    @@ -1,7 +1,7 @@
    LIBPERF_0.0.1 {
    global:
    libperf_init;
    - perf_cpu_map__dummy_new;
    + perf_cpu_map__new_any_cpu;
    perf_cpu_map__default_new;
    perf_cpu_map__get;
    perf_cpu_map__put;
    diff --git a/tools/lib/perf/tests/test-cpumap.c b/tools/lib/perf/tests/test-cpumap.c
    index 87b0510a556f..2c359bdb951e 100644
    --- a/tools/lib/perf/tests/test-cpumap.c
    +++ b/tools/lib/perf/tests/test-cpumap.c
    @@ -21,7 +21,7 @@ int test_cpumap(int argc, char **argv)

    libperf_init(libperf_print);

    - cpus = perf_cpu_map__dummy_new();
    + cpus = perf_cpu_map__new_any_cpu();
    if (!cpus)
    return -1;

    diff --git a/tools/lib/perf/tests/test-evlist.c b/tools/lib/perf/tests/test-evlist.c
    index ed616fc19b4f..ab63878bacb9 100644
    --- a/tools/lib/perf/tests/test-evlist.c
    +++ b/tools/lib/perf/tests/test-evlist.c
    @@ -261,7 +261,7 @@ static int test_mmap_thread(void)
    threads = perf_thread_map__new_dummy();
    __T("failed to create threads", threads);

    - cpus = perf_cpu_map__dummy_new();
    + cpus = perf_cpu_map__new_any_cpu();
    __T("failed to create cpus", cpus);

    perf_thread_map__set_pid(threads, 0, pid);
    diff --git a/tools/perf/tests/cpumap.c b/tools/perf/tests/cpumap.c
    index 7730fc2ab40b..bd8e396f3e57 100644
    --- a/tools/perf/tests/cpumap.c
    +++ b/tools/perf/tests/cpumap.c
    @@ -213,7 +213,7 @@ static int test__cpu_map_intersect(struct test_suite *test __maybe_unused,

    static int test__cpu_map_equal(struct test_suite *test __maybe_unused, int subtest __maybe_unused)
    {
    - struct perf_cpu_map *any = perf_cpu_map__dummy_new();
    + struct perf_cpu_map *any = perf_cpu_map__new_any_cpu();
    struct perf_cpu_map *one = perf_cpu_map__new("1");
    struct perf_cpu_map *two = perf_cpu_map__new("2");
    struct perf_cpu_map *empty = perf_cpu_map__intersect(one, two);
    diff --git a/tools/perf/tests/sw-clock.c b/tools/perf/tests/sw-clock.c
    index 4d7493fa0105..290716783ac6 100644
    --- a/tools/perf/tests/sw-clock.c
    +++ b/tools/perf/tests/sw-clock.c
    @@ -62,7 +62,7 @@ static int __test__sw_clock_freq(enum perf_sw_ids clock_id)
    }
    evlist__add(evlist, evsel);

    - cpus = perf_cpu_map__dummy_new();
    + cpus = perf_cpu_map__new_any_cpu();
    threads = thread_map__new_by_tid(getpid());
    if (!cpus || !threads) {
    err = -ENOMEM;
    diff --git a/tools/perf/tests/task-exit.c b/tools/perf/tests/task-exit.c
    index 968dddde6dda..d33d0952025c 100644
    --- a/tools/perf/tests/task-exit.c
    +++ b/tools/perf/tests/task-exit.c
    @@ -70,7 +70,7 @@ static int test__task_exit(struct test_suite *test __maybe_unused, int subtest _
    * evlist__prepare_workload we'll fill in the only thread
    * we're monitoring, the one forked there.
    */
    - cpus = perf_cpu_map__dummy_new();
    + cpus = perf_cpu_map__new_any_cpu();
    threads = thread_map__new_by_tid(-1);
    if (!cpus || !threads) {
    err = -ENOMEM;
    diff --git a/tools/perf/util/evlist.c b/tools/perf/util/evlist.c
    index e36da58522ef..ff7f85ded89d 100644
    --- a/tools/perf/util/evlist.c
    +++ b/tools/perf/util/evlist.c
    @@ -1056,7 +1056,7 @@ int evlist__create_maps(struct evlist *evlist, struct target *target)
    return -1;

    if (target__uses_dummy_map(target))
    - cpus = perf_cpu_map__dummy_new();
    + cpus = perf_cpu_map__new_any_cpu();
    else
    cpus = perf_cpu_map__new(target->cpu_list);

    diff --git a/tools/perf/util/evsel.c b/tools/perf/util/evsel.c
    index a5da74e3a517..76ef3ab488a2 100644
    --- a/tools/perf/util/evsel.c
    +++ b/tools/perf/util/evsel.c
    @@ -1801,7 +1801,7 @@ static int __evsel__prepare_open(struct evsel *evsel, struct perf_cpu_map *cpus,

    if (cpus == NULL) {
    if (empty_cpu_map == NULL) {
    - empty_cpu_map = perf_cpu_map__dummy_new();
    + empty_cpu_map = perf_cpu_map__new_any_cpu();
    if (empty_cpu_map == NULL)
    return -ENOMEM;
    }
    --
    2.43.0.rc1.413.gea7ed67945-goog
    \
     
     \ /
      Last update: 2023-11-29 07:03    [W:2.992 / U:0.120 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site