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 branch 'x86-fpu-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git...
[firefly-linux-kernel-4.4.55.git]
/
tools
/
perf
/
tests
/
task-exit.c
diff --git
a/tools/perf/tests/task-exit.c
b/tools/perf/tests/task-exit.c
index 3a8fedef83bc086e5328dea03dcf6107d3ff1e39..add16385f13e5bbb750cec83da3f1fe0d28889af 100644
(file)
--- a/
tools/perf/tests/task-exit.c
+++ b/
tools/perf/tests/task-exit.c
@@
-43,6
+43,8
@@
int test__task_exit(void)
};
const char *argv[] = { "true", NULL };
char sbuf[STRERR_BUFSIZE];
};
const char *argv[] = { "true", NULL };
char sbuf[STRERR_BUFSIZE];
+ struct cpu_map *cpus;
+ struct thread_map *threads;
signal(SIGCHLD, sig_handler);
signal(SIGCHLD, sig_handler);
@@
-58,14
+60,19
@@
int test__task_exit(void)
* perf_evlist__prepare_workload we'll fill in the only thread
* we're monitoring, the one forked there.
*/
* perf_evlist__prepare_workload we'll fill in the only thread
* we're monitoring, the one forked there.
*/
-
evlist->
cpus = cpu_map__dummy_new();
-
evlist->
threads = thread_map__new_by_tid(-1);
- if (!
evlist->cpus || !evlist->
threads) {
+ cpus = cpu_map__dummy_new();
+ threads = thread_map__new_by_tid(-1);
+ 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;
+
err = perf_evlist__prepare_workload(evlist, &target, argv, false,
workload_exec_failed_signal);
if (err < 0) {
err = perf_evlist__prepare_workload(evlist, &target, argv, false,
workload_exec_failed_signal);
if (err < 0) {
@@
-114,6
+121,9
@@
retry:
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;