diff options
Diffstat (limited to 'tools')
-rw-r--r-- | tools/perf/bench/sched-pipe.c | 2 | ||||
-rw-r--r-- | tools/perf/builtin-sched.c | 12 | ||||
-rw-r--r-- | tools/perf/builtin-top.c | 2 | ||||
-rw-r--r-- | tools/perf/util/annotate.c | 3 | ||||
-rw-r--r-- | tools/perf/util/header.c | 2 | ||||
-rw-r--r-- | tools/perf/util/scripting-engines/trace-event-python.c | 3 | ||||
-rw-r--r-- | tools/perf/util/symbol.c | 4 | ||||
-rw-r--r-- | tools/perf/util/trace-event-parse.c | 2 | ||||
-rw-r--r-- | tools/perf/util/ui/browsers/map.c | 2 |
9 files changed, 11 insertions, 21 deletions
diff --git a/tools/perf/bench/sched-pipe.c b/tools/perf/bench/sched-pipe.c index d9ab3ce446ac..0c7454f8b8a9 100644 --- a/tools/perf/bench/sched-pipe.c +++ b/tools/perf/bench/sched-pipe.c | |||
@@ -55,7 +55,7 @@ int bench_sched_pipe(int argc, const char **argv, | |||
55 | * discarding returned value of read(), write() | 55 | * discarding returned value of read(), write() |
56 | * causes error in building environment for perf | 56 | * causes error in building environment for perf |
57 | */ | 57 | */ |
58 | int ret, wait_stat; | 58 | int __used ret, wait_stat; |
59 | pid_t pid, retpid; | 59 | pid_t pid, retpid; |
60 | 60 | ||
61 | argc = parse_options(argc, argv, options, | 61 | argc = parse_options(argc, argv, options, |
diff --git a/tools/perf/builtin-sched.c b/tools/perf/builtin-sched.c index ae2621182927..a32f411faeac 100644 --- a/tools/perf/builtin-sched.c +++ b/tools/perf/builtin-sched.c | |||
@@ -369,11 +369,6 @@ static void | |||
369 | process_sched_event(struct task_desc *this_task __used, struct sched_atom *atom) | 369 | process_sched_event(struct task_desc *this_task __used, struct sched_atom *atom) |
370 | { | 370 | { |
371 | int ret = 0; | 371 | int ret = 0; |
372 | u64 now; | ||
373 | long long delta; | ||
374 | |||
375 | now = get_nsecs(); | ||
376 | delta = start_time + atom->timestamp - now; | ||
377 | 372 | ||
378 | switch (atom->type) { | 373 | switch (atom->type) { |
379 | case SCHED_EVENT_RUN: | 374 | case SCHED_EVENT_RUN: |
@@ -562,7 +557,7 @@ static void wait_for_tasks(void) | |||
562 | 557 | ||
563 | static void run_one_test(void) | 558 | static void run_one_test(void) |
564 | { | 559 | { |
565 | u64 T0, T1, delta, avg_delta, fluct, std_dev; | 560 | u64 T0, T1, delta, avg_delta, fluct; |
566 | 561 | ||
567 | T0 = get_nsecs(); | 562 | T0 = get_nsecs(); |
568 | wait_for_tasks(); | 563 | wait_for_tasks(); |
@@ -578,7 +573,6 @@ static void run_one_test(void) | |||
578 | else | 573 | else |
579 | fluct = delta - avg_delta; | 574 | fluct = delta - avg_delta; |
580 | sum_fluct += fluct; | 575 | sum_fluct += fluct; |
581 | std_dev = sum_fluct / nr_runs / sqrt(nr_runs); | ||
582 | if (!run_avg) | 576 | if (!run_avg) |
583 | run_avg = delta; | 577 | run_avg = delta; |
584 | run_avg = (run_avg*9 + delta)/10; | 578 | run_avg = (run_avg*9 + delta)/10; |
@@ -799,7 +793,7 @@ replay_switch_event(struct trace_switch_event *switch_event, | |||
799 | u64 timestamp, | 793 | u64 timestamp, |
800 | struct thread *thread __used) | 794 | struct thread *thread __used) |
801 | { | 795 | { |
802 | struct task_desc *prev, *next; | 796 | struct task_desc *prev, __used *next; |
803 | u64 timestamp0; | 797 | u64 timestamp0; |
804 | s64 delta; | 798 | s64 delta; |
805 | 799 | ||
@@ -1404,7 +1398,7 @@ map_switch_event(struct trace_switch_event *switch_event, | |||
1404 | u64 timestamp, | 1398 | u64 timestamp, |
1405 | struct thread *thread __used) | 1399 | struct thread *thread __used) |
1406 | { | 1400 | { |
1407 | struct thread *sched_out, *sched_in; | 1401 | struct thread *sched_out __used, *sched_in; |
1408 | int new_shortname; | 1402 | int new_shortname; |
1409 | u64 timestamp0; | 1403 | u64 timestamp0; |
1410 | s64 delta; | 1404 | s64 delta; |
diff --git a/tools/perf/builtin-top.c b/tools/perf/builtin-top.c index 716118a3b3e4..b790673cb0aa 100644 --- a/tools/perf/builtin-top.c +++ b/tools/perf/builtin-top.c | |||
@@ -865,7 +865,7 @@ static int __cmd_top(void) | |||
865 | { | 865 | { |
866 | pthread_t thread; | 866 | pthread_t thread; |
867 | struct perf_evsel *first; | 867 | struct perf_evsel *first; |
868 | int ret; | 868 | int ret __used; |
869 | /* | 869 | /* |
870 | * FIXME: perf_session__new should allow passing a O_MMAP, so that all this | 870 | * FIXME: perf_session__new should allow passing a O_MMAP, so that all this |
871 | * mmap reading, etc is encapsulated in it. Use O_WRONLY for now. | 871 | * mmap reading, etc is encapsulated in it. Use O_WRONLY for now. |
diff --git a/tools/perf/util/annotate.c b/tools/perf/util/annotate.c index 297337649c21..1012841835a3 100644 --- a/tools/perf/util/annotate.c +++ b/tools/perf/util/annotate.c | |||
@@ -236,7 +236,6 @@ int symbol__annotate(struct symbol *sym, struct map *map, | |||
236 | char command[PATH_MAX * 2]; | 236 | char command[PATH_MAX * 2]; |
237 | FILE *file; | 237 | FILE *file; |
238 | int err = 0; | 238 | int err = 0; |
239 | u64 len; | ||
240 | char symfs_filename[PATH_MAX]; | 239 | char symfs_filename[PATH_MAX]; |
241 | 240 | ||
242 | if (filename) { | 241 | if (filename) { |
@@ -281,8 +280,6 @@ fallback: | |||
281 | filename, sym->name, map->unmap_ip(map, sym->start), | 280 | filename, sym->name, map->unmap_ip(map, sym->start), |
282 | map->unmap_ip(map, sym->end)); | 281 | map->unmap_ip(map, sym->end)); |
283 | 282 | ||
284 | len = sym->end - sym->start; | ||
285 | |||
286 | pr_debug("annotating [%p] %30s : [%p] %30s\n", | 283 | pr_debug("annotating [%p] %30s : [%p] %30s\n", |
287 | dso, dso->long_name, sym, sym->name); | 284 | dso, dso->long_name, sym, sym->name); |
288 | 285 | ||
diff --git a/tools/perf/util/header.c b/tools/perf/util/header.c index c0de5ec44145..72c124dc5781 100644 --- a/tools/perf/util/header.c +++ b/tools/perf/util/header.c | |||
@@ -1145,7 +1145,7 @@ int perf_event__synthesize_tracing_data(int fd, struct perf_evlist *evlist, | |||
1145 | { | 1145 | { |
1146 | union perf_event ev; | 1146 | union perf_event ev; |
1147 | ssize_t size = 0, aligned_size = 0, padding; | 1147 | ssize_t size = 0, aligned_size = 0, padding; |
1148 | int err = 0; | 1148 | int err __used = 0; |
1149 | 1149 | ||
1150 | memset(&ev, 0, sizeof(ev)); | 1150 | memset(&ev, 0, sizeof(ev)); |
1151 | 1151 | ||
diff --git a/tools/perf/util/scripting-engines/trace-event-python.c b/tools/perf/util/scripting-engines/trace-event-python.c index c6d99334bdfa..2040b8538527 100644 --- a/tools/perf/util/scripting-engines/trace-event-python.c +++ b/tools/perf/util/scripting-engines/trace-event-python.c | |||
@@ -248,8 +248,7 @@ static void python_process_event(int cpu, void *data, | |||
248 | context = PyCObject_FromVoidPtr(scripting_context, NULL); | 248 | context = PyCObject_FromVoidPtr(scripting_context, NULL); |
249 | 249 | ||
250 | PyTuple_SetItem(t, n++, PyString_FromString(handler_name)); | 250 | PyTuple_SetItem(t, n++, PyString_FromString(handler_name)); |
251 | PyTuple_SetItem(t, n++, | 251 | PyTuple_SetItem(t, n++, context); |
252 | PyCObject_FromVoidPtr(scripting_context, NULL)); | ||
253 | 252 | ||
254 | if (handler) { | 253 | if (handler) { |
255 | PyTuple_SetItem(t, n++, PyInt_FromLong(cpu)); | 254 | PyTuple_SetItem(t, n++, PyInt_FromLong(cpu)); |
diff --git a/tools/perf/util/symbol.c b/tools/perf/util/symbol.c index 7821d0e6866f..3e193f8e3061 100644 --- a/tools/perf/util/symbol.c +++ b/tools/perf/util/symbol.c | |||
@@ -1525,8 +1525,8 @@ int dso__load(struct dso *self, struct map *map, symbol_filter_t filter) | |||
1525 | symbol_conf.symfs, self->long_name); | 1525 | symbol_conf.symfs, self->long_name); |
1526 | break; | 1526 | break; |
1527 | case DSO__ORIG_GUEST_KMODULE: | 1527 | case DSO__ORIG_GUEST_KMODULE: |
1528 | if (map->groups && map->groups->machine) | 1528 | if (map->groups && machine) |
1529 | root_dir = map->groups->machine->root_dir; | 1529 | root_dir = machine->root_dir; |
1530 | else | 1530 | else |
1531 | root_dir = ""; | 1531 | root_dir = ""; |
1532 | snprintf(name, size, "%s%s%s", symbol_conf.symfs, | 1532 | snprintf(name, size, "%s%s%s", symbol_conf.symfs, |
diff --git a/tools/perf/util/trace-event-parse.c b/tools/perf/util/trace-event-parse.c index 73a02223c629..d8e622dd738a 100644 --- a/tools/perf/util/trace-event-parse.c +++ b/tools/perf/util/trace-event-parse.c | |||
@@ -153,7 +153,7 @@ void parse_proc_kallsyms(char *file, unsigned int size __unused) | |||
153 | char *next = NULL; | 153 | char *next = NULL; |
154 | char *addr_str; | 154 | char *addr_str; |
155 | char ch; | 155 | char ch; |
156 | int ret; | 156 | int ret __used; |
157 | int i; | 157 | int i; |
158 | 158 | ||
159 | line = strtok_r(file, "\n", &next); | 159 | line = strtok_r(file, "\n", &next); |
diff --git a/tools/perf/util/ui/browsers/map.c b/tools/perf/util/ui/browsers/map.c index e5158369106e..8462bffe20bc 100644 --- a/tools/perf/util/ui/browsers/map.c +++ b/tools/perf/util/ui/browsers/map.c | |||
@@ -41,7 +41,7 @@ static int ui_entry__read(const char *title, char *bf, size_t size, int width) | |||
41 | out_free_form: | 41 | out_free_form: |
42 | newtPopWindow(); | 42 | newtPopWindow(); |
43 | newtFormDestroy(form); | 43 | newtFormDestroy(form); |
44 | return 0; | 44 | return err; |
45 | } | 45 | } |
46 | 46 | ||
47 | struct map_browser { | 47 | struct map_browser { |