Skip to contentSkip to conversation

perf machine: Introduce machine__findnew_dso() method

tip:perf/core tip-bot for Arnaldo Carvalho de Melo 1 participant 1 message May 29, 2015 perf events

lore
Share & tools
lore

tip-bot for Arnaldo Carvalho de Melo

author merge bot
#0 lore raw
Commit-ID:  aa7cc2ae5ae69aff555793fbfcff514141bb23f3
Gitweb:     http://git.kernel.org/tip/aa7cc2ae5ae69aff555793fbfcff514141bb23f3
Author:     Arnaldo Carvalho de Melo <[email protected]>
AuthorDate: Fri, 29 May 2015 11:31:12 -0300
Committer:  Arnaldo Carvalho de Melo <[email protected]>
CommitDate: Fri, 29 May 2015 12:43:44 -0300

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 <[email protected]>
Cc David Ahern <[email protected]>
Cc Jiri Olsa <[email protected]>
Cc Namhyung Kim <[email protected]>
Link http://lkml.kernel.org/n/[email protected] open here
Signed-off-by Arnaldo Carvalho de Melo <[email protected]>
---
 tools/perf/tests/hists_common.c | 3 +--
 tools/perf/util/dso.c           | 2 +-
 tools/perf/util/header.c        | 2 +-
 tools/perf/util/machine.c       | 7 ++++++-
 tools/perf/util/machine.h       | 2 ++
 tools/perf/util/map.c           | 2 +-
 6 files changed, 12 insertions(+), 6 deletions(-)
tools/perf/tests/hists_common.c +1 -2
index bcde1d2..915f60a 100644
@@ -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
index ff040b0..b335db3 100644
@@ -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
index a900e94..851143a 100644
@@ -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
index ffd3107..698da1da 100644
@@ -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
index aabca58..39a0ca0 100644
@@ -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
tools/perf/util/map.c +1 -1
index 57ff025..d15e1e9 100644
@@ -180,7 +180,7 @@ struct map *map__new(struct machine *machine, u64 start, u64 len,
 			pgoff = 0;
 			dso = vdso__dso_findnew(machine, thread);
 		} else
-			dso = __dsos__findnew(&machine->dsos, filename);
+			dso = machine__findnew_dso(machine, filename);
 
 		if (dso == NULL)
 			goto out_delete;