lkml.org 
[lkml]   [2012]   [Sep]   [8]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    Date
    From
    Subject[tip:perf/core] perf tools: Replace sort' s standalone field_sep with symbol_conf.field_sep
    Commit-ID:  0ca0c130419a4aa05d28fbecc5d360f051944251
    Gitweb: http://git.kernel.org/tip/0ca0c130419a4aa05d28fbecc5d360f051944251
    Author: Jiri Olsa <jolsa@redhat.com>
    AuthorDate: Thu, 6 Sep 2012 17:46:56 +0200
    Committer: Arnaldo Carvalho de Melo <acme@redhat.com>
    CommitDate: Fri, 7 Sep 2012 21:50:11 -0300

    perf tools: Replace sort's standalone field_sep with symbol_conf.field_sep

    The repsep_snprintf function was still using standalone field_sep, which
    not even set anymore.

    Replacing it with 'symbol_conf.field_sep'.

    Signed-off-by: Jiri Olsa <jolsa@redhat.com>
    Cc: Andi Kleen <andi@firstfloor.org>
    Cc: Corey Ashford <cjashfor@linux.vnet.ibm.com>
    Cc: David Ahern <dsahern@gmail.com>
    Cc: Frederic Weisbecker <fweisbec@gmail.com>
    Cc: Ingo Molnar <mingo@elte.hu>
    Cc: Namhyung Kim <namhyung@kernel.org>
    Cc: Paul E. McKenney <paulmck@linux.vnet.ibm.com>
    Cc: Paul Mackerras <paulus@samba.org>
    Cc: Peter Zijlstra <a.p.zijlstra@chello.nl>
    Link: http://lkml.kernel.org/r/1346946426-13496-3-git-send-email-jolsa@redhat.com
    Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
    ---
    tools/perf/util/sort.c | 6 ++----
    tools/perf/util/sort.h | 1 -
    2 files changed, 2 insertions(+), 5 deletions(-)

    diff --git a/tools/perf/util/sort.c b/tools/perf/util/sort.c
    index 0f5a0a4..7a2fbd8 100644
    --- a/tools/perf/util/sort.c
    +++ b/tools/perf/util/sort.c
    @@ -12,8 +12,6 @@ int sort__branch_mode = -1; /* -1 = means not set */

    enum sort_type sort__first_dimension;

    -char * field_sep;
    -
    LIST_HEAD(hist_entry__sort_list);

    static int repsep_snprintf(char *bf, size_t size, const char *fmt, ...)
    @@ -23,11 +21,11 @@ static int repsep_snprintf(char *bf, size_t size, const char *fmt, ...)

    va_start(ap, fmt);
    n = vsnprintf(bf, size, fmt, ap);
    - if (field_sep && n > 0) {
    + if (symbol_conf.field_sep && n > 0) {
    char *sep = bf;

    while (1) {
    - sep = strchr(sep, *field_sep);
    + sep = strchr(sep, *symbol_conf.field_sep);
    if (sep == NULL)
    break;
    *sep = '.';
    diff --git a/tools/perf/util/sort.h b/tools/perf/util/sort.h
    index e724b26..e459c98 100644
    --- a/tools/perf/util/sort.h
    +++ b/tools/perf/util/sort.h
    @@ -32,7 +32,6 @@ extern const char default_sort_order[];
    extern int sort__need_collapse;
    extern int sort__has_parent;
    extern int sort__branch_mode;
    -extern char *field_sep;
    extern struct sort_entry sort_comm;
    extern struct sort_entry sort_dso;
    extern struct sort_entry sort_sym;

    \
     
     \ /
      Last update: 2012-09-08 14:21    [W:0.045 / U:90.952 seconds]
    ©2003-2016 Jasper Spaans. hosted at Digital OceanAdvertise on this site