projects
/
firefly-linux-kernel-4.4.55.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge remote-tracking branches 'asoc/topic/jz4740', 'asoc/topic/kirkwood', 'asoc...
[firefly-linux-kernel-4.4.55.git]
/
tools
/
perf
/
tests
/
sw-clock.c
diff --git
a/tools/perf/tests/sw-clock.c
b/tools/perf/tests/sw-clock.c
index 1aa21c90731b3eca400d91c2fec5d2b55a127f03..5b83f56a3b6f25928337d3954d2924322d3154ef 100644
(file)
--- a/
tools/perf/tests/sw-clock.c
+++ b/
tools/perf/tests/sw-clock.c
@@
-34,6
+34,8
@@
static int __test__sw_clock_freq(enum perf_sw_ids clock_id)
.disabled = 1,
.freq = 1,
};
.disabled = 1,
.freq = 1,
};
+ struct cpu_map *cpus;
+ struct thread_map *threads;
attr.sample_freq = 500;
attr.sample_freq = 500;
@@
-50,14
+52,19
@@
static int __test__sw_clock_freq(enum perf_sw_ids clock_id)
}
perf_evlist__add(evlist, evsel);
}
perf_evlist__add(evlist, evsel);
-
evlist->
cpus = cpu_map__dummy_new();
-
evlist->
threads = thread_map__new_by_tid(getpid());
- if (!
evlist->cpus || !evlist->
threads) {
+ cpus = cpu_map__dummy_new();
+ threads = thread_map__new_by_tid(getpid());
+ if (!
cpus || !
threads) {
err = -ENOMEM;
pr_debug("Not enough memory to create thread/cpu maps\n");
err = -ENOMEM;
pr_debug("Not enough memory to create thread/cpu maps\n");
- goto out_
delete_evlist
;
+ goto out_
free_maps
;
}
}
+ perf_evlist__set_maps(evlist, cpus, threads);
+
+ cpus = NULL;
+ threads = NULL;
+
if (perf_evlist__open(evlist)) {
const char *knob = "/proc/sys/kernel/perf_event_max_sample_rate";
if (perf_evlist__open(evlist)) {
const char *knob = "/proc/sys/kernel/perf_event_max_sample_rate";
@@
-107,6
+114,9
@@
next_event:
err = -1;
}
err = -1;
}
+out_free_maps:
+ cpu_map__put(cpus);
+ thread_map__put(threads);
out_delete_evlist:
perf_evlist__delete(evlist);
return err;
out_delete_evlist:
perf_evlist__delete(evlist);
return err;