leandrof/linux
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

perf session: Remove wrappers to machines__find

Browse Source 
Start to untangle session from delivering samples, as there are
tools that want to use ordered_events and don't use perf_session at all.

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: Peter Zijlstra <peterz@infradead.org>
Cc: Stephane Eranian <eranian@google.com>
Link: http://lkml.kernel.org/n/tip-rn4pk3pjxd78sgzrkn19tktp@git.kernel.org
Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
This commit is contained in:
Arnaldo Carvalho de Melo 2015-02-14 14:26:15 -03:00
parent ddbb1b1310
commit 54245fdc35
1 changed files with 5 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
tools/perf/util/session.c
View File

@ -797,8 +797,7 @@ static void dump_sample(struct perf_evsel *evsel, union perf_event *event,
sample_read__printf(sample, evsel->attr.read_format); sample_read__printf(sample, evsel->attr.read_format);
} }
static struct machine * static struct machine *machines__find_for_cpumode(struct machines *machines,
perf_session__find_machine_for_cpumode(struct perf_session *session,
union perf_event *event, union perf_event *event,
struct perf_sample *sample) struct perf_sample *sample)
{ {
@ -816,14 +815,13 @@ static struct machine *
else else
pid = sample->pid; pid = sample->pid;
machine = perf_session__find_machine(session, pid); machine = machines__find(machines, pid);
if (!machine) if (!machine)
machine = perf_session__findnew_machine(session, machine = machines__find(machines, DEFAULT_GUEST_KERNEL_ID);
DEFAULT_GUEST_KERNEL_ID);
return machine; return machine;
} }
return &session->machines.host; return &machines->host;
} }
static int deliver_sample_value(struct perf_session *session, static int deliver_sample_value(struct perf_session *session,
@ -907,8 +905,7 @@ int perf_session__deliver_event(struct perf_session *session,
evsel = perf_evlist__id2evsel(session->evlist, sample->id); evsel = perf_evlist__id2evsel(session->evlist, sample->id);
machine = perf_session__find_machine_for_cpumode(session, event, machine = machines__find_for_cpumode(&session->machines, event, sample);
sample);
switch (event->header.type) { switch (event->header.type) {
case PERF_RECORD_SAMPLE: case PERF_RECORD_SAMPLE: