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

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

perf machine: Introduce machine__findnew_dso() method 

Similar to machine__findnew_thread(), also prepping for refcounting and
locking, this time for struct dso instances.

Cc: Adrian Hunter <adrian.hunter@intel.com>
Cc: David Ahern <dsahern@gmail.com>
Cc: Jiri Olsa <jolsa@redhat.com>
Cc: Namhyung Kim <namhyung@kernel.org>
Link: http://lkml.kernel.org/n/tip-fv3tshv5o1413coh147lszjc@git.kernel.org


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

tools/perf/tests/hists_common.c

+1 −2
Original line number Diff line number Diff line
@@ -121,8 +121,7 @@ struct machine *setup_fake_machine(struct machines *machines) 
		size_t k;

		struct dso *dso;



		dso = __dsos__findnew(&machine->dsos,

				      fake_symbols[i].dso_name);

		dso = machine__findnew_dso(machine, fake_symbols[i].dso_name);

		if (dso == NULL)

			goto out;

tools/perf/util/dso.c

+1 −1
Original line number Diff line number Diff line
@@ -833,7 +833,7 @@ struct dso *machine__findnew_kernel(struct machine *machine, const char *name, 
	/*

	 * The kernel dso could be created by build_id processing.

	 */

	struct dso *dso = __dsos__findnew(&machine->dsos, name);

	struct dso *dso = machine__findnew_dso(machine, name);



	/*

	 * We need to run this in all cases, since during the build_id

tools/perf/util/header.c

+1 −1
Original line number Diff line number Diff line
@@ -1264,7 +1264,7 @@ static int __event_process_build_id(struct build_id_event *bev, 
		goto out;

	}



	dso = __dsos__findnew(&machine->dsos, filename);

	dso = machine__findnew_dso(machine, filename);

	if (dso != NULL) {

		char sbuild_id[BUILD_ID_SIZE * 2 + 1];

tools/perf/util/machine.c

+6 −1
Original line number Diff line number Diff line
@@ -1157,7 +1157,7 @@ static int machine__process_kernel_mmap_event(struct machine *machine, 
		}



		if (kernel == NULL)

			kernel = __dsos__findnew(&machine->dsos, kmmap_prefix);

			kernel = machine__findnew_dso(machine, kmmap_prefix);

		if (kernel == NULL)

			goto out_problem;
@@ -1915,3 +1915,8 @@ int machine__get_kernel_start(struct machine *machine) 
	}

	return err;

}



struct dso *machine__findnew_dso(struct machine *machine, const char *filename)

{

	return __dsos__findnew(&machine->dsos, filename);

}

tools/perf/util/machine.h

+2 −0
Original line number Diff line number Diff line
@@ -154,6 +154,8 @@ static inline bool machine__is_host(struct machine *machine) 
struct thread *__machine__findnew_thread(struct machine *machine, pid_t pid, pid_t tid);

struct thread *machine__findnew_thread(struct machine *machine, pid_t pid, pid_t tid);



struct dso *machine__findnew_dso(struct machine *machine, const char *filename);



size_t machine__fprintf(struct machine *machine, FILE *fp);



static inline