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

perf maps: Rename clone to copy from 



Rename maps__clone() to maps__copy_from() to be more intention revealing
of its behavior. Pass the underlying maps rather than the thread.

Signed-off-by: default avatarIan Rogers <irogers@google.com>
Acked-by: default avatarNamhyung Kim <namhyung@kernel.org>
Cc: Adrian Hunter <adrian.hunter@intel.com>
Cc: Alexander Shishkin <alexander.shishkin@linux.intel.com>
Cc: Andi Kleen <ak@linux.intel.com>
Cc: Athira Rajeev <atrajeev@linux.vnet.ibm.com>
Cc: Changbin Du <changbin.du@huawei.com>
Cc: Colin Ian King <colin.i.king@gmail.com>
Cc: Dmitrii Dolgov <9erthalion6@gmail.com>
Cc: German Gomez <german.gomez@arm.com>
Cc: Guilherme Amadio <amadio@gentoo.org>
Cc: Huacai Chen <chenhuacai@kernel.org>
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: Kajol Jain <kjain@linux.ibm.com>
Cc: Kan Liang <kan.liang@linux.intel.com>
Cc: Leo Yan <leo.yan@linaro.org>
Cc: Li Dong <lidong@vivo.com>
Cc: Liam Howlett <liam.howlett@oracle.com>
Cc: Mark Rutland <mark.rutland@arm.com>
Cc: Masami Hiramatsu <mhiramat@kernel.org>
Cc: Miguel Ojeda <ojeda@kernel.org>
Cc: Ming Wang <wangming01@loongson.cn>
Cc: Nick Terrell <terrelln@fb.com>
Cc: Paolo Bonzini <pbonzini@redhat.com>
Cc: Peter Zijlstra <peterz@infradead.org>
Cc: Ravi Bangoria <ravi.bangoria@amd.com>
Cc: Sandipan Das <sandipan.das@amd.com>
Cc: Sean Christopherson <seanjc@google.com>
Cc: Steinar H. Gunderson <sesse@google.com>
Cc: Vincent Whitchurch <vincent.whitchurch@axis.com>
Cc: Wenyu Liu <liuwenyu7@huawei.com>
Cc: Yang Jihong <yangjihong1@huawei.com>
Link: https://lore.kernel.org/r/20231207011722.1220634-19-irogers@google.com


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

tools/perf/util/machine.c

+1 −1
Original line number Diff line number Diff line
@@ -453,7 +453,7 @@ static struct thread *findnew_guest_code(struct machine *machine, 
	 * Guest code can be found in hypervisor process at the same address

	 * so copy host maps.

	 */

	err = maps__clone(thread, thread__maps(host_thread));

	err = maps__copy_from(thread__maps(thread), thread__maps(host_thread));

	thread__put(host_thread);

	if (err)

		goto out_err;

tools/perf/util/maps.c

+1 −5
Original line number Diff line number Diff line
@@ -453,12 +453,8 @@ int maps__fixup_overlap_and_insert(struct maps *maps, struct map *new) 
	return err;

}



/*

 * XXX This should not really _copy_ te maps, but refcount them.

 */

int maps__clone(struct thread *thread, struct maps *parent)

int maps__copy_from(struct maps *maps, struct maps *parent)

{

	struct maps *maps = thread__maps(thread);

	int err;

	struct map_rb_node *rb_node;

tools/perf/util/maps.h

+1 −2
Original line number Diff line number Diff line
@@ -14,7 +14,6 @@ struct ref_reloc_sym; 
struct machine;

struct map;

struct maps;

struct thread;



struct map_rb_node {

	struct rb_node rb_node;
@@ -61,7 +60,7 @@ struct kmap { 


struct maps *maps__new(struct machine *machine);

bool maps__empty(struct maps *maps);

int maps__clone(struct thread *thread, struct maps *parent);

int maps__copy_from(struct maps *maps, struct maps *parent);



struct maps *maps__get(struct maps *maps);

void maps__put(struct maps *maps);

tools/perf/util/thread.c

+1 −1
Original line number Diff line number Diff line
@@ -390,7 +390,7 @@ static int thread__clone_maps(struct thread *thread, struct thread *parent, bool 
		return 0;

	}

	/* But this one is new process, copy maps. */

	return do_maps_clone ? maps__clone(thread, thread__maps(parent)) : 0;

	return do_maps_clone ? maps__copy_from(thread__maps(thread), thread__maps(parent)) : 0;

}



int thread__fork(struct thread *thread, struct thread *parent, u64 timestamp, bool do_maps_clone)