lkml.org 
[lkml]   [2016]   [Jan]   [9]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 4/4] perf tools: Fallback to srcdir/Documentation/tips.txt
    Date
    Some people don't install perf, but just use compiled version in the
    source. Fallback to lookup the source directory for those poor guys. :)

    Signed-off-by: Namhyung Kim <namhyung@kernel.org>
    ---
    tools/perf/builtin-report.c | 10 +++++++++-
    tools/perf/util/util.c | 11 ++++++-----
    2 files changed, 15 insertions(+), 6 deletions(-)

    diff --git a/tools/perf/builtin-report.c b/tools/perf/builtin-report.c
    index d5a42ee12529..2bf537f190a0 100644
    --- a/tools/perf/builtin-report.c
    +++ b/tools/perf/builtin-report.c
    @@ -28,6 +28,7 @@
    #include "util/tool.h"

    #include <subcmd/parse-options.h>
    +#include <subcmd/exec-cmd.h>
    #include "util/parse-events.h"

    #include "util/thread.h"
    @@ -433,7 +434,14 @@ static int report__browse_hists(struct report *rep)
    int ret;
    struct perf_session *session = rep->session;
    struct perf_evlist *evlist = session->evlist;
    - const char *help = perf_tip(TIPDIR);
    + const char *help = perf_tip(system_path(TIPDIR));
    +
    + if (help == NULL) {
    + /* fallback for people who don't install perf ;-) */
    + help = perf_tip(DOCDIR);
    + if (help == NULL)
    + help = "Cannot load tips.txt file, please install perf!";
    + }

    switch (use_browser) {
    case 1:
    diff --git a/tools/perf/util/util.c b/tools/perf/util/util.c
    index 88b8f8d21f58..92e8543dadf9 100644
    --- a/tools/perf/util/util.c
    +++ b/tools/perf/util/util.c
    @@ -17,7 +17,6 @@
    #include <unistd.h>
    #include "callchain.h"
    #include "strlist.h"
    -#include <subcmd/exec-cmd.h>

    struct callchain_param callchain_param = {
    .mode = CHAIN_GRAPH_ABS,
    @@ -672,14 +671,16 @@ const char *perf_tip(const char *dirpath)
    struct str_node *node;
    char *tip = NULL;
    struct strlist_config conf = {
    - .dirname = system_path(dirpath) ,
    + .dirname = dirpath,
    + .file_only = true,
    };

    tips = strlist__new("tips.txt", &conf);
    - if (tips == NULL || strlist__nr_entries(tips) == 1) {
    - tip = (char *)"Cannot find tips.txt file";
    + if (tips == NULL)
    + return "Tip: get more memory! ;-p";
    +
    + if (strlist__nr_entries(tips) == 0)
    goto out;
    - }

    node = strlist__entry(tips, random() % strlist__nr_entries(tips));
    if (asprintf(&tip, "Tip: %s", node->s) < 0)
    --
    2.6.4
    \
     
     \ /
      Last update: 2016-01-09 11:41    [W:2.206 / U:0.308 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site