perf tools: Use evsel->attr.sample_type instead of session->sample_type
Commit-ID: e3f42609628a20da92ecbc2d81053cc82c90a071 Gitweb: http://git.kernel.org/tip/e3f42609628a20da92ecbc2d81053cc82c90a071 Author: Arnaldo Carvalho de Melo <[email protected]> AuthorDate: Wed, 16 Nov 2011 17:02:54 -0200 Committer: Arnaldo Carvalho de Melo <[email protected]> CommitDate: Mon, 28 Nov 2011 10:38:14 -0200
perf tools: Use evsel->attr.sample_type instead of session->sample_type
Eventually session->sample_type will go away as we want to support multiple sample types per session, so use it from the evsel which is a step in that direction.
Cc David Ahern <[email protected]>
Cc Frederic Weisbecker <[email protected]>
Cc Mike Galbraith <[email protected]>
Cc Paul Mackerras <[email protected]>
Cc Peter Zijlstra <[email protected]>
Cc Stephane Eranian <[email protected]>
Signed-off-by Arnaldo Carvalho de Melo <[email protected]>
--- tools/perf/builtin-sched.c | 5 +++-- tools/perf/builtin-timechart.c | 9 +++++---- 2 files changed, 8 insertions(+), 6 deletions(-)
tools/perf/builtin-sched.c +3 -2
@@ -3,6 +3,7 @@#include "util/util.h" #include "util/cache.h" +#include "util/evsel.h" #include "util/symbol.h" #include "util/thread.h" #include "util/header.h"
@@ -1603,12 +1604,12 @@ static void process_raw_event(union perf_event *raw_event __used,static int process_sample_event (union perf_event *event,struct perf_sample *sample, -struct perf_evsel *evsel__used , +struct perf_evsel *evsel,struct perf_session *session) {struct thread *thread; -if (!(session->sample_type &PERF_SAMPLE_RAW )) +if (!(evsel->attr.sample_type &PERF_SAMPLE_RAW ))return 0 ; thread =perf_session__findnew (session, sample->pid);
tools/perf/builtin-timechart.c +5 -4
@@ -19,6 +19,7 @@#include "util/color.h" #include <linux/list.h> #include "util/cache.h" +#include "util/evsel.h" #include <linux/rbtree.h> #include "util/symbol.h" #include "util/callchain.h"
@@ -488,12 +489,12 @@ static void sched_switch(int cpu, u64 timestamp, struct trace_entry *te)static int process_sample_event (union perf_event *event__used ,struct perf_sample *sample, -struct perf_evsel *evsel__used , -struct perf_session *session) +struct perf_evsel *evsel, +struct perf_session *session__used ) {struct trace_entry *te; -if (session->sample_type &PERF_SAMPLE_TIME ) { +if (evsel->attr.sample_type &PERF_SAMPLE_TIME ) {if (!first_time || first_time > sample->time) first_time = sample->time;if (last_time < sample->time)
@@ -501,7 +502,7 @@ static int process_sample_event(union perf_event *event __used, } te = (void *)sample->raw_data; -if (session->sample_type &PERF_SAMPLE_RAW && sample->raw_size >0 ) { +if ((evsel->attr.sample_type &PERF_SAMPLE_RAW ) && sample->raw_size >0 ) {char *event_str;#ifdef SUPPORT_OLD_POWER_EVENTS struct power_entry_old *peo;