perf symbols: Add 'machine' member to struct addr_location

The addr_location struct should fully qualify an address, and to do that
it should have in it the machine where the thread was found.

Thus all functions that receive an addr_location now don't need to also
receive a 'machine', those functions just need to access al->machine
instead, just like it does with the other parts of an address location:
al->thread, al->map, etc.

Cc: Adrian Hunter <adrian.hunter@intel.com>
Cc: David Ahern <dsahern@gmail.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: Paul Mackerras <paulus@samba.org>
Cc: Peter Zijlstra <peterz@infradead.org>
Cc: Stephane Eranian <eranian@google.com>
Link: http://lkml.kernel.org/n/tip-o51iiee7vyq4r3k362uvuylg@git.kernel.org
Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>

1 files changed, 7 insertions, 9 deletions

diff --git a/tools/perf/builtin-script.c b/tools/perf/builtin-script.c
index f8ab125aac48..62ef190c4320 100644
--- a/tools/perf/builtin-script.c
+++ b/tools/perf/builtin-script.c
@@ -423,7 +423,6 @@ static void print_sample_addr(union perf_event *event,
 static void print_sample_bts(union perf_event *event,
                              struct perf_sample *sample,
                              struct perf_evsel *evsel,
-                             struct machine *machine,
                              struct thread *thread,
                              struct addr_location *al)
 {
@@ -435,7 +434,7 @@ static void print_sample_bts(union perf_event *event,
                         printf(" ");
                 else
                         printf("\n");
-                perf_evsel__print_ip(evsel, sample, machine, al,
+                perf_evsel__print_ip(evsel, sample, al,
                                      output[attr->type].print_ip_opts,
                                      PERF_MAX_STACK_DEPTH);
         }
@@ -446,14 +445,13 @@ static void print_sample_bts(union perf_event *event,
         if (PRINT_FIELD(ADDR) ||
             ((evsel->attr.sample_type & PERF_SAMPLE_ADDR) &&
              !output[attr->type].user_set))
-                print_sample_addr(event, sample, machine, thread, attr);
+                print_sample_addr(event, sample, al->machine, thread, attr);
 
         printf("\n");
 }
 
 static void process_event(union perf_event *event, struct perf_sample *sample,
-                          struct perf_evsel *evsel, struct machine *machine,
-                          struct thread *thread,
+                          struct perf_evsel *evsel, struct thread *thread,
                           struct addr_location *al)
 {
         struct perf_event_attr *attr = &evsel->attr;
@@ -469,7 +467,7 @@ static void process_event(union perf_event *event, struct perf_sample *sample,
         }
 
         if (is_bts_event(attr)) {
-                print_sample_bts(event, sample, evsel, machine, thread, al);
+                print_sample_bts(event, sample, evsel, thread, al);
                 return;
         }
 
@@ -477,7 +475,7 @@ static void process_event(union perf_event *event, struct perf_sample *sample,
                 event_format__print(evsel->tp_format, sample->cpu,
                                     sample->raw_data, sample->raw_size);
         if (PRINT_FIELD(ADDR))
-                print_sample_addr(event, sample, machine, thread, attr);
+                print_sample_addr(event, sample, al->machine, thread, attr);
 
         if (PRINT_FIELD(IP)) {
                 if (!symbol_conf.use_callchain)
@@ -485,7 +483,7 @@ static void process_event(union perf_event *event, struct perf_sample *sample,
                 else
                         printf("\n");
 
-                perf_evsel__print_ip(evsel, sample, machine, al,
+                perf_evsel__print_ip(evsel, sample, al,
                                      output[attr->type].print_ip_opts,
                                      PERF_MAX_STACK_DEPTH);
         }
@@ -574,7 +572,7 @@ static int process_sample_event(struct perf_tool *tool __maybe_unused,
         if (cpu_list && !test_bit(sample->cpu, cpu_bitmap))
                 return 0;
 
-        scripting_ops->process_event(event, sample, evsel, machine, thread, &al);
+        scripting_ops->process_event(event, sample, evsel, thread, &al);
 
         evsel->hists.stats.total_period += sample->period;
         return 0;