perf string: Move 'dots' and 'graph_dotted_line' out of sane_ctype.h
tip-bot for Arnaldo Carvalho de Melo
merge botCommit-ID: 6a9fa4e3bddedc027b691b6470c500d51d04e56c Gitweb: https://git.kernel.org/tip/6a9fa4e3bddedc027b691b6470c500d51d04e56c Author: Arnaldo Carvalho de Melo <[email protected]> AuthorDate: Tue, 25 Jun 2019 17:31:26 -0300 Committer: Arnaldo Carvalho de Melo <[email protected]> CommitDate: Tue, 25 Jun 2019 17:31:26 -0300
perf string: Move 'dots' and 'graph_dotted_line' out of sane_ctype.h
Those are not in that file in the git repo, lets move it from there so that we get that sane ctype code fully isolated to allow getting it in sync either with the git sources or better with the kernel sources (include/linux/ctype.h + lib/ctype.h), that way we can use check_headers.h to get notified when changes are made in the original code so that we can cherry-pick.
Cc Adrian Hunter <[email protected]>
Cc Jiri Olsa <[email protected]>
Cc Namhyung Kim <[email protected]>
Signed-off-by Arnaldo Carvalho de Melo <[email protected]>
--- tools/perf/builtin-kmem.c | 1 + tools/perf/builtin-sched.c | 1 + tools/perf/builtin-top.c | 1 + tools/perf/util/ctype.c | 9 --------- tools/perf/util/evsel.c | 1 + tools/perf/util/sane_ctype.h | 3 --- tools/perf/util/string.c | 9 +++++++++ tools/perf/util/string2.h | 3 +++ 8 files changed, 16 insertions(+), 12 deletions(-)
tools/perf/builtin-kmem.c +1 -0
@@ -21,6 +21,7 @@#include "util/cpumap.h" #include "util/debug.h" +#include "util/string2.h" #include <linux/kernel.h> #include <linux/rbtree.h>
tools/perf/builtin-sched.c +1 -0
@@ -15,6 +15,7 @@#include "util/thread_map.h" #include "util/color.h" #include "util/stat.h" +#include "util/string2.h" #include "util/callchain.h" #include "util/time-utils.h"
tools/perf/builtin-top.c +1 -0
@@ -40,6 +40,7 @@#include "util/cpumap.h" #include "util/xyarray.h" #include "util/sort.h" +#include "util/string2.h" #include "util/term.h" #include "util/intlist.h" #include "util/parse-branch-options.h"
tools/perf/util/ctype.c +0 -9
@@ -30,12 +30,3 @@ unsigned char sane_ctype[256] = { A, A, A, A, A, A, A, A, A, A, A, R, R, P, P, 0, /* 112..127 */ /* Nothing in the 128.. range */ }; - -const char *graph_dotted_line = -"---------------------------------------------------------------------" -"---------------------------------------------------------------------" -"---------------------------------------------------------------------" ; -const char *dots = -"....................................................................." -"....................................................................." -"....................................................................." ;
tools/perf/util/evsel.c +1 -0
@@ -35,6 +35,7 @@#include "debug.h" #include "trace-event.h" #include "stat.h" +#include "string2.h" #include "memswap.h" #include "util/parse-branch-options.h"
tools/perf/util/sane_ctype.h +0 -3
@@ -2,9 +2,6 @@#ifndef _PERF_SANE_CTYPE_H#define _PERF_SANE_CTYPE_H -extern const char *graph_dotted_line; -extern const char *dots; -/* Sane ctype - no locale, and works with signed chars */ #undef isascii#undef isspace
tools/perf/util/string.c +9 -0
@@ -6,6 +6,15 @@#include "sane_ctype.h" +const char *graph_dotted_line = +"---------------------------------------------------------------------" +"---------------------------------------------------------------------" +"---------------------------------------------------------------------" ; +const char *dots = +"....................................................................." +"....................................................................." +"....................................................................." ; +#define K 1024LL/* * perf_atoll()
tools/perf/util/string2.h +3 -0
@@ -6,6 +6,9 @@#include <stddef.h> #include <string.h> +extern const char *graph_dotted_line; +extern const char *dots; +s64 perf_atoll (const char *str);char **argv_split (const char *str,int *argcp);void argv_free (char **argv);