linux-kernel.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: Arnaldo Carvalho de Melo <acme@kernel.org>
To: Ingo Molnar <mingo@kernel.org>
Cc: linux-kernel@vger.kernel.org, Andi Kleen <ak@linux.intel.com>,
	Jiri Olsa <jolsa@kernel.org>,
	Arnaldo Carvalho de Melo <acme@redhat.com>
Subject: [PATCH 03/13] perf sort: Check for SRCLINE_UNKNOWN case in "srcfile" processing
Date: Wed, 12 Aug 2015 13:39:51 -0300	[thread overview]
Message-ID: <1439397601-26918-4-git-send-email-acme@kernel.org> (raw)
In-Reply-To: <1439397601-26918-1-git-send-email-acme@kernel.org>

From: Andi Kleen <ak@linux.intel.com>

Handle the SRCLINE_UNKNOWN case correctly when processing "srcfile".

Commiter note:

We can't just free it, as it was't allocated via malloc, its a guard
variable.

Reported-by: Namhyung Kim <namhyung@kernel.org>
Signed-off-by: Andi Kleen <ak@linux.intel.com>
Cc: Jiri Olsa <jolsa@kernel.org>
Link: http://lkml.kernel.org/r/20150811133655.GC4524@tassilo.jf.intel.com
Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
---
 tools/perf/util/sort.c | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/tools/perf/util/sort.c b/tools/perf/util/sort.c
index c0c32b050e45..7e3871606df3 100644
--- a/tools/perf/util/sort.c
+++ b/tools/perf/util/sort.c
@@ -330,6 +330,8 @@ static char *get_srcfile(struct hist_entry *e)
 
 	sf = get_srcline(map->dso, map__rip_2objdump(map, e->ip),
 			 e->ms.sym, true);
+	if (!strcmp(sf, SRCLINE_UNKNOWN))
+		return no_srcfile;
 	p = strchr(sf, ':');
 	if (p && *sf) {
 		*p = 0;
-- 
2.1.0


  parent reply	other threads:[~2015-08-12 16:40 UTC|newest]

Thread overview: 15+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2015-08-12 16:39 [GIT PULL 00/13] perf/core improvements and fixes Arnaldo Carvalho de Melo
2015-08-12 16:39 ` [PATCH 01/13] perf trace: Associate some more syscall args with the getname beautifier Arnaldo Carvalho de Melo
2015-08-12 16:39 ` [PATCH 02/13] perf trace: Add missing clockid entries Arnaldo Carvalho de Melo
2015-08-12 16:39 ` Arnaldo Carvalho de Melo [this message]
2015-08-12 16:39 ` [PATCH 04/13] perf trace: Use the FD beautifier for socket syscall fds Arnaldo Carvalho de Melo
2015-08-12 16:39 ` [PATCH 05/13] perf trace: Beautify keyctl's option arg Arnaldo Carvalho de Melo
2015-08-12 16:39 ` [PATCH 06/13] perf ui browser: Introduce ui_browser__write_nstring() Arnaldo Carvalho de Melo
2015-08-12 16:39 ` [PATCH 07/13] perf ui browser: Introduce ui_browser__printf() Arnaldo Carvalho de Melo
2015-08-12 16:39 ` [PATCH 08/13] perf hists browser: Make ESC unzoom as well Arnaldo Carvalho de Melo
2015-08-12 16:39 ` [PATCH 09/13] perf probe: Fix to show lines of sys_ functions correctly Arnaldo Carvalho de Melo
2015-08-12 16:39 ` [PATCH 10/13] perf callchain: Per-event type selection support Arnaldo Carvalho de Melo
2015-08-12 16:39 ` [PATCH 11/13] perf callchain: Allow disabling call graphs per event Arnaldo Carvalho de Melo
2015-08-12 16:40 ` [PATCH 12/13] perf report: Show call graph from reference events Arnaldo Carvalho de Melo
2015-08-12 16:40 ` [PATCH 13/13] perf tests: Add tests to callgraph and time parse Arnaldo Carvalho de Melo
2015-08-13  7:25 ` [GIT PULL 00/13] perf/core improvements and fixes Ingo Molnar

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1439397601-26918-4-git-send-email-acme@kernel.org \
    --to=acme@kernel.org \
    --cc=acme@redhat.com \
    --cc=ak@linux.intel.com \
    --cc=jolsa@kernel.org \
    --cc=linux-kernel@vger.kernel.org \
    --cc=mingo@kernel.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).