Commit 83acca9f authored by Ian Rogers's avatar Ian Rogers Committed by Arnaldo Carvalho de Melo
Browse files

perf dsos: Attempt to better abstract DSOs internals 



Move functions from machine and build-id to dsos. Pass 'struct dsos'
rather than internal state.

Rename some functions to better represent which data structure they
operate on.

Signed-off-by: default avatarIan Rogers <irogers@google.com>
Cc: Adrian Hunter <adrian.hunter@intel.com>
Cc: Alexander Shishkin <alexander.shishkin@linux.intel.com>
Cc: Andi Kleen <ak@linux.intel.com>
Cc: Anne Macedo <retpolanne@posteo.net>
Cc: Athira Rajeev <atrajeev@linux.vnet.ibm.com>
Cc: Ben Gainey <ben.gainey@arm.com>
Cc: Changbin Du <changbin.du@huawei.com>
Cc: Chengen Du <chengen.du@canonical.com>
Cc: Colin Ian King <colin.i.king@gmail.com>
Cc: Ilkka Koskinen <ilkka@os.amperecomputing.com>
Cc: Ingo Molnar <mingo@redhat.com>
Cc: James Clark <james.clark@arm.com>
Cc: Jiri Olsa <jolsa@kernel.org>
Cc: K Prateek Nayak <kprateek.nayak@amd.com>
Cc: Kan Liang <kan.liang@linux.intel.com>
Cc: Leo Yan <leo.yan@linux.dev>
Cc: Li Dong <lidong@vivo.com>
Cc: Mark Rutland <mark.rutland@arm.com>
Cc: Markus Elfring <Markus.Elfring@web.de>
Cc: Masami Hiramatsu <mhiramat@kernel.org>
Cc: Namhyung Kim <namhyung@kernel.org>
Cc: Paran Lee <p4ranlee@gmail.com>
Cc: Peter Zijlstra <peterz@infradead.org>
Cc: Ravi Bangoria <ravi.bangoria@amd.com>
Cc: Song Liu <song@kernel.org>
Cc: Sun Haiyong <sunhaiyong@loongson.cn>
Cc: Thomas Richter <tmricht@linux.ibm.com>
Cc: Yang Jihong <yangjihong1@huawei.com>
Cc: Yanteng Si <siyanteng@loongson.cn>
Cc: Yicong Yang <yangyicong@hisilicon.com>
Cc: zhaimingbing <zhaimingbing@cmss.chinamobile.com>
Link: https://lore.kernel.org/r/20240410064214.2755936-2-irogers@google.com


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

tools/perf/builtin-inject.c

+1 −1
Original line number Diff line number Diff line
@@ -2122,7 +2122,7 @@ static int __cmd_inject(struct perf_inject *inject) 
		 */

		if (perf_header__has_feat(&session->header, HEADER_BUILD_ID) &&

		    inject->have_auxtrace && !inject->itrace_synth_opts.set)

			dsos__hit_all(session);

			perf_session__dsos_hit_all(session);

		/*

		 * The AUX areas have been removed and replaced with

		 * synthesized hardware events, so clear the feature flag.

tools/perf/builtin-record.c

+1 −1
Original line number Diff line number Diff line
@@ -1788,7 +1788,7 @@ record__finish_output(struct record *rec) 
		process_buildids(rec);



		if (rec->buildid_all)

			dsos__hit_all(rec->session);

			perf_session__dsos_hit_all(rec->session);

	}

	perf_session__write_header(rec->session, rec->evlist, fd, true);

tools/perf/util/build-id.c

+1 −37
Original line number Diff line number Diff line
@@ -390,42 +390,6 @@ int perf_session__write_buildid_table(struct perf_session *session, 
	return err;

}



static int __dsos__hit_all(struct list_head *head)

{

	struct dso *pos;



	list_for_each_entry(pos, head, node)

		pos->hit = true;



	return 0;

}



static int machine__hit_all_dsos(struct machine *machine)

{

	return __dsos__hit_all(&machine->dsos.head);

}



int dsos__hit_all(struct perf_session *session)

{

	struct rb_node *nd;

	int err;



	err = machine__hit_all_dsos(&session->machines.host);

	if (err)

		return err;



	for (nd = rb_first_cached(&session->machines.guests); nd;

	     nd = rb_next(nd)) {

		struct machine *pos = rb_entry(nd, struct machine, rb_node);



		err = machine__hit_all_dsos(pos);

		if (err)

			return err;

	}



	return 0;

}



void disable_buildid_cache(void)

{

	no_buildid_cache = true;
@@ -992,7 +956,7 @@ int perf_session__cache_build_ids(struct perf_session *session) 


static bool machine__read_build_ids(struct machine *machine, bool with_hits)

{

	return __dsos__read_build_ids(&machine->dsos.head, with_hits);

	return __dsos__read_build_ids(&machine->dsos, with_hits);

}



bool perf_session__read_build_ids(struct perf_session *session, bool with_hits)

tools/perf/util/build-id.h

+0 −2
Original line number Diff line number Diff line
@@ -39,8 +39,6 @@ int build_id__mark_dso_hit(struct perf_tool *tool, union perf_event *event, 
			   struct perf_sample *sample, struct evsel *evsel,

			   struct machine *machine);



int dsos__hit_all(struct perf_session *session);



int perf_event__inject_buildid(struct perf_tool *tool, union perf_event *event,

			       struct perf_sample *sample, struct evsel *evsel,

			       struct machine *machine);

tools/perf/util/dso.h

+0 −6
Original line number Diff line number Diff line
@@ -233,12 +233,6 @@ struct dso { 
#define dso__for_each_symbol(dso, pos, n)	\

	symbols__for_each_entry(&(dso)->symbols, pos, n)



#define dsos__for_each_with_build_id(pos, head)	\

	list_for_each_entry(pos, head, node)	\

		if (!pos->has_build_id)		\

			continue;		\

		else



static inline void dso__set_loaded(struct dso *dso)

{

	dso->loaded = true;