Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 459ce518 authored by Arnaldo Carvalho de Melo's avatar Arnaldo Carvalho de Melo
Browse files

perf machine: Adopt findnew_kernel method 

It never was a 'struct dso' method, so fix that by rename
dso__kernel_findnew() to machine__findnew_kernel().

At some point I'll move it all to the machine.[ch] files, for now
lets ease patch review by not moving too much stuff.

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: Namhyung Kim <namhyung@kernel.org>
Cc: Stephane Eranian <eranian@google.com>
Link: http://lkml.kernel.org/n/tip-zrxmblgsg5vx0iv4rhvq2f6l@git.kernel.org


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

tools/perf/util/dso.c

+2 −2
Original line number Diff line number Diff line
@@ -827,7 +827,7 @@ struct map *dso__new_map(const char *name) 
	return map;

}



struct dso *dso__kernel_findnew(struct machine *machine, const char *name,

struct dso *machine__findnew_kernel(struct machine *machine, const char *name,

				    const char *short_name, int dso_type)

{

	/*

tools/perf/util/dso.h

+2 −2
Original line number Diff line number Diff line
@@ -294,7 +294,7 @@ ssize_t dso__data_read_addr(struct dso *dso, struct map *map, 
bool dso__data_status_seen(struct dso *dso, enum dso_data_status_seen by);



struct map *dso__new_map(const char *name);

struct dso *dso__kernel_findnew(struct machine *machine, const char *name,

struct dso *machine__findnew_kernel(struct machine *machine, const char *name,

				    const char *short_name, int dso_type);



void dsos__add(struct dsos *dsos, struct dso *dso);

tools/perf/util/machine.c

+5 −6
Original line number Diff line number Diff line
@@ -640,9 +640,8 @@ static struct dso *machine__get_kernel(struct machine *machine) 
		if (!vmlinux_name)

			vmlinux_name = "[kernel.kallsyms]";



		kernel = dso__kernel_findnew(machine, vmlinux_name,

					     "[kernel]",

					     DSO_TYPE_KERNEL);

		kernel = machine__findnew_kernel(machine, vmlinux_name,

						 "[kernel]", DSO_TYPE_KERNEL);

	} else {

		char bf[PATH_MAX];
@@ -652,7 +651,7 @@ static struct dso *machine__get_kernel(struct machine *machine) 
			vmlinux_name = machine__mmap_name(machine, bf,

							  sizeof(bf));



		kernel = dso__kernel_findnew(machine, vmlinux_name,

		kernel = machine__findnew_kernel(machine, vmlinux_name,

						 "[guest.kernel]",

						 DSO_TYPE_GUEST_KERNEL);

	}