diff options
author | Arnaldo Carvalho de Melo <acme@redhat.com> | 2014-12-17 15:24:45 -0500 |
---|---|---|
committer | Arnaldo Carvalho de Melo <acme@redhat.com> | 2015-01-21 11:24:31 -0500 |
commit | 48000a1aed7422a833220245da43114012c355d7 (patch) | |
tree | cebd266d933e33ee27ccf3e8bbcf6f3f48d3387a /tools/perf | |
parent | 6602412215c26cd94af1b78fef56b78a5027b19b (diff) |
perf tools: Remove EOL whitespaces
Janitorial stuff: boredom moment.
Cc: Adrian Hunter <adrian.hunter@intel.com>
Cc: Borislav Petkov <bp@suse.de>
Cc: David Ahern <dsahern@gmail.com>
Cc: Don Zickus <dzickus@redhat.com>
Cc: Frederic Weisbecker <fweisbec@gmail.com>
Cc: Jiri Olsa <jolsa@redhat.com>
Cc: Mike Galbraith <efault@gmx.de>
Cc: Namhyung Kim <namhyung@kernel.org>
Cc: Paul Mackerras <paulus@samba.org>
Cc: Peter Zijlstra <peterz@infradead.org>
Cc: Stephane Eranian <eranian@google.com>
Link: http://lkml.kernel.org/n/tip-u70i7shys3kths4hzru72bha@git.kernel.org
Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
Diffstat (limited to 'tools/perf')
-rw-r--r-- | tools/perf/Documentation/perf-buildid-cache.txt | 2 | ||||
-rw-r--r-- | tools/perf/Documentation/perf-script.txt | 28 | ||||
-rw-r--r-- | tools/perf/builtin-buildid-cache.c | 4 | ||||
-rw-r--r-- | tools/perf/builtin-stat.c | 2 | ||||
-rw-r--r-- | tools/perf/builtin-top.c | 2 | ||||
-rw-r--r-- | tools/perf/builtin-trace.c | 80 | ||||
-rw-r--r-- | tools/perf/tests/attr.py | 1 | ||||
-rw-r--r-- | tools/perf/tests/make | 1 | ||||
-rw-r--r-- | tools/perf/tests/parse-events.c | 2 | ||||
-rw-r--r-- | tools/perf/ui/browsers/annotate.c | 3 | ||||
-rw-r--r-- | tools/perf/ui/progress.h | 4 | ||||
-rw-r--r-- | tools/perf/util/annotate.c | 2 | ||||
-rw-r--r-- | tools/perf/util/parse-events.c | 6 | ||||
-rw-r--r-- | tools/perf/util/python.c | 2 | ||||
-rw-r--r-- | tools/perf/util/scripting-engines/trace-event-python.c | 2 | ||||
-rw-r--r-- | tools/perf/util/session.c | 2 | ||||
-rw-r--r-- | tools/perf/util/symbol.c | 2 |
17 files changed, 71 insertions, 74 deletions
diff --git a/tools/perf/Documentation/perf-buildid-cache.txt b/tools/perf/Documentation/perf-buildid-cache.txt index fd77d81ea748..0294c57b1f5e 100644 --- a/tools/perf/Documentation/perf-buildid-cache.txt +++ b/tools/perf/Documentation/perf-buildid-cache.txt | |||
@@ -38,7 +38,7 @@ OPTIONS | |||
38 | --remove=:: | 38 | --remove=:: |
39 | Remove specified file from the cache. | 39 | Remove specified file from the cache. |
40 | -M:: | 40 | -M:: |
41 | --missing=:: | 41 | --missing=:: |
42 | List missing build ids in the cache for the specified file. | 42 | List missing build ids in the cache for the specified file. |
43 | -u:: | 43 | -u:: |
44 | --update:: | 44 | --update:: |
diff --git a/tools/perf/Documentation/perf-script.txt b/tools/perf/Documentation/perf-script.txt index 21494806c0ab..a21eec05bc42 100644 --- a/tools/perf/Documentation/perf-script.txt +++ b/tools/perf/Documentation/perf-script.txt | |||
@@ -125,46 +125,46 @@ OPTIONS | |||
125 | is equivalent to: | 125 | is equivalent to: |
126 | 126 | ||
127 | perf script -f trace:<fields> -f sw:<fields> -f hw:<fields> | 127 | perf script -f trace:<fields> -f sw:<fields> -f hw:<fields> |
128 | 128 | ||
129 | i.e., the specified fields apply to all event types if the type string | 129 | i.e., the specified fields apply to all event types if the type string |
130 | is not given. | 130 | is not given. |
131 | 131 | ||
132 | The arguments are processed in the order received. A later usage can | 132 | The arguments are processed in the order received. A later usage can |
133 | reset a prior request. e.g.: | 133 | reset a prior request. e.g.: |
134 | 134 | ||
135 | -f trace: -f comm,tid,time,ip,sym | 135 | -f trace: -f comm,tid,time,ip,sym |
136 | 136 | ||
137 | The first -f suppresses trace events (field list is ""), but then the | 137 | The first -f suppresses trace events (field list is ""), but then the |
138 | second invocation sets the fields to comm,tid,time,ip,sym. In this case a | 138 | second invocation sets the fields to comm,tid,time,ip,sym. In this case a |
139 | warning is given to the user: | 139 | warning is given to the user: |
140 | 140 | ||
141 | "Overriding previous field request for all events." | 141 | "Overriding previous field request for all events." |
142 | 142 | ||
143 | Alternatively, consider the order: | 143 | Alternatively, consider the order: |
144 | 144 | ||
145 | -f comm,tid,time,ip,sym -f trace: | 145 | -f comm,tid,time,ip,sym -f trace: |
146 | 146 | ||
147 | The first -f sets the fields for all events and the second -f | 147 | The first -f sets the fields for all events and the second -f |
148 | suppresses trace events. The user is given a warning message about | 148 | suppresses trace events. The user is given a warning message about |
149 | the override, and the result of the above is that only S/W and H/W | 149 | the override, and the result of the above is that only S/W and H/W |
150 | events are displayed with the given fields. | 150 | events are displayed with the given fields. |
151 | 151 | ||
152 | For the 'wildcard' option if a user selected field is invalid for an | 152 | For the 'wildcard' option if a user selected field is invalid for an |
153 | event type, a message is displayed to the user that the option is | 153 | event type, a message is displayed to the user that the option is |
154 | ignored for that type. For example: | 154 | ignored for that type. For example: |
155 | 155 | ||
156 | $ perf script -f comm,tid,trace | 156 | $ perf script -f comm,tid,trace |
157 | 'trace' not valid for hardware events. Ignoring. | 157 | 'trace' not valid for hardware events. Ignoring. |
158 | 'trace' not valid for software events. Ignoring. | 158 | 'trace' not valid for software events. Ignoring. |
159 | 159 | ||
160 | Alternatively, if the type is given an invalid field is specified it | 160 | Alternatively, if the type is given an invalid field is specified it |
161 | is an error. For example: | 161 | is an error. For example: |
162 | 162 | ||
163 | perf script -v -f sw:comm,tid,trace | 163 | perf script -v -f sw:comm,tid,trace |
164 | 'trace' not valid for software events. | 164 | 'trace' not valid for software events. |
165 | 165 | ||
166 | At this point usage is displayed, and perf-script exits. | 166 | At this point usage is displayed, and perf-script exits. |
167 | 167 | ||
168 | Finally, a user may not set fields to none for all event types. | 168 | Finally, a user may not set fields to none for all event types. |
169 | i.e., -f "" is not allowed. | 169 | i.e., -f "" is not allowed. |
170 | 170 | ||
diff --git a/tools/perf/builtin-buildid-cache.c b/tools/perf/builtin-buildid-cache.c index 77d5cae54c6a..50e6b66aea1f 100644 --- a/tools/perf/builtin-buildid-cache.c +++ b/tools/perf/builtin-buildid-cache.c | |||
@@ -236,10 +236,10 @@ static bool dso__missing_buildid_cache(struct dso *dso, int parm __maybe_unused) | |||
236 | if (errno == ENOENT) | 236 | if (errno == ENOENT) |
237 | return false; | 237 | return false; |
238 | 238 | ||
239 | pr_warning("Problems with %s file, consider removing it from the cache\n", | 239 | pr_warning("Problems with %s file, consider removing it from the cache\n", |
240 | filename); | 240 | filename); |
241 | } else if (memcmp(dso->build_id, build_id, sizeof(dso->build_id))) { | 241 | } else if (memcmp(dso->build_id, build_id, sizeof(dso->build_id))) { |
242 | pr_warning("Problems with %s file, consider removing it from the cache\n", | 242 | pr_warning("Problems with %s file, consider removing it from the cache\n", |
243 | filename); | 243 | filename); |
244 | } | 244 | } |
245 | 245 | ||
diff --git a/tools/perf/builtin-stat.c b/tools/perf/builtin-stat.c index 891086376381..e598e4e98170 100644 --- a/tools/perf/builtin-stat.c +++ b/tools/perf/builtin-stat.c | |||
@@ -1730,7 +1730,7 @@ int cmd_stat(int argc, const char **argv, const char *prefix __maybe_unused) | |||
1730 | "detailed run - start a lot of events"), | 1730 | "detailed run - start a lot of events"), |
1731 | OPT_BOOLEAN('S', "sync", &sync_run, | 1731 | OPT_BOOLEAN('S', "sync", &sync_run, |
1732 | "call sync() before starting a run"), | 1732 | "call sync() before starting a run"), |
1733 | OPT_CALLBACK_NOOPT('B', "big-num", NULL, NULL, | 1733 | OPT_CALLBACK_NOOPT('B', "big-num", NULL, NULL, |
1734 | "print large numbers with thousands\' separators", | 1734 | "print large numbers with thousands\' separators", |
1735 | stat__set_big_num), | 1735 | stat__set_big_num), |
1736 | OPT_STRING('C', "cpu", &target.cpu_list, "cpu", | 1736 | OPT_STRING('C', "cpu", &target.cpu_list, "cpu", |
diff --git a/tools/perf/builtin-top.c b/tools/perf/builtin-top.c index 616f0fcb4701..c4c7eac69de4 100644 --- a/tools/perf/builtin-top.c +++ b/tools/perf/builtin-top.c | |||
@@ -165,7 +165,7 @@ static void ui__warn_map_erange(struct map *map, struct symbol *sym, u64 ip) | |||
165 | err ? "[unknown]" : uts.release, perf_version_string); | 165 | err ? "[unknown]" : uts.release, perf_version_string); |
166 | if (use_browser <= 0) | 166 | if (use_browser <= 0) |
167 | sleep(5); | 167 | sleep(5); |
168 | 168 | ||
169 | map->erange_warned = true; | 169 | map->erange_warned = true; |
170 | } | 170 | } |
171 | 171 | ||
diff --git a/tools/perf/builtin-trace.c b/tools/perf/builtin-trace.c index badfabc6a01f..258f6550c736 100644 --- a/tools/perf/builtin-trace.c +++ b/tools/perf/builtin-trace.c | |||
@@ -929,66 +929,66 @@ static struct syscall_fmt { | |||
929 | .arg_scnprintf = { [0] = SCA_HEX, /* brk */ }, }, | 929 | .arg_scnprintf = { [0] = SCA_HEX, /* brk */ }, }, |
930 | { .name = "clock_gettime", .errmsg = true, STRARRAY(0, clk_id, clockid), }, | 930 | { .name = "clock_gettime", .errmsg = true, STRARRAY(0, clk_id, clockid), }, |
931 | { .name = "close", .errmsg = true, | 931 | { .name = "close", .errmsg = true, |
932 | .arg_scnprintf = { [0] = SCA_CLOSE_FD, /* fd */ }, }, | 932 | .arg_scnprintf = { [0] = SCA_CLOSE_FD, /* fd */ }, }, |
933 | { .name = "connect", .errmsg = true, }, | 933 | { .name = "connect", .errmsg = true, }, |
934 | { .name = "dup", .errmsg = true, | 934 | { .name = "dup", .errmsg = true, |
935 | .arg_scnprintf = { [0] = SCA_FD, /* fd */ }, }, | 935 | .arg_scnprintf = { [0] = SCA_FD, /* fd */ }, }, |
936 | { .name = "dup2", .errmsg = true, | 936 | { .name = "dup2", .errmsg = true, |
937 | .arg_scnprintf = { [0] = SCA_FD, /* fd */ }, }, | 937 | .arg_scnprintf = { [0] = SCA_FD, /* fd */ }, }, |
938 | { .name = "dup3", .errmsg = true, | 938 | { .name = "dup3", .errmsg = true, |
939 | .arg_scnprintf = { [0] = SCA_FD, /* fd */ }, }, | 939 | .arg_scnprintf = { [0] = SCA_FD, /* fd */ }, }, |
940 | { .name = "epoll_ctl", .errmsg = true, STRARRAY(1, op, epoll_ctl_ops), }, | 940 | { .name = "epoll_ctl", .errmsg = true, STRARRAY(1, op, epoll_ctl_ops), }, |
941 | { .name = "eventfd2", .errmsg = true, | 941 | { .name = "eventfd2", .errmsg = true, |
942 | .arg_scnprintf = { [1] = SCA_EFD_FLAGS, /* flags */ }, }, | 942 | .arg_scnprintf = { [1] = SCA_EFD_FLAGS, /* flags */ }, }, |
943 | { .name = "faccessat", .errmsg = true, | 943 | { .name = "faccessat", .errmsg = true, |
944 | .arg_scnprintf = { [0] = SCA_FDAT, /* dfd */ }, }, | 944 | .arg_scnprintf = { [0] = SCA_FDAT, /* dfd */ }, }, |
945 | { .name = "fadvise64", .errmsg = true, | 945 | { .name = "fadvise64", .errmsg = true, |
946 | .arg_scnprintf = { [0] = SCA_FD, /* fd */ }, }, | 946 | .arg_scnprintf = { [0] = SCA_FD, /* fd */ }, }, |
947 | { .name = "fallocate", .errmsg = true, | 947 | { .name = "fallocate", .errmsg = true, |
948 | .arg_scnprintf = { [0] = SCA_FD, /* fd */ }, }, | 948 | .arg_scnprintf = { [0] = SCA_FD, /* fd */ }, }, |
949 | { .name = "fchdir", .errmsg = true, | 949 | { .name = "fchdir", .errmsg = true, |
950 | .arg_scnprintf = { [0] = SCA_FD, /* fd */ }, }, | 950 | .arg_scnprintf = { [0] = SCA_FD, /* fd */ }, }, |
951 | { .name = "fchmod", .errmsg = true, | 951 | { .name = "fchmod", .errmsg = true, |
952 | .arg_scnprintf = { [0] = SCA_FD, /* fd */ }, }, | 952 | .arg_scnprintf = { [0] = SCA_FD, /* fd */ }, }, |
953 | { .name = "fchmodat", .errmsg = true, | 953 | { .name = "fchmodat", .errmsg = true, |
954 | .arg_scnprintf = { [0] = SCA_FDAT, /* fd */ }, }, | 954 | .arg_scnprintf = { [0] = SCA_FDAT, /* fd */ }, }, |
955 | { .name = "fchown", .errmsg = true, | 955 | { .name = "fchown", .errmsg = true, |
956 | .arg_scnprintf = { [0] = SCA_FD, /* fd */ }, }, | 956 | .arg_scnprintf = { [0] = SCA_FD, /* fd */ }, }, |
957 | { .name = "fchownat", .errmsg = true, | 957 | { .name = "fchownat", .errmsg = true, |
958 | .arg_scnprintf = { [0] = SCA_FDAT, /* fd */ }, }, | 958 | .arg_scnprintf = { [0] = SCA_FDAT, /* fd */ }, }, |
959 | { .name = "fcntl", .errmsg = true, | 959 | { .name = "fcntl", .errmsg = true, |
960 | .arg_scnprintf = { [0] = SCA_FD, /* fd */ | 960 | .arg_scnprintf = { [0] = SCA_FD, /* fd */ |
961 | [1] = SCA_STRARRAY, /* cmd */ }, | 961 | [1] = SCA_STRARRAY, /* cmd */ }, |
962 | .arg_parm = { [1] = &strarray__fcntl_cmds, /* cmd */ }, }, | 962 | .arg_parm = { [1] = &strarray__fcntl_cmds, /* cmd */ }, }, |
963 | { .name = "fdatasync", .errmsg = true, | 963 | { .name = "fdatasync", .errmsg = true, |
964 | .arg_scnprintf = { [0] = SCA_FD, /* fd */ }, }, | 964 | .arg_scnprintf = { [0] = SCA_FD, /* fd */ }, }, |
965 | { .name = "flock", .errmsg = true, | 965 | { .name = "flock", .errmsg = true, |
966 | .arg_scnprintf = { [0] = SCA_FD, /* fd */ | 966 | .arg_scnprintf = { [0] = SCA_FD, /* fd */ |
967 | [1] = SCA_FLOCK, /* cmd */ }, }, | 967 | [1] = SCA_FLOCK, /* cmd */ }, }, |
968 | { .name = "fsetxattr", .errmsg = true, | 968 | { .name = "fsetxattr", .errmsg = true, |
969 | .arg_scnprintf = { [0] = SCA_FD, /* fd */ }, }, | 969 | .arg_scnprintf = { [0] = SCA_FD, /* fd */ }, }, |
970 | { .name = "fstat", .errmsg = true, .alias = "newfstat", | 970 | { .name = "fstat", .errmsg = true, .alias = "newfstat", |
971 | .arg_scnprintf = { [0] = SCA_FD, /* fd */ }, }, | 971 | .arg_scnprintf = { [0] = SCA_FD, /* fd */ }, }, |
972 | { .name = "fstatat", .errmsg = true, .alias = "newfstatat", | 972 | { .name = "fstatat", .errmsg = true, .alias = "newfstatat", |
973 | .arg_scnprintf = { [0] = SCA_FDAT, /* dfd */ }, }, | 973 | .arg_scnprintf = { [0] = SCA_FDAT, /* dfd */ }, }, |
974 | { .name = "fstatfs", .errmsg = true, | 974 | { .name = "fstatfs", .errmsg = true, |
975 | .arg_scnprintf = { [0] = SCA_FD, /* fd */ }, }, | 975 | .arg_scnprintf = { [0] = SCA_FD, /* fd */ }, }, |
976 | { .name = "fsync", .errmsg = true, | 976 | { .name = "fsync", .errmsg = true, |
977 | .arg_scnprintf = { [0] = SCA_FD, /* fd */ }, }, | 977 | .arg_scnprintf = { [0] = SCA_FD, /* fd */ }, }, |
978 | { .name = "ftruncate", .errmsg = true, | 978 | { .name = "ftruncate", .errmsg = true, |
979 | .arg_scnprintf = { [0] = SCA_FD, /* fd */ }, }, | 979 | .arg_scnprintf = { [0] = SCA_FD, /* fd */ }, }, |
980 | { .name = "futex", .errmsg = true, | 980 | { .name = "futex", .errmsg = true, |
981 | .arg_scnprintf = { [1] = SCA_FUTEX_OP, /* op */ }, }, | 981 | .arg_scnprintf = { [1] = SCA_FUTEX_OP, /* op */ }, }, |
982 | { .name = "futimesat", .errmsg = true, | 982 | { .name = "futimesat", .errmsg = true, |
983 | .arg_scnprintf = { [0] = SCA_FDAT, /* fd */ }, }, | 983 | .arg_scnprintf = { [0] = SCA_FDAT, /* fd */ }, }, |
984 | { .name = "getdents", .errmsg = true, | 984 | { .name = "getdents", .errmsg = true, |
985 | .arg_scnprintf = { [0] = SCA_FD, /* fd */ }, }, | 985 | .arg_scnprintf = { [0] = SCA_FD, /* fd */ }, }, |
986 | { .name = "getdents64", .errmsg = true, | 986 | { .name = "getdents64", .errmsg = true, |
987 | .arg_scnprintf = { [0] = SCA_FD, /* fd */ }, }, | 987 | .arg_scnprintf = { [0] = SCA_FD, /* fd */ }, }, |
988 | { .name = "getitimer", .errmsg = true, STRARRAY(0, which, itimers), }, | 988 | { .name = "getitimer", .errmsg = true, STRARRAY(0, which, itimers), }, |
989 | { .name = "getrlimit", .errmsg = true, STRARRAY(0, resource, rlimit_resources), }, | 989 | { .name = "getrlimit", .errmsg = true, STRARRAY(0, resource, rlimit_resources), }, |
990 | { .name = "ioctl", .errmsg = true, | 990 | { .name = "ioctl", .errmsg = true, |
991 | .arg_scnprintf = { [0] = SCA_FD, /* fd */ | 991 | .arg_scnprintf = { [0] = SCA_FD, /* fd */ |
992 | #if defined(__i386__) || defined(__x86_64__) | 992 | #if defined(__i386__) || defined(__x86_64__) |
993 | /* | 993 | /* |
994 | * FIXME: Make this available to all arches. | 994 | * FIXME: Make this available to all arches. |
@@ -1002,7 +1002,7 @@ static struct syscall_fmt { | |||
1002 | { .name = "kill", .errmsg = true, | 1002 | { .name = "kill", .errmsg = true, |
1003 | .arg_scnprintf = { [1] = SCA_SIGNUM, /* sig */ }, }, | 1003 | .arg_scnprintf = { [1] = SCA_SIGNUM, /* sig */ }, }, |
1004 | { .name = "linkat", .errmsg = true, | 1004 | { .name = "linkat", .errmsg = true, |
1005 | .arg_scnprintf = { [0] = SCA_FDAT, /* fd */ }, }, | 1005 | .arg_scnprintf = { [0] = SCA_FDAT, /* fd */ }, }, |
1006 | { .name = "lseek", .errmsg = true, | 1006 | { .name = "lseek", .errmsg = true, |
1007 | .arg_scnprintf = { [0] = SCA_FD, /* fd */ | 1007 | .arg_scnprintf = { [0] = SCA_FD, /* fd */ |
1008 | [2] = SCA_STRARRAY, /* whence */ }, | 1008 | [2] = SCA_STRARRAY, /* whence */ }, |
@@ -1012,9 +1012,9 @@ static struct syscall_fmt { | |||
1012 | .arg_scnprintf = { [0] = SCA_HEX, /* start */ | 1012 | .arg_scnprintf = { [0] = SCA_HEX, /* start */ |
1013 | [2] = SCA_MADV_BHV, /* behavior */ }, }, | 1013 | [2] = SCA_MADV_BHV, /* behavior */ }, }, |
1014 | { .name = "mkdirat", .errmsg = true, | 1014 | { .name = "mkdirat", .errmsg = true, |
1015 | .arg_scnprintf = { [0] = SCA_FDAT, /* fd */ }, }, | 1015 | .arg_scnprintf = { [0] = SCA_FDAT, /* fd */ }, }, |
1016 | { .name = "mknodat", .errmsg = true, | 1016 | { .name = "mknodat", .errmsg = true, |
1017 | .arg_scnprintf = { [0] = SCA_FDAT, /* fd */ }, }, | 1017 | .arg_scnprintf = { [0] = SCA_FDAT, /* fd */ }, }, |
1018 | { .name = "mlock", .errmsg = true, | 1018 | { .name = "mlock", .errmsg = true, |
1019 | .arg_scnprintf = { [0] = SCA_HEX, /* addr */ }, }, | 1019 | .arg_scnprintf = { [0] = SCA_HEX, /* addr */ }, }, |
1020 | { .name = "mlockall", .errmsg = true, | 1020 | { .name = "mlockall", .errmsg = true, |
@@ -1036,9 +1036,9 @@ static struct syscall_fmt { | |||
1036 | { .name = "munmap", .errmsg = true, | 1036 | { .name = "munmap", .errmsg = true, |
1037 | .arg_scnprintf = { [0] = SCA_HEX, /* addr */ }, }, | 1037 | .arg_scnprintf = { [0] = SCA_HEX, /* addr */ }, }, |
1038 | { .name = "name_to_handle_at", .errmsg = true, | 1038 | { .name = "name_to_handle_at", .errmsg = true, |
1039 | .arg_scnprintf = { [0] = SCA_FDAT, /* dfd */ }, }, | 1039 | .arg_scnprintf = { [0] = SCA_FDAT, /* dfd */ }, }, |
1040 | { .name = "newfstatat", .errmsg = true, | 1040 | { .name = "newfstatat", .errmsg = true, |
1041 | .arg_scnprintf = { [0] = SCA_FDAT, /* dfd */ }, }, | 1041 | .arg_scnprintf = { [0] = SCA_FDAT, /* dfd */ }, }, |
1042 | { .name = "open", .errmsg = true, | 1042 | { .name = "open", .errmsg = true, |
1043 | .arg_scnprintf = { [1] = SCA_OPEN_FLAGS, /* flags */ }, }, | 1043 | .arg_scnprintf = { [1] = SCA_OPEN_FLAGS, /* flags */ }, }, |
1044 | { .name = "open_by_handle_at", .errmsg = true, | 1044 | { .name = "open_by_handle_at", .errmsg = true, |
@@ -1052,20 +1052,20 @@ static struct syscall_fmt { | |||
1052 | { .name = "poll", .errmsg = true, .timeout = true, }, | 1052 | { .name = "poll", .errmsg = true, .timeout = true, }, |
1053 | { .name = "ppoll", .errmsg = true, .timeout = true, }, | 1053 | { .name = "ppoll", .errmsg = true, .timeout = true, }, |
1054 | { .name = "pread", .errmsg = true, .alias = "pread64", | 1054 | { .name = "pread", .errmsg = true, .alias = "pread64", |
1055 | .arg_scnprintf = { [0] = SCA_FD, /* fd */ }, }, | 1055 | .arg_scnprintf = { [0] = SCA_FD, /* fd */ }, }, |
1056 | { .name = "preadv", .errmsg = true, .alias = "pread", | 1056 | { .name = "preadv", .errmsg = true, .alias = "pread", |
1057 | .arg_scnprintf = { [0] = SCA_FD, /* fd */ }, }, | 1057 | .arg_scnprintf = { [0] = SCA_FD, /* fd */ }, }, |
1058 | { .name = "prlimit64", .errmsg = true, STRARRAY(1, resource, rlimit_resources), }, | 1058 | { .name = "prlimit64", .errmsg = true, STRARRAY(1, resource, rlimit_resources), }, |
1059 | { .name = "pwrite", .errmsg = true, .alias = "pwrite64", | 1059 | { .name = "pwrite", .errmsg = true, .alias = "pwrite64", |
1060 | .arg_scnprintf = { [0] = SCA_FD, /* fd */ }, }, | 1060 | .arg_scnprintf = { [0] = SCA_FD, /* fd */ }, }, |
1061 | { .name = "pwritev", .errmsg = true, | 1061 | { .name = "pwritev", .errmsg = true, |
1062 | .arg_scnprintf = { [0] = SCA_FD, /* fd */ }, }, | 1062 | .arg_scnprintf = { [0] = SCA_FD, /* fd */ }, }, |
1063 | { .name = "read", .errmsg = true, | 1063 | { .name = "read", .errmsg = true, |
1064 | .arg_scnprintf = { [0] = SCA_FD, /* fd */ }, }, | 1064 | .arg_scnprintf = { [0] = SCA_FD, /* fd */ }, }, |
1065 | { .name = "readlinkat", .errmsg = true, | 1065 | { .name = "readlinkat", .errmsg = true, |
1066 | .arg_scnprintf = { [0] = SCA_FDAT, /* dfd */ }, }, | 1066 | .arg_scnprintf = { [0] = SCA_FDAT, /* dfd */ }, }, |
1067 | { .name = "readv", .errmsg = true, | 1067 | { .name = "readv", .errmsg = true, |
1068 | .arg_scnprintf = { [0] = SCA_FD, /* fd */ }, }, | 1068 | .arg_scnprintf = { [0] = SCA_FD, /* fd */ }, }, |
1069 | { .name = "recvfrom", .errmsg = true, | 1069 | { .name = "recvfrom", .errmsg = true, |
1070 | .arg_scnprintf = { [3] = SCA_MSG_FLAGS, /* flags */ }, }, | 1070 | .arg_scnprintf = { [3] = SCA_MSG_FLAGS, /* flags */ }, }, |
1071 | { .name = "recvmmsg", .errmsg = true, | 1071 | { .name = "recvmmsg", .errmsg = true, |
@@ -1073,7 +1073,7 @@ static struct syscall_fmt { | |||
1073 | { .name = "recvmsg", .errmsg = true, | 1073 | { .name = "recvmsg", .errmsg = true, |
1074 | .arg_scnprintf = { [2] = SCA_MSG_FLAGS, /* flags */ }, }, | 1074 | .arg_scnprintf = { [2] = SCA_MSG_FLAGS, /* flags */ }, }, |
1075 | { .name = "renameat", .errmsg = true, | 1075 | { .name = "renameat", .errmsg = true, |
1076 | .arg_scnprintf = { [0] = SCA_FDAT, /* dfd */ }, }, | 1076 | .arg_scnprintf = { [0] = SCA_FDAT, /* dfd */ }, }, |
1077 | { .name = "rt_sigaction", .errmsg = true, | 1077 | { .name = "rt_sigaction", .errmsg = true, |
1078 | .arg_scnprintf = { [0] = SCA_SIGNUM, /* sig */ }, }, | 1078 | .arg_scnprintf = { [0] = SCA_SIGNUM, /* sig */ }, }, |
1079 | { .name = "rt_sigprocmask", .errmsg = true, STRARRAY(0, how, sighow), }, | 1079 | { .name = "rt_sigprocmask", .errmsg = true, STRARRAY(0, how, sighow), }, |
@@ -1091,7 +1091,7 @@ static struct syscall_fmt { | |||
1091 | { .name = "setitimer", .errmsg = true, STRARRAY(0, which, itimers), }, | 1091 | { .name = "setitimer", .errmsg = true, STRARRAY(0, which, itimers), }, |
1092 | { .name = "setrlimit", .errmsg = true, STRARRAY(0, resource, rlimit_resources), }, | 1092 | { .name = "setrlimit", .errmsg = true, STRARRAY(0, resource, rlimit_resources), }, |
1093 | { .name = "shutdown", .errmsg = true, | 1093 | { .name = "shutdown", .errmsg = true, |
1094 | .arg_scnprintf = { [0] = SCA_FD, /* fd */ }, }, | 1094 | .arg_scnprintf = { [0] = SCA_FD, /* fd */ }, }, |
1095 | { .name = "socket", .errmsg = true, | 1095 | { .name = "socket", .errmsg = true, |
1096 | .arg_scnprintf = { [0] = SCA_STRARRAY, /* family */ | 1096 | .arg_scnprintf = { [0] = SCA_STRARRAY, /* family */ |
1097 | [1] = SCA_SK_TYPE, /* type */ }, | 1097 | [1] = SCA_SK_TYPE, /* type */ }, |
@@ -1102,7 +1102,7 @@ static struct syscall_fmt { | |||
1102 | .arg_parm = { [0] = &strarray__socket_families, /* family */ }, }, | 1102 | .arg_parm = { [0] = &strarray__socket_families, /* family */ }, }, |
1103 | { .name = "stat", .errmsg = true, .alias = "newstat", }, | 1103 | { .name = "stat", .errmsg = true, .alias = "newstat", }, |
1104 | { .name = "symlinkat", .errmsg = true, | 1104 | { .name = "symlinkat", .errmsg = true, |
1105 | .arg_scnprintf = { [0] = SCA_FDAT, /* dfd */ }, }, | 1105 | .arg_scnprintf = { [0] = SCA_FDAT, /* dfd */ }, }, |
1106 | { .name = "tgkill", .errmsg = true, | 1106 | { .name = "tgkill", .errmsg = true, |
1107 | .arg_scnprintf = { [2] = SCA_SIGNUM, /* sig */ }, }, | 1107 | .arg_scnprintf = { [2] = SCA_SIGNUM, /* sig */ }, }, |
1108 | { .name = "tkill", .errmsg = true, | 1108 | { .name = "tkill", .errmsg = true, |
@@ -1113,9 +1113,9 @@ static struct syscall_fmt { | |||
1113 | { .name = "utimensat", .errmsg = true, | 1113 | { .name = "utimensat", .errmsg = true, |
1114 | .arg_scnprintf = { [0] = SCA_FDAT, /* dirfd */ }, }, | 1114 | .arg_scnprintf = { [0] = SCA_FDAT, /* dirfd */ }, }, |
1115 | { .name = "write", .errmsg = true, | 1115 | { .name = "write", .errmsg = true, |
1116 | .arg_scnprintf = { [0] = SCA_FD, /* fd */ }, }, | 1116 | .arg_scnprintf = { [0] = SCA_FD, /* fd */ }, }, |
1117 | { .name = "writev", .errmsg = true, | 1117 | { .name = "writev", .errmsg = true, |
1118 | .arg_scnprintf = { [0] = SCA_FD, /* fd */ }, }, | 1118 | .arg_scnprintf = { [0] = SCA_FD, /* fd */ }, }, |
1119 | }; | 1119 | }; |
1120 | 1120 | ||
1121 | static int syscall_fmt__cmp(const void *name, const void *fmtp) | 1121 | static int syscall_fmt__cmp(const void *name, const void *fmtp) |
@@ -1191,7 +1191,7 @@ static struct thread_trace *thread__trace(struct thread *thread, FILE *fp) | |||
1191 | 1191 | ||
1192 | if (thread__priv(thread) == NULL) | 1192 | if (thread__priv(thread) == NULL) |
1193 | thread__set_priv(thread, thread_trace__new()); | 1193 | thread__set_priv(thread, thread_trace__new()); |
1194 | 1194 | ||
1195 | if (thread__priv(thread) == NULL) | 1195 | if (thread__priv(thread) == NULL) |
1196 | goto fail; | 1196 | goto fail; |
1197 | 1197 | ||
diff --git a/tools/perf/tests/attr.py b/tools/perf/tests/attr.py index c9b4b6269b51..1091bd47adfd 100644 --- a/tools/perf/tests/attr.py +++ b/tools/perf/tests/attr.py | |||
@@ -104,7 +104,6 @@ class Event(dict): | |||
104 | continue | 104 | continue |
105 | if not self.compare_data(self[t], other[t]): | 105 | if not self.compare_data(self[t], other[t]): |
106 | log.warning("expected %s=%s, got %s" % (t, self[t], other[t])) | 106 | log.warning("expected %s=%s, got %s" % (t, self[t], other[t])) |
107 | |||
108 | 107 | ||
109 | # Test file description needs to have following sections: | 108 | # Test file description needs to have following sections: |
110 | # [config] | 109 | # [config] |
diff --git a/tools/perf/tests/make b/tools/perf/tests/make index 69a71ff84e01..75709d2b17b4 100644 --- a/tools/perf/tests/make +++ b/tools/perf/tests/make | |||
@@ -222,7 +222,6 @@ tarpkg: | |||
222 | @cmd="$(PERF)/tests/perf-targz-src-pkg $(PERF)"; \ | 222 | @cmd="$(PERF)/tests/perf-targz-src-pkg $(PERF)"; \ |
223 | echo "- $@: $$cmd" && echo $$cmd > $@ && \ | 223 | echo "- $@: $$cmd" && echo $$cmd > $@ && \ |
224 | ( eval $$cmd ) >> $@ 2>&1 | 224 | ( eval $$cmd ) >> $@ 2>&1 |
225 | |||
226 | 225 | ||
227 | all: $(run) $(run_O) tarpkg | 226 | all: $(run) $(run_O) tarpkg |
228 | @echo OK | 227 | @echo OK |
diff --git a/tools/perf/tests/parse-events.c b/tools/perf/tests/parse-events.c index 7f2f51f93619..d188e20d958f 100644 --- a/tools/perf/tests/parse-events.c +++ b/tools/perf/tests/parse-events.c | |||
@@ -1471,7 +1471,7 @@ static int test_event(struct evlist_test *e) | |||
1471 | } else { | 1471 | } else { |
1472 | ret = e->check(evlist); | 1472 | ret = e->check(evlist); |
1473 | } | 1473 | } |
1474 | 1474 | ||
1475 | perf_evlist__delete(evlist); | 1475 | perf_evlist__delete(evlist); |
1476 | 1476 | ||
1477 | return ret; | 1477 | return ret; |
diff --git a/tools/perf/ui/browsers/annotate.c b/tools/perf/ui/browsers/annotate.c index 1e0a2fd80115..9d32e3c0cfee 100644 --- a/tools/perf/ui/browsers/annotate.c +++ b/tools/perf/ui/browsers/annotate.c | |||
@@ -517,7 +517,7 @@ static bool annotate_browser__jump(struct annotate_browser *browser) | |||
517 | } | 517 | } |
518 | 518 | ||
519 | annotate_browser__set_top(browser, dl, idx); | 519 | annotate_browser__set_top(browser, dl, idx); |
520 | 520 | ||
521 | return true; | 521 | return true; |
522 | } | 522 | } |
523 | 523 | ||
@@ -867,7 +867,6 @@ static void annotate_browser__mark_jump_targets(struct annotate_browser *browser | |||
867 | 867 | ||
868 | ++browser->nr_jumps; | 868 | ++browser->nr_jumps; |
869 | } | 869 | } |
870 | |||
871 | } | 870 | } |
872 | 871 | ||
873 | static inline int width_jumps(int n) | 872 | static inline int width_jumps(int n) |
diff --git a/tools/perf/ui/progress.h b/tools/perf/ui/progress.h index f34f89eb607c..717d39d3052b 100644 --- a/tools/perf/ui/progress.h +++ b/tools/perf/ui/progress.h | |||
@@ -4,12 +4,12 @@ | |||
4 | #include <linux/types.h> | 4 | #include <linux/types.h> |
5 | 5 | ||
6 | void ui_progress__finish(void); | 6 | void ui_progress__finish(void); |
7 | 7 | ||
8 | struct ui_progress { | 8 | struct ui_progress { |
9 | const char *title; | 9 | const char *title; |
10 | u64 curr, next, step, total; | 10 | u64 curr, next, step, total; |
11 | }; | 11 | }; |
12 | 12 | ||
13 | void ui_progress__init(struct ui_progress *p, u64 total, const char *title); | 13 | void ui_progress__init(struct ui_progress *p, u64 total, const char *title); |
14 | void ui_progress__update(struct ui_progress *p, u64 adv); | 14 | void ui_progress__update(struct ui_progress *p, u64 adv); |
15 | 15 | ||
diff --git a/tools/perf/util/annotate.c b/tools/perf/util/annotate.c index 01bc4e23a2cf..61bf9128e1f2 100644 --- a/tools/perf/util/annotate.c +++ b/tools/perf/util/annotate.c | |||
@@ -239,7 +239,7 @@ static int mov__parse(struct ins_operands *ops) | |||
239 | *s = '\0'; | 239 | *s = '\0'; |
240 | ops->source.raw = strdup(ops->raw); | 240 | ops->source.raw = strdup(ops->raw); |
241 | *s = ','; | 241 | *s = ','; |
242 | 242 | ||
243 | if (ops->source.raw == NULL) | 243 | if (ops->source.raw == NULL) |
244 | return -1; | 244 | return -1; |
245 | 245 | ||
diff --git a/tools/perf/util/parse-events.c b/tools/perf/util/parse-events.c index 77b43fe43d55..f36b80ecaf52 100644 --- a/tools/perf/util/parse-events.c +++ b/tools/perf/util/parse-events.c | |||
@@ -1121,7 +1121,7 @@ void print_tracepoint_events(const char *subsys_glob, const char *event_glob, | |||
1121 | return; | 1121 | return; |
1122 | 1122 | ||
1123 | for_each_subsystem(sys_dir, sys_dirent, sys_next) { | 1123 | for_each_subsystem(sys_dir, sys_dirent, sys_next) { |
1124 | if (subsys_glob != NULL && | 1124 | if (subsys_glob != NULL && |
1125 | !strglobmatch(sys_dirent.d_name, subsys_glob)) | 1125 | !strglobmatch(sys_dirent.d_name, subsys_glob)) |
1126 | continue; | 1126 | continue; |
1127 | 1127 | ||
@@ -1132,7 +1132,7 @@ void print_tracepoint_events(const char *subsys_glob, const char *event_glob, | |||
1132 | continue; | 1132 | continue; |
1133 | 1133 | ||
1134 | for_each_event(sys_dirent, evt_dir, evt_dirent, evt_next) { | 1134 | for_each_event(sys_dirent, evt_dir, evt_dirent, evt_next) { |
1135 | if (event_glob != NULL && | 1135 | if (event_glob != NULL && |
1136 | !strglobmatch(evt_dirent.d_name, event_glob)) | 1136 | !strglobmatch(evt_dirent.d_name, event_glob)) |
1137 | continue; | 1137 | continue; |
1138 | 1138 | ||
@@ -1305,7 +1305,7 @@ static void print_symbol_events(const char *event_glob, unsigned type, | |||
1305 | 1305 | ||
1306 | for (i = 0; i < max; i++, syms++) { | 1306 | for (i = 0; i < max; i++, syms++) { |
1307 | 1307 | ||
1308 | if (event_glob != NULL && | 1308 | if (event_glob != NULL && |
1309 | !(strglobmatch(syms->symbol, event_glob) || | 1309 | !(strglobmatch(syms->symbol, event_glob) || |
1310 | (syms->alias && strglobmatch(syms->alias, event_glob)))) | 1310 | (syms->alias && strglobmatch(syms->alias, event_glob)))) |
1311 | continue; | 1311 | continue; |
diff --git a/tools/perf/util/python.c b/tools/perf/util/python.c index 3dda85ca50c1..d906d0ad5d40 100644 --- a/tools/perf/util/python.c +++ b/tools/perf/util/python.c | |||
@@ -768,7 +768,7 @@ static PyObject *pyrf_evlist__get_pollfd(struct pyrf_evlist *pevlist, | |||
768 | Py_DECREF(file); | 768 | Py_DECREF(file); |
769 | goto free_list; | 769 | goto free_list; |
770 | } | 770 | } |
771 | 771 | ||
772 | Py_DECREF(file); | 772 | Py_DECREF(file); |
773 | } | 773 | } |
774 | 774 | ||
diff --git a/tools/perf/util/scripting-engines/trace-event-python.c b/tools/perf/util/scripting-engines/trace-event-python.c index d808a328f4dc..0c815a40a6e8 100644 --- a/tools/perf/util/scripting-engines/trace-event-python.c +++ b/tools/perf/util/scripting-engines/trace-event-python.c | |||
@@ -89,7 +89,7 @@ static void handler_call_die(const char *handler_name) | |||
89 | 89 | ||
90 | /* | 90 | /* |
91 | * Insert val into into the dictionary and decrement the reference counter. | 91 | * Insert val into into the dictionary and decrement the reference counter. |
92 | * This is necessary for dictionaries since PyDict_SetItemString() does not | 92 | * This is necessary for dictionaries since PyDict_SetItemString() does not |
93 | * steal a reference, as opposed to PyTuple_SetItem(). | 93 | * steal a reference, as opposed to PyTuple_SetItem(). |
94 | */ | 94 | */ |
95 | static void pydict_set_item_string_decref(PyObject *dict, const char *key, PyObject *val) | 95 | static void pydict_set_item_string_decref(PyObject *dict, const char *key, PyObject *val) |
diff --git a/tools/perf/util/session.c b/tools/perf/util/session.c index 5f0e05a76c05..b0ce3d6e6231 100644 --- a/tools/perf/util/session.c +++ b/tools/perf/util/session.c | |||
@@ -274,7 +274,7 @@ void perf_tool__fill_defaults(struct perf_tool *tool) | |||
274 | if (tool->id_index == NULL) | 274 | if (tool->id_index == NULL) |
275 | tool->id_index = process_id_index_stub; | 275 | tool->id_index = process_id_index_stub; |
276 | } | 276 | } |
277 | 277 | ||
278 | static void swap_sample_id_all(union perf_event *event, void *data) | 278 | static void swap_sample_id_all(union perf_event *event, void *data) |
279 | { | 279 | { |
280 | void *end = (void *) event + event->header.size; | 280 | void *end = (void *) event + event->header.size; |
diff --git a/tools/perf/util/symbol.c b/tools/perf/util/symbol.c index a194702a0a2f..a69066865a55 100644 --- a/tools/perf/util/symbol.c +++ b/tools/perf/util/symbol.c | |||
@@ -685,7 +685,7 @@ static int dso__split_kallsyms(struct dso *dso, struct map *map, u64 delta, | |||
685 | struct machine *machine = kmaps->machine; | 685 | struct machine *machine = kmaps->machine; |
686 | struct map *curr_map = map; | 686 | struct map *curr_map = map; |
687 | struct symbol *pos; | 687 | struct symbol *pos; |
688 | int count = 0, moved = 0; | 688 | int count = 0, moved = 0; |
689 | struct rb_root *root = &dso->symbols[map->type]; | 689 | struct rb_root *root = &dso->symbols[map->type]; |
690 | struct rb_node *next = rb_first(root); | 690 | struct rb_node *next = rb_first(root); |
691 | int kernel_range = 0; | 691 | int kernel_range = 0; |