Skip to content

Commit

Permalink
Merge tag 'perf-urgent-for-mingo' of git://git.kernel.org/pub/scm/lin…
Browse files Browse the repository at this point in the history
…ux/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>
  • Loading branch information
Ingo Molnar committed Nov 12, 2015
2 parents b71b437 + 5602ea0 commit 492cf7a
Show file tree
Hide file tree
Showing 5 changed files with 14 additions and 4 deletions.
1 change: 1 addition & 0 deletions tools/include/linux/list.h
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
#include <linux/compiler.h>
#include <linux/kernel.h>
#include <linux/types.h>

Expand Down
2 changes: 2 additions & 0 deletions tools/perf/tests/.gitignore
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
llvm-src-base.c
llvm-src-kbuild.c
1 change: 1 addition & 0 deletions tools/perf/util/annotate.c
Original file line number Diff line number Diff line change
Expand Up @@ -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);
}
Expand Down
6 changes: 6 additions & 0 deletions tools/perf/util/probe-file.c
Original file line number Diff line number Diff line change
Expand Up @@ -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");
Expand Down Expand Up @@ -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;
Expand Down
8 changes: 4 additions & 4 deletions tools/perf/util/session.c
Original file line number Diff line number Diff line change
Expand Up @@ -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;
}

Expand Down

0 comments on commit 492cf7a

Please sign in to comment.