Skip to contentSkip to conversation

perf tools: Clear struct machine during machine__init()

PATCH New Wang Nan 1 participant 1 message Dec 7, 2015 perf events

lore
Share & tools
lore

Wang Nan

author
#0 lore raw

PATCH 1/1 perf tools: Clear struct machine during machine__init()

There are so many test cases use stack allocated 'struct machine'. Including:
test__hists_link
test__hists_filter
test__mmap_thread_lookup
test__thread_mg_share
test__hists_output
test__hists_cumulate

Also, in non-test code (for example, machine__new_host()) there are code use 'malloc()' to alloc struct machine.

These are dangerous operations, cause some tests fail or hung in machines__exit(). For example, in

machines__exit ->
machine__destroy_kernel_maps ->

     map_groups__remove ->
       maps__remove ->
         pthread_rwlock_wrlock

a incorrectly initialized lock causes unintended behavior.

This patch bzero() that structure in machine__init() to ensure all fields in 'struct machine' are initialized to zero.

Cc Arnaldo Carvalho de Melo <[email protected]>
Cc Jiri Olsa <[email protected]>
Cc Namhyung Kim <[email protected]>
---
 tools/perf/util/machine.c | 1 +
 1 file changed, 1 insertion(+)
tools/perf/util/machine.c +1 -0
index bfc289c..188cfdf 100644
@@ -25,6 +25,7 @@ static void dsos__init(struct dsos *dsos)
 
 int machine__init(struct machine *machine, const char *root_dir, pid_t pid)
 {
+	bzero(machine, sizeof(*machine));
 	map_groups__init(&machine->kmaps, machine);
 	RB_CLEAR_NODE(&machine->rb_node);
 	dsos__init(&machine->dsos);
Signature · 1 line
1.8.3.4