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

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

perf machine: Remove machine->symbol_filter and friends 

Including machines__set_symbol_filter(), not used anymore.

Cc: Adrian Hunter <adrian.hunter@intel.com>
Cc: David Ahern <dsahern@gmail.com>
Cc: Jiri Olsa <jolsa@kernel.org>
Cc: Masami Hiramatsu <mhiramat@kernel.org>
Cc: Namhyung Kim <namhyung@kernel.org>
Cc: Wang Nan <wangnan0@huawei.com>
Link: http://lkml.kernel.org/n/tip-7o1qgmrpvzuis4a9f0t8mnri@git.kernel.org


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

tools/perf/util/event.c

+3 −5
Original line number Diff line number Diff line
@@ -1286,7 +1286,7 @@ void thread__find_addr_map(struct thread *thread, u8 cpumode, 
		 * must be done prior to using kernel maps.

		 */

		if (load_map)

			map__load(al->map, machine->symbol_filter);

			map__load(al->map, NULL);

		al->addr = al->map->map_ip(al->map, al->addr);

	}

}
@@ -1297,8 +1297,7 @@ void thread__find_addr_location(struct thread *thread, 
{

	thread__find_addr_map(thread, cpumode, type, addr, al);

	if (al->map != NULL)

		al->sym = map__find_symbol(al->map, al->addr,

					   thread->mg->machine->symbol_filter);

		al->sym = map__find_symbol(al->map, al->addr, NULL);

	else

		al->sym = NULL;

}
@@ -1359,8 +1358,7 @@ int machine__resolve(struct machine *machine, struct addr_location *al, 
			al->filtered |= (1 << HIST_FILTER__DSO);

		}



		al->sym = map__find_symbol(al->map, al->addr,

					   machine->symbol_filter);

		al->sym = map__find_symbol(al->map, al->addr, NULL);

	}



	if (symbol_conf.sym_list &&

tools/perf/util/intel-bts.c

+1 −1
Original line number Diff line number Diff line
@@ -346,7 +346,7 @@ static int intel_bts_get_next_insn(struct intel_bts_queue *btsq, u64 ip) 
		goto out_put;



	/* Load maps to ensure dso->is_64_bit has been updated */

	map__load(al.map, machine->symbol_filter);

	map__load(al.map, NULL);



	x86_64 = al.map->dso->is_64_bit;

tools/perf/util/intel-pt.c

+2 −2
Original line number Diff line number Diff line
@@ -477,7 +477,7 @@ static int intel_pt_walk_next_insn(struct intel_pt_insn *intel_pt_insn, 
		start_ip = *ip;



		/* Load maps to ensure dso->is_64_bit has been updated */

		map__load(al.map, machine->symbol_filter);

		map__load(al.map, NULL);



		x86_64 = al.map->dso->is_64_bit;
@@ -1294,7 +1294,7 @@ static u64 intel_pt_switch_ip(struct intel_pt *pt, u64 *ptss_ip) 
	if (!map)

		return 0;



	if (map__load(map, machine->symbol_filter))

	if (map__load(map, NULL))

		return 0;



	start = dso__first_symbol(map->dso, MAP__FUNCTION);

tools/perf/util/machine.c

+1 −20
Original line number Diff line number Diff line
@@ -41,7 +41,6 @@ int machine__init(struct machine *machine, const char *root_dir, pid_t pid) 


	machine->pid = pid;



	machine->symbol_filter = NULL;

	machine->id_hdr_size = 0;

	machine->kptr_restrict_warned = false;

	machine->comm_exec = false;
@@ -148,7 +147,6 @@ void machines__init(struct machines *machines) 
{

	machine__init(&machines->host, "", HOST_KERNEL_ID);

	machines->guests = RB_ROOT;

	machines->symbol_filter = NULL;

}



void machines__exit(struct machines *machines)
@@ -172,8 +170,6 @@ struct machine *machines__add(struct machines *machines, pid_t pid, 
		return NULL;

	}



	machine->symbol_filter = machines->symbol_filter;



	while (*p != NULL) {

		parent = *p;

		pos = rb_entry(parent, struct machine, rb_node);
@@ -189,21 +185,6 @@ struct machine *machines__add(struct machines *machines, pid_t pid, 
	return machine;

}



void machines__set_symbol_filter(struct machines *machines,

				 symbol_filter_t symbol_filter)

{

	struct rb_node *nd;



	machines->symbol_filter = symbol_filter;

	machines->host.symbol_filter = symbol_filter;



	for (nd = rb_first(&machines->guests); nd; nd = rb_next(nd)) {

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



		machine->symbol_filter = symbol_filter;

	}

}



void machines__set_comm_exec(struct machines *machines, bool comm_exec)

{

	struct rb_node *nd;
@@ -2115,7 +2096,7 @@ int machine__get_kernel_start(struct machine *machine) 
	 */

	machine->kernel_start = 1ULL << 63;

	if (map) {

		err = map__load(map, machine->symbol_filter);

		err = map__load(map, NULL);

		if (map->start)

			machine->kernel_start = map->start;

	}

tools/perf/util/machine.h

+0 −4
Original line number Diff line number Diff line
@@ -41,7 +41,6 @@ struct machine { 
	struct map_groups kmaps;

	struct map	  *vmlinux_maps[MAP__NR_TYPES];

	u64		  kernel_start;

	symbol_filter_t	  symbol_filter;

	pid_t		  *current_tid;

	union { /* Tool specific area */

		void	  *priv;
@@ -110,7 +109,6 @@ typedef void (*machine__process_t)(struct machine *machine, void *data); 
struct machines {

	struct machine host;

	struct rb_root guests;

	symbol_filter_t symbol_filter;

};



void machines__init(struct machines *machines);
@@ -128,8 +126,6 @@ struct machine *machines__findnew(struct machines *machines, pid_t pid); 
void machines__set_id_hdr_size(struct machines *machines, u16 id_hdr_size);

char *machine__mmap_name(struct machine *machine, char *bf, size_t size);



void machines__set_symbol_filter(struct machines *machines,

				 symbol_filter_t symbol_filter);

void machines__set_comm_exec(struct machines *machines, bool comm_exec);



struct machine *machine__new_host(void);