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

perf dso: Constify dso_id 



The passed dso_id is copied and so is never an out argument. Remove
its mutability.

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: Anne Macedo <retpolanne@posteo.net>
Cc: Arnd Bergmann <arnd@arndb.de>
Cc: Athira Rajeev <atrajeev@linux.vnet.ibm.com>
Cc: Casey Chen <cachen@purestorage.com>
Cc: Chaitanya S Prakash <chaitanyas.prakash@arm.com>
Cc: Colin Ian King <colin.i.king@gmail.com>
Cc: Dominique Martinet <asmadeus@codewreck.org>
Cc: Ingo Molnar <mingo@redhat.com>
Cc: James Clark <james.clark@linaro.org>
Cc: Jann Horn <jannh@google.com>
Cc: Jiri Olsa <jolsa@kernel.org>
Cc: Kan Liang <kan.liang@linux.intel.com>
Cc: Mark Rutland <mark.rutland@arm.com>
Cc: Masahiro Yamada <masahiroy@kernel.org>
Cc: Namhyung Kim <namhyung@kernel.org>
Cc: Peter Zijlstra <peterz@infradead.org>
Cc: Sun Haiyong <sunhaiyong@loongson.cn>
Cc: Weilin Wang <weilin.wang@intel.com>
Cc: Yang Jihong <yangjihong1@huawei.com>
Cc: Yunseong Kim <yskelg@gmail.com>
Cc: Ze Gao <zegao2021@gmail.com>
Link: https://lore.kernel.org/r/20240817064442.2152089-5-irogers@google.com


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

tools/perf/builtin-inject.c

+1 −1
Original line number Diff line number Diff line
@@ -411,7 +411,7 @@ static int perf_event__jit_repipe_mmap(const struct perf_tool *tool, 
#endif



static struct dso *findnew_dso(int pid, int tid, const char *filename,

			       struct dso_id *id, struct machine *machine)

			       const struct dso_id *id, struct machine *machine)

{

	struct thread *thread;

	struct nsinfo *nsi = NULL;

tools/perf/util/dso.c

+2 −2
Original line number Diff line number Diff line
@@ -1327,7 +1327,7 @@ bool dso_id__empty(const struct dso_id *id) 
	return !id->maj && !id->min && !id->ino && !id->ino_generation;

}



void __dso__inject_id(struct dso *dso, struct dso_id *id)

void __dso__inject_id(struct dso *dso, const struct dso_id *id)

{

	struct dsos *dsos = dso__dsos(dso);

	struct dso_id *dso_id = dso__id(dso);
@@ -1417,7 +1417,7 @@ void dso__set_sorted_by_name(struct dso *dso) 
	RC_CHK_ACCESS(dso)->sorted_by_name = true;

}



struct dso *dso__new_id(const char *name, struct dso_id *id)

struct dso *dso__new_id(const char *name, const struct dso_id *id)

{

	RC_STRUCT(dso) *dso = zalloc(sizeof(*dso) + strlen(name) + 1);

	struct dso *res;

tools/perf/util/dso.h

+2 −2
Original line number Diff line number Diff line
@@ -640,14 +640,14 @@ static inline void dso__set_text_offset(struct dso *dso, u64 val) 
int dso_id__cmp(const struct dso_id *a, const struct dso_id *b);

bool dso_id__empty(const struct dso_id *id);



struct dso *dso__new_id(const char *name, struct dso_id *id);

struct dso *dso__new_id(const char *name, const struct dso_id *id);

struct dso *dso__new(const char *name);

void dso__delete(struct dso *dso);



int dso__cmp_id(struct dso *a, struct dso *b);

void dso__set_short_name(struct dso *dso, const char *name, bool name_allocated);

void dso__set_long_name(struct dso *dso, const char *name, bool name_allocated);

void __dso__inject_id(struct dso *dso, struct dso_id *id);

void __dso__inject_id(struct dso *dso, const struct dso_id *id);



int dso__name_len(const struct dso *dso);

tools/perf/util/dsos.c

+6 −6
Original line number Diff line number Diff line
@@ -155,7 +155,7 @@ static int dsos__cmp_key_long_name_id(const void *vkey, const void *vdso) 
 */

static struct dso *__dsos__find_by_longname_id(struct dsos *dsos,

					       const char *name,

					       struct dso_id *id,

					       const struct dso_id *id,

					       bool write_locked)

{

	struct dsos__key key = {
@@ -244,7 +244,7 @@ int dsos__add(struct dsos *dsos, struct dso *dso) 


struct dsos__find_id_cb_args {

	const char *name;

	struct dso_id *id;

	const struct dso_id *id;

	struct dso *res;

};
@@ -260,7 +260,7 @@ static int dsos__find_id_cb(struct dso *dso, void *data) 


}



static struct dso *__dsos__find_id(struct dsos *dsos, const char *name, struct dso_id *id,

static struct dso *__dsos__find_id(struct dsos *dsos, const char *name, const struct dso_id *id,

				   bool cmp_short, bool write_locked)

{

	struct dso *res;
@@ -321,7 +321,7 @@ static void dso__set_basename(struct dso *dso) 
	dso__set_short_name(dso, base, true);

}



static struct dso *__dsos__addnew_id(struct dsos *dsos, const char *name, struct dso_id *id)

static struct dso *__dsos__addnew_id(struct dsos *dsos, const char *name, const struct dso_id *id)

{

	struct dso *dso = dso__new_id(name, id);
@@ -337,7 +337,7 @@ static struct dso *__dsos__addnew_id(struct dsos *dsos, const char *name, struct 
	return dso;

}



static struct dso *__dsos__findnew_id(struct dsos *dsos, const char *name, struct dso_id *id)

static struct dso *__dsos__findnew_id(struct dsos *dsos, const char *name, const struct dso_id *id)

{

	struct dso *dso = __dsos__find_id(dsos, name, id, false, /*write_locked=*/true);
@@ -347,7 +347,7 @@ static struct dso *__dsos__findnew_id(struct dsos *dsos, const char *name, struc 
	return dso ? dso : __dsos__addnew_id(dsos, name, id);

}



struct dso *dsos__findnew_id(struct dsos *dsos, const char *name, struct dso_id *id)

struct dso *dsos__findnew_id(struct dsos *dsos, const char *name, const struct dso_id *id)

{

	struct dso *dso;

	down_write(&dsos->lock);

tools/perf/util/dsos.h

+1 −1
Original line number Diff line number Diff line
@@ -32,7 +32,7 @@ int __dsos__add(struct dsos *dsos, struct dso *dso); 
int dsos__add(struct dsos *dsos, struct dso *dso);

struct dso *dsos__find(struct dsos *dsos, const char *name, bool cmp_short);



struct dso *dsos__findnew_id(struct dsos *dsos, const char *name, struct dso_id *id);

struct dso *dsos__findnew_id(struct dsos *dsos, const char *name, const struct dso_id *id);

 

bool dsos__read_build_ids(struct dsos *dsos, bool with_hits);