perf session: Remove perf_session from warn_errors signature
tip-bot for Arnaldo Carvalho de Melo
merge botCommit-ID: ccda068f96138734eb40e9202ea9562566b43c12 Gitweb: http://git.kernel.org/tip/ccda068f96138734eb40e9202ea9562566b43c12 Author: Arnaldo Carvalho de Melo <[email protected]> AuthorDate: Sat, 14 Feb 2015 14:57:13 -0300 Committer: Arnaldo Carvalho de Melo <[email protected]> CommitDate: Sun, 22 Feb 2015 22:23:23 -0300
perf session: Remove perf_session from warn_errors signature
Cc Adrian Hunter <[email protected]>
Cc Borislav Petkov <[email protected]>
Cc David Ahern <[email protected]>
Cc Don Zickus <[email protected]>
Cc Frederic Weisbecker <[email protected]>
Cc Jiri Olsa <[email protected]>
Cc Mike Galbraith <[email protected]>
Cc Namhyung Kim <[email protected]>
Cc Peter Zijlstra <[email protected]>
Cc Stephane Eranian <[email protected]>
Signed-off-by Arnaldo Carvalho de Melo <[email protected]>
--- tools/perf/util/session.c | 36 ++++++++++++++++++------------------ 1 file changed, 18 insertions(+), 18 deletions(-)
tools/perf/util/session.c +18 -18
@@ -1125,47 +1125,47 @@ static struct thread *perf_session__register_idle_thread(struct perf_session *sereturn thread; } -static void perf_session__warn_about_errors (const struct perf_session *session, -const struct perf_tool *tool) +static void perf_tool__warn_about_errors (const struct perf_tool *tool, +const struct events_stats *stats) {if (tool->lost == perf_event__process_lost && - session->evlist->stats.nr_events[PERF_RECORD_LOST ] !=0 ) { + stats->nr_events[PERF_RECORD_LOST ] !=0 ) {ui__warning ("Processed %d events and lost %d chunks!\n\n" "Check IO/CPU overload!\n\n" , - session->evlist->stats.nr_events[0 ], - session->evlist->stats.nr_events[PERF_RECORD_LOST ]); + stats->nr_events[0 ], + stats->nr_events[PERF_RECORD_LOST ]); } -if (session->evlist->stats.nr_unknown_events !=0 ) { +if (stats->nr_unknown_events !=0 ) {ui__warning ("Found %u unknown events!\n\n" "Is this an older tool processing a perf.data " "file generated by a more recent tool?\n\n" "If that is not the case, consider " "reporting to [email protected].\n\n" , - session->evlist->stats.nr_unknown_events); + stats->nr_unknown_events); } -if (session->evlist->stats.nr_unknown_id !=0 ) { +if (stats->nr_unknown_id !=0 ) {ui__warning ("%u samples with id not present in the header\n" , - session->evlist->stats.nr_unknown_id); + stats->nr_unknown_id); } -if (session->evlist->stats.nr_invalid_chains !=0 ) { +if (stats->nr_invalid_chains !=0 ) {ui__warning ("Found invalid callchains!\n\n" "%u out of %u events were discarded for this reason.\n\n" "Consider reporting to [email protected].\n\n" , - session->evlist->stats.nr_invalid_chains, - session->evlist->stats.nr_events[PERF_RECORD_SAMPLE ]); + stats->nr_invalid_chains, + stats->nr_events[PERF_RECORD_SAMPLE ]); } -if (session->evlist->stats.nr_unprocessable_samples !=0 ) { +if (stats->nr_unprocessable_samples !=0 ) {ui__warning ("%u unprocessable samples recorded.\n" "Do you have a KVM guest running and not using 'perf kvm'?\n" , - session->evlist->stats.nr_unprocessable_samples); + stats->nr_unprocessable_samples); } -if (session->evlist->stats.nr_unordered_events !=0 ) -ui__warning ("%u out of order events recorded.\n" , session->evlist->stats.nr_unordered_events); +if (stats->nr_unordered_events !=0 ) +ui__warning ("%u out of order events recorded.\n" , stats->nr_unordered_events); }volatile int session_done;
@@ -1255,7 +1255,7 @@ done: err =ordered_events__flush (session, tool,OE_FLUSH__FINAL ); out_err:free (buf); -perf_session__warn_about_errors (session, tool); +perf_tool__warn_about_errors (tool, &session->evlist->stats);ordered_events__free (&session->ordered_events);return err; }
@@ -1400,7 +1400,7 @@ out: err =ordered_events__flush (session, tool,OE_FLUSH__FINAL ); out_err:ui_progress__finish (); -perf_session__warn_about_errors (session, tool); +perf_tool__warn_about_errors (tool, &session->evlist->stats);ordered_events__free (&session->ordered_events); session->one_mmap = false;return err;