lkml.org 
[lkml]   [2022]   [Dec]   [15]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 5/9] perf srcline: Conditionally suppress addr2line warnings
    Date
    It has symbol_conf.disable_add2line_warn to suppress some warnings.  Let's
    make it consistent with others.

    Signed-off-by: Namhyung Kim <namhyung@kernel.org>
    ---
    tools/perf/util/srcline.c | 15 ++++++++++-----
    1 file changed, 10 insertions(+), 5 deletions(-)

    diff --git a/tools/perf/util/srcline.c b/tools/perf/util/srcline.c
    index 2c212e2e1b65..33321867416b 100644
    --- a/tools/perf/util/srcline.c
    +++ b/tools/perf/util/srcline.c
    @@ -573,13 +573,15 @@ static int addr2line(const char *dso_name, u64 addr,
    * "??"/"??:0" lines.
    */
    if (fprintf(a2l->to_child, "%016"PRIx64"\n,\n", addr) < 0 || fflush(a2l->to_child) != 0) {
    - pr_warning("%s %s: could not send request\n", __func__, dso_name);
    + if (!symbol_conf.disable_add2line_warn)
    + pr_warning("%s %s: could not send request\n", __func__, dso_name);
    goto out;
    }

    switch (read_addr2line_record(a2l, &record_function, &record_filename, &record_line_nr)) {
    case -1:
    - pr_warning("%s %s: could not read first record\n", __func__, dso_name);
    + if (!symbol_conf.disable_add2line_warn)
    + pr_warning("%s %s: could not read first record\n", __func__, dso_name);
    goto out;
    case 0:
    /*
    @@ -588,14 +590,17 @@ static int addr2line(const char *dso_name, u64 addr,
    */
    switch (read_addr2line_record(a2l, NULL, NULL, NULL)) {
    case -1:
    - pr_warning("%s %s: could not read delimiter record\n", __func__, dso_name);
    + if (!symbol_conf.disable_add2line_warn)
    + pr_warning("%s %s: could not read delimiter record\n",
    + __func__, dso_name);
    break;
    case 0:
    /* As expected. */
    break;
    default:
    - pr_warning("%s %s: unexpected record instead of sentinel",
    - __func__, dso_name);
    + if (!symbol_conf.disable_add2line_warn)
    + pr_warning("%s %s: unexpected record instead of sentinel",
    + __func__, dso_name);
    break;
    }
    goto out;
    --
    2.39.0.314.g84b9a713c41-goog
    \
     
     \ /
      Last update: 2022-12-15 20:29    [W:2.694 / U:0.008 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site