perf/urgent fixes:
User visible: - Add missing newlines to some pr_err() calls (Arnaldo Carvalho de Melo) - Print full source file paths when using 'perf annotate --print-line --full-paths' (Michael Petlan) - Fix 'perf probe -d' when just one out of uprobes and kprobes is enabled (Wang Nan) Developer stuff: - Add compiler.h to list.h to fix 'make perf-tar-src-pkg' generated tarballs, i.e. out of tree building (Arnaldo Carvalho de Melo) - Add the llvm-src-base.c and llvm-src-kbuild.c files, generated by the 'perf test' LLVM entries, when running it in-tree, to .gitignore (Yunlong Song) Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com> -----BEGIN PGP SIGNATURE----- Version: GnuPG v1 iQIcBAABAgAGBQJWQ7iTAAoJENZQFvNTUqpAQHcP/ji7wTPfc2JNvEegkc4ACgEy z59FWGKfCUUJirS/72mgEzAEQppS6GsDs0MfKdCeeaN5S1GyavT4GTVsQZ2AaRx6 WIVb8ZKLRJCba69T74lxZiv8Im4MVNYgBdAkRv2/Ec7ARiGMLvBF0MBHXPLtz8x0 XeTSK/AqZD/xcu8L4OE9b28Dhrs3HyJKpyBYWRCvHqHhc5hHH9Z4s2DV2RbKc2iV 0F7OzSm58Rx/gFTIHjIKiucqDlfzUnvXkUBzJNWobZSgaaIRWboWSmLewiW0PCl4 9TxidmF0l1YRq5FIAsBRjpFAZzjhA/4w5zyclNTWo93CGH/mQI+kgxnb1I3MDgJL L0dqRpYp1NPwBApASI3z1PGcx09QEbRxskasY4Xo8J0HEaR3o22Ae+OXn8bVCUus yxOp6sttT6lobFLUeg1QERbGCYRR5+LJAqDF+njQ0aXr8+9hCWHwyo8yqTSy3lIG Pkxlf1ArCiMxzpCGj2KkUWj2JAW7MoEqPmdNUscg52SoZeR+q/Tr8qBw0rbxUHEf fzmJtuNqoN5NqX1tOZs4lOHAplTN9jGkYRiw2xB2hxRPXUGYBXMwuc8y+wjUr5EF O+3EjzDqBsAwLMPTRjsFi7L1osBwVHg2SGWiEAWBq5vAgZS1u5vv1NVtzGeQC3Un 9o1T4QfZkGgKCyWtc1FG =5nFk -----END PGP SIGNATURE----- Merge tag 'perf-urgent-for-mingo' of git://git.kernel.org/pub/scm/linux/kernel/git/acme/linux into perf/urgent Pull perf/urgent fixes from Arnaldo Carvalho de Melo: - Add missing newlines to some pr_err() calls (Arnaldo Carvalho de Melo) - Print full source file paths when using 'perf annotate --print-line --full-paths' (Michael Petlan) - Fix 'perf probe -d' when just one out of uprobes and kprobes is enabled (Wang Nan) - Add compiler.h to list.h to fix 'make perf-tar-src-pkg' generated tarballs, i.e. out of tree building (Arnaldo Carvalho de Melo) - Add the llvm-src-base.c and llvm-src-kbuild.c files, generated by the 'perf test' LLVM entries, when running it in-tree, to .gitignore (Yunlong Song) Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com> Signed-off-by: Ingo Molnar <mingo@kernel.org>
This commit is contained in:
Коммит
492cf7a0be
|
@ -1,3 +1,4 @@
|
|||
#include <linux/compiler.h>
|
||||
#include <linux/kernel.h>
|
||||
#include <linux/types.h>
|
||||
|
||||
|
|
|
@ -0,0 +1,2 @@
|
|||
llvm-src-base.c
|
||||
llvm-src-kbuild.c
|
|
@ -1620,6 +1620,7 @@ int symbol__tty_annotate(struct symbol *sym, struct map *map,
|
|||
len = symbol__size(sym);
|
||||
|
||||
if (print_lines) {
|
||||
srcline_full_filename = full_paths;
|
||||
symbol__get_source_line(sym, map, evsel, &source_line, len);
|
||||
print_summary(&source_line, dso->long_name);
|
||||
}
|
||||
|
|
|
@ -138,6 +138,9 @@ struct strlist *probe_file__get_rawlist(int fd)
|
|||
char *p;
|
||||
struct strlist *sl;
|
||||
|
||||
if (fd < 0)
|
||||
return NULL;
|
||||
|
||||
sl = strlist__new(NULL, NULL);
|
||||
|
||||
fp = fdopen(dup(fd), "r");
|
||||
|
@ -271,6 +274,9 @@ int probe_file__get_events(int fd, struct strfilter *filter,
|
|||
const char *p;
|
||||
int ret = -ENOENT;
|
||||
|
||||
if (!plist)
|
||||
return -EINVAL;
|
||||
|
||||
namelist = __probe_file__get_namelist(fd, true);
|
||||
if (!namelist)
|
||||
return -ENOENT;
|
||||
|
|
|
@ -29,7 +29,7 @@ static int perf_session__open(struct perf_session *session)
|
|||
struct perf_data_file *file = session->file;
|
||||
|
||||
if (perf_session__read_header(session) < 0) {
|
||||
pr_err("incompatible file format (rerun with -v to learn more)");
|
||||
pr_err("incompatible file format (rerun with -v to learn more)\n");
|
||||
return -1;
|
||||
}
|
||||
|
||||
|
@ -37,17 +37,17 @@ static int perf_session__open(struct perf_session *session)
|
|||
return 0;
|
||||
|
||||
if (!perf_evlist__valid_sample_type(session->evlist)) {
|
||||
pr_err("non matching sample_type");
|
||||
pr_err("non matching sample_type\n");
|
||||
return -1;
|
||||
}
|
||||
|
||||
if (!perf_evlist__valid_sample_id_all(session->evlist)) {
|
||||
pr_err("non matching sample_id_all");
|
||||
pr_err("non matching sample_id_all\n");
|
||||
return -1;
|
||||
}
|
||||
|
||||
if (!perf_evlist__valid_read_format(session->evlist)) {
|
||||
pr_err("non matching read_format");
|
||||
pr_err("non matching read_format\n");
|
||||
return -1;
|
||||
}
|
||||
|
||||
|
|
Загрузка…
Ссылка в новой задаче