diff options
Diffstat (limited to 'tools/perf/builtin-annotate.c')
| -rw-r--r-- | tools/perf/builtin-annotate.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/tools/perf/builtin-annotate.c b/tools/perf/builtin-annotate.c index c38373195c4a..2d06be81a109 100644 --- a/tools/perf/builtin-annotate.c +++ b/tools/perf/builtin-annotate.c | |||
| @@ -356,7 +356,7 @@ static int __cmd_annotate(struct perf_annotate *ann) | |||
| 356 | } | 356 | } |
| 357 | 357 | ||
| 358 | if (total_nr_samples == 0) { | 358 | if (total_nr_samples == 0) { |
| 359 | ui__error("The %s file has no samples!\n", session->file->path); | 359 | ui__error("The %s file has no samples!\n", session->data->path); |
| 360 | goto out; | 360 | goto out; |
| 361 | } | 361 | } |
| 362 | 362 | ||
| @@ -400,7 +400,7 @@ int cmd_annotate(int argc, const char **argv) | |||
| 400 | .ordering_requires_timestamps = true, | 400 | .ordering_requires_timestamps = true, |
| 401 | }, | 401 | }, |
| 402 | }; | 402 | }; |
| 403 | struct perf_data_file file = { | 403 | struct perf_data data = { |
| 404 | .mode = PERF_DATA_MODE_READ, | 404 | .mode = PERF_DATA_MODE_READ, |
| 405 | }; | 405 | }; |
| 406 | struct option options[] = { | 406 | struct option options[] = { |
| @@ -410,7 +410,7 @@ int cmd_annotate(int argc, const char **argv) | |||
| 410 | "only consider symbols in these dsos"), | 410 | "only consider symbols in these dsos"), |
| 411 | OPT_STRING('s', "symbol", &annotate.sym_hist_filter, "symbol", | 411 | OPT_STRING('s', "symbol", &annotate.sym_hist_filter, "symbol", |
| 412 | "symbol to annotate"), | 412 | "symbol to annotate"), |
| 413 | OPT_BOOLEAN('f', "force", &file.force, "don't complain, do it"), | 413 | OPT_BOOLEAN('f', "force", &data.force, "don't complain, do it"), |
| 414 | OPT_INCR('v', "verbose", &verbose, | 414 | OPT_INCR('v', "verbose", &verbose, |
| 415 | "be more verbose (show symbol address, etc)"), | 415 | "be more verbose (show symbol address, etc)"), |
| 416 | OPT_BOOLEAN('q', "quiet", &quiet, "do now show any message"), | 416 | OPT_BOOLEAN('q', "quiet", &quiet, "do now show any message"), |
| @@ -482,9 +482,9 @@ int cmd_annotate(int argc, const char **argv) | |||
| 482 | if (quiet) | 482 | if (quiet) |
| 483 | perf_quiet_option(); | 483 | perf_quiet_option(); |
| 484 | 484 | ||
| 485 | file.path = input_name; | 485 | data.path = input_name; |
| 486 | 486 | ||
| 487 | annotate.session = perf_session__new(&file, false, &annotate.tool); | 487 | annotate.session = perf_session__new(&data, false, &annotate.tool); |
| 488 | if (annotate.session == NULL) | 488 | if (annotate.session == NULL) |
| 489 | return -1; | 489 | return -1; |
| 490 | 490 | ||
