Merge tag 'perf-urgent-for-mingo' of git://git.kernel.org/pub/scm/linux/kernel/git/acme/linux into perf/urgent

Ingo Molnar · Ingo Molnar · commit 492cf7a0be68 · 2015-11-12T07:37:53.000+01:00
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 &lt;acme@redhat.com&gt;
Signed-off-by: Ingo Molnar &lt;mingo@kernel.org&gt;
diff --git a/tools/include/linux/list.h b/tools/include/linux/list.h
@@ -1,3 +1,4 @@
+#include <linux/compiler.h>
 #include <linux/kernel.h>
 #include <linux/types.h>
 
diff --git a/tools/perf/tests/.gitignore b/tools/perf/tests/.gitignore
@@ -0,0 +1,2 @@
+llvm-src-base.c
+llvm-src-kbuild.c
diff --git a/tools/perf/util/annotate.c b/tools/perf/util/annotate.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);
 	}
diff --git a/tools/perf/util/probe-file.c b/tools/perf/util/probe-file.c
@@ -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;
diff --git a/tools/perf/util/session.c b/tools/perf/util/session.c
@@ -29,25 +29,25 @@ 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;
 	}
 
 	if (perf_data_file__is_pipe(file))
 		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;
 	}
 

Original file line number	Diff line number	Diff line change
`@@ -1,3 +1,4 @@`
	`1`	`+#include <linux/compiler.h>`
`1`	`2`	`#include <linux/kernel.h>`
`2`	`3`	`#include <linux/types.h>`
`3`	`4`
Original file line number	Diff line number	Diff line change
`@@ -0,0 +1,2 @@`
	`1`	`+llvm-src-base.c`
	`2`	`+llvm-src-kbuild.c`
Original file line number	Diff line number	Diff line change
`@@ -1620,6 +1620,7 @@ int symbol__tty_annotate(struct symbol sym, struct map map,`
`1620`	`1620`	`len = symbol__size(sym);`
`1621`	`1621`
`1622`	`1622`	`if (print_lines) {`
	`1623`	`+ srcline_full_filename = full_paths;`
`1623`	`1624`	`symbol__get_source_line(sym, map, evsel, &source_line, len);`
`1624`	`1625`	`print_summary(&source_line, dso->long_name);`
`1625`	`1626`	`}`
Original file line number	Diff line number	Diff line change
`@@ -29,25 +29,25 @@ static int perf_session__open(struct perf_session *session)`
`29`	`29`	`struct perf_data_file *file = session->file;`
`30`	`30`
`31`	`31`	`if (perf_session__read_header(session) < 0) {`
`32`		`- pr_err("incompatible file format (rerun with -v to learn more)");`
	`32`	`+ pr_err("incompatible file format (rerun with -v to learn more)\n");`
`33`	`33`	`return -1;`
`34`	`34`	`}`
`35`	`35`
`36`	`36`	`if (perf_data_file__is_pipe(file))`
`37`	`37`	`return 0;`
`38`	`38`
`39`	`39`	`if (!perf_evlist__valid_sample_type(session->evlist)) {`
`40`		`- pr_err("non matching sample_type");`
	`40`	`+ pr_err("non matching sample_type\n");`
`41`	`41`	`return -1;`
`42`	`42`	`}`
`43`	`43`
`44`	`44`	`if (!perf_evlist__valid_sample_id_all(session->evlist)) {`
`45`		`- pr_err("non matching sample_id_all");`
	`45`	`+ pr_err("non matching sample_id_all\n");`
`46`	`46`	`return -1;`
`47`	`47`	`}`
`48`	`48`
`49`	`49`	`if (!perf_evlist__valid_read_format(session->evlist)) {`
`50`		`- pr_err("non matching read_format");`
	`50`	`+ pr_err("non matching read_format\n");`
`51`	`51`	`return -1;`
`52`	`52`	`}`
`53`	`53`