Commit ef89325f authored by Adrian Hunter's avatar Adrian Hunter Committed by Arnaldo Carvalho de Melo
Browse files

perf tools: Remove references to struct ip_event 



The ip_event struct assumes fixed positions for ip, pid and tid.  That
is no longer true with the addition of PERF_SAMPLE_IDENTIFIER.  The
information is anyway in struct sample, so use that instead.

Signed-off-by: default avatarAdrian Hunter <adrian.hunter@intel.com>
Acked-by: default avatarNamhyung Kim <namhyung@kernel.org>
Cc: David Ahern <dsahern@gmail.com>
Cc: Frederic Weisbecker <fweisbec@gmail.com>
Cc: Ingo Molnar <mingo@kernel.org>
Cc: Jiri Olsa <jolsa@redhat.com>
Cc: Mike Galbraith <efault@gmx.de>
Cc: Namhyung Kim <namhyung@gmail.com>
Cc: Paul Mackerras <paulus@samba.org>
Cc: Peter Zijlstra <peterz@infradead.org>
Cc: Stephane Eranian <eranian@google.com>
Link: http://lkml.kernel.org/r/1377591794-30553-5-git-send-email-adrian.hunter@intel.com


Signed-off-by: default avatarArnaldo Carvalho de Melo <acme@redhat.com>
parent 07940293

tools/perf/builtin-inject.c

+2 −2
Original line number Original line Diff line number Diff line
@@ -198,7 +198,7 @@ static int perf_event__inject_buildid(struct perf_tool *tool, 




	cpumode = event->header.misc & PERF_RECORD_MISC_CPUMODE_MASK;

	cpumode = event->header.misc & PERF_RECORD_MISC_CPUMODE_MASK;





	thread = machine__findnew_thread(machine, event->ip.pid, event->ip.pid);

	thread = machine__findnew_thread(machine, sample->pid, sample->pid);

	if (thread == NULL) {

	if (thread == NULL) {

		pr_err("problem processing %d event, skipping it.\n",

		pr_err("problem processing %d event, skipping it.\n",

		       event->header.type);

		       event->header.type);
@@ -206,7 +206,7 @@ static int perf_event__inject_buildid(struct perf_tool *tool, 
	}

	}





	thread__find_addr_map(thread, machine, cpumode, MAP__FUNCTION,

	thread__find_addr_map(thread, machine, cpumode, MAP__FUNCTION,

			      event->ip.ip, &al);

			      sample->ip, &al);





	if (al.map != NULL) {

	if (al.map != NULL) {

		if (!al.map->dso->hit) {

		if (!al.map->dso->hit) {

tools/perf/builtin-kmem.c

+2 −2
Original line number Original line Diff line number Diff line
@@ -305,8 +305,8 @@ static int process_sample_event(struct perf_tool *tool __maybe_unused, 
				struct perf_evsel *evsel,

				struct perf_evsel *evsel,

				struct machine *machine)

				struct machine *machine)

{

{

	struct thread *thread = machine__findnew_thread(machine, event->ip.pid,

	struct thread *thread = machine__findnew_thread(machine, sample->pid,

							event->ip.pid);

							sample->pid);





	if (thread == NULL) {

	if (thread == NULL) {

		pr_debug("problem processing %d event, skipping it.\n",

		pr_debug("problem processing %d event, skipping it.\n",

tools/perf/builtin-mem.c

+1 −1
Original line number Original line Diff line number Diff line
@@ -94,7 +94,7 @@ dump_raw_samples(struct perf_tool *tool, 
		symbol_conf.field_sep,

		symbol_conf.field_sep,

		sample->tid,

		sample->tid,

		symbol_conf.field_sep,

		symbol_conf.field_sep,

		event->ip.ip,

		sample->ip,

		symbol_conf.field_sep,

		symbol_conf.field_sep,

		sample->addr,

		sample->addr,

		symbol_conf.field_sep,

		symbol_conf.field_sep,

tools/perf/builtin-script.c

+2 −2
Original line number Original line Diff line number Diff line
@@ -501,8 +501,8 @@ static int process_sample_event(struct perf_tool *tool __maybe_unused, 
				struct machine *machine)

				struct machine *machine)

{

{

	struct addr_location al;

	struct addr_location al;

	struct thread *thread = machine__findnew_thread(machine, event->ip.pid,

	struct thread *thread = machine__findnew_thread(machine, sample->pid,

							event->ip.tid);

							sample->tid);





	if (thread == NULL) {

	if (thread == NULL) {

		pr_debug("problem processing %d event, skipping it.\n",

		pr_debug("problem processing %d event, skipping it.\n",

tools/perf/builtin-top.c

+6 −5
Original line number Original line Diff line number Diff line
@@ -689,7 +689,7 @@ static void perf_event__process_sample(struct perf_tool *tool, 
{

{

	struct perf_top *top = container_of(tool, struct perf_top, tool);

	struct perf_top *top = container_of(tool, struct perf_top, tool);

	struct symbol *parent = NULL;

	struct symbol *parent = NULL;

	u64 ip = event->ip.ip;

	u64 ip = sample->ip;

	struct addr_location al;

	struct addr_location al;

	int err;

	int err;
@@ -699,10 +699,10 @@ static void perf_event__process_sample(struct perf_tool *tool, 
		if (!seen)

		if (!seen)

			seen = intlist__new(NULL);

			seen = intlist__new(NULL);





		if (!intlist__has_entry(seen, event->ip.pid)) {

		if (!intlist__has_entry(seen, sample->pid)) {

			pr_err("Can't find guest [%d]'s kernel information\n",

			pr_err("Can't find guest [%d]'s kernel information\n",

				event->ip.pid);

				sample->pid);

			intlist__add(seen, event->ip.pid);

			intlist__add(seen, sample->pid);

		}

		}

		return;

		return;

	}

	}
@@ -836,7 +836,8 @@ static void perf_top__mmap_read_idx(struct perf_top *top, int idx) 
			break;

			break;

		case PERF_RECORD_MISC_GUEST_KERNEL:

		case PERF_RECORD_MISC_GUEST_KERNEL:

			++top->guest_kernel_samples;

			++top->guest_kernel_samples;

			machine = perf_session__find_machine(session, event->ip.pid);

			machine = perf_session__find_machine(session,

							     sample.pid);

			break;

			break;

		case PERF_RECORD_MISC_GUEST_USER:

		case PERF_RECORD_MISC_GUEST_USER:

			++top->guest_us_samples;

			++top->guest_us_samples;

CRA Git | Maintained and supported by SUSTech CRA and CCSE