lkml.org 
[lkml]   [2019]   [Oct]   [27]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH v4 1/7] perf diff: Don't use hack to skip column length calculation
    Date
    Previously we use a nasty hack to skip the hists__calc_col_len for
    block since this function is not very suitable for block column
    length calculation.

    This patch removes the hack code and add a check at the entry of
    hists__calc_col_len to skip for block case.

    Signed-off-by: Jin Yao <yao.jin@linux.intel.com>
    ---
    tools/perf/builtin-diff.c | 11 ++---------
    tools/perf/util/hist.c | 2 ++
    2 files changed, 4 insertions(+), 9 deletions(-)

    diff --git a/tools/perf/builtin-diff.c b/tools/perf/builtin-diff.c
    index 5281629c27b1..faf99a81ad3e 100644
    --- a/tools/perf/builtin-diff.c
    +++ b/tools/perf/builtin-diff.c
    @@ -765,13 +765,6 @@ static void block_hists_match(struct hists *hists_base,
    }
    }

    -static int filter_cb(struct hist_entry *he, void *arg __maybe_unused)
    -{
    - /* Skip the calculation of column length in output_resort */
    - he->filtered = true;
    - return 0;
    -}
    -
    static void hists__precompute(struct hists *hists)
    {
    struct rb_root_cached *root;
    @@ -820,8 +813,8 @@ static void hists__precompute(struct hists *hists)
    if (bh->valid && pair_bh->valid) {
    block_hists_match(&bh->block_hists,
    &pair_bh->block_hists);
    - hists__output_resort_cb(&pair_bh->block_hists,
    - NULL, filter_cb);
    + hists__output_resort(&pair_bh->block_hists,
    + NULL);
    }
    break;
    default:
    diff --git a/tools/perf/util/hist.c b/tools/perf/util/hist.c
    index 679a1d75090c..daa6eef4fde0 100644
    --- a/tools/perf/util/hist.c
    +++ b/tools/perf/util/hist.c
    @@ -80,6 +80,8 @@ void hists__calc_col_len(struct hists *hists, struct hist_entry *h)
    int symlen;
    u16 len;

    + if (h->block_info)
    + return;
    /*
    * +4 accounts for '[x] ' priv level info
    * +2 accounts for 0x prefix on raw addresses
    --
    2.17.1
    \
     
     \ /
      Last update: 2019-10-28 02:34    [W:5.037 / U:0.248 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site