lkml.org 
[lkml]   [2023]   [Oct]   [24]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    Date
    Subject[PATCH v3 08/50] perf callchain: Make display use of branch_type_stat const
    From
    Display code doesn't modify the branch_type_stat so switch uses to
    const. This is done to aid refactoring struct callchain_list where
    current the branch_type_stat is embedded even if not used.

    Signed-off-by: Ian Rogers <irogers@google.com>
    ---
    tools/perf/util/branch.c | 4 ++--
    tools/perf/util/branch.h | 4 ++--
    tools/perf/util/callchain.c | 6 +++---
    3 files changed, 7 insertions(+), 7 deletions(-)

    diff --git a/tools/perf/util/branch.c b/tools/perf/util/branch.c
    index 378f16a24751..ab760e267d41 100644
    --- a/tools/perf/util/branch.c
    +++ b/tools/perf/util/branch.c
    @@ -109,7 +109,7 @@ const char *get_branch_type(struct branch_entry *e)
    return branch_type_name(e->flags.type);
    }

    -void branch_type_stat_display(FILE *fp, struct branch_type_stat *st)
    +void branch_type_stat_display(FILE *fp, const struct branch_type_stat *st)
    {
    u64 total = 0;
    int i;
    @@ -171,7 +171,7 @@ static int count_str_scnprintf(int idx, const char *str, char *bf, int size)
    return scnprintf(bf, size, "%s%s", (idx) ? " " : " (", str);
    }

    -int branch_type_str(struct branch_type_stat *st, char *bf, int size)
    +int branch_type_str(const struct branch_type_stat *st, char *bf, int size)
    {
    int i, j = 0, printed = 0;
    u64 total = 0;
    diff --git a/tools/perf/util/branch.h b/tools/perf/util/branch.h
    index e41bfffe2217..87704d713ff6 100644
    --- a/tools/perf/util/branch.h
    +++ b/tools/perf/util/branch.h
    @@ -86,8 +86,8 @@ void branch_type_count(struct branch_type_stat *st, struct branch_flags *flags,
    const char *branch_type_name(int type);
    const char *branch_new_type_name(int new_type);
    const char *get_branch_type(struct branch_entry *e);
    -void branch_type_stat_display(FILE *fp, struct branch_type_stat *st);
    -int branch_type_str(struct branch_type_stat *st, char *bf, int bfsize);
    +void branch_type_stat_display(FILE *fp, const struct branch_type_stat *st);
    +int branch_type_str(const struct branch_type_stat *st, char *bf, int bfsize);

    const char *branch_spec_desc(int spec);

    diff --git a/tools/perf/util/callchain.c b/tools/perf/util/callchain.c
    index 18d545c0629e..cde4860e6f28 100644
    --- a/tools/perf/util/callchain.c
    +++ b/tools/perf/util/callchain.c
    @@ -1339,7 +1339,7 @@ static int count_float_printf(int idx, const char *str, float value,
    static int branch_to_str(char *bf, int bfsize,
    u64 branch_count, u64 predicted_count,
    u64 abort_count,
    - struct branch_type_stat *brtype_stat)
    + const struct branch_type_stat *brtype_stat)
    {
    int printed, i = 0;

    @@ -1403,7 +1403,7 @@ static int counts_str_build(char *bf, int bfsize,
    u64 abort_count, u64 cycles_count,
    u64 iter_count, u64 iter_cycles,
    u64 from_count,
    - struct branch_type_stat *brtype_stat)
    + const struct branch_type_stat *brtype_stat)
    {
    int printed;

    @@ -1430,7 +1430,7 @@ static int callchain_counts_printf(FILE *fp, char *bf, int bfsize,
    u64 abort_count, u64 cycles_count,
    u64 iter_count, u64 iter_cycles,
    u64 from_count,
    - struct branch_type_stat *brtype_stat)
    + const struct branch_type_stat *brtype_stat)
    {
    char str[256];

    --
    2.42.0.758.gaed0368e0e-goog
    \
     
     \ /
      Last update: 2023-10-25 00:25    [W:6.510 / U:0.016 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site