From: Namhyung Kim <namhyung@kernel.org>
To: Arnaldo Carvalho de Melo <acme@ghostprotocols.net>
Cc: Peter Zijlstra <a.p.zijlstra@chello.nl>,
Paul Mackerras <paulus@samba.org>, Ingo Molnar <mingo@kernel.org>,
LKML <linux-kernel@vger.kernel.org>,
Pekka Enberg <penberg@kernel.org>,
Namhyung Kim <namhyung.kim@lge.com>
Subject: [PATCH 5/6] perf gtk/annotate: Show source lines with gray color
Date: Fri, 21 Dec 2012 17:20:17 +0900 [thread overview]
Message-ID: <1356078018-31905-6-git-send-email-namhyung@kernel.org> (raw)
In-Reply-To: <1356078018-31905-1-git-send-email-namhyung@kernel.org>
From: Namhyung Kim <namhyung.kim@lge.com>
In order to differentiate source lines from asm line, print them with
gray color. To do this, it needs to be escaped since sometimes it
contains "<" and/or ">" characters so that it should not be considered
as a markup tags. Use glib's g_markup_escape_text() for this.
Cc: Pekka Enberg <penberg@kernel.org>
Signed-off-by: Namhyung Kim <namhyung@kernel.org>
---
tools/perf/ui/gtk/annotate.c | 30 +++++++++++++++++++++++++++---
1 file changed, 27 insertions(+), 3 deletions(-)
diff --git a/tools/perf/ui/gtk/annotate.c b/tools/perf/ui/gtk/annotate.c
index 191ee4e30d93..771b04c0df30 100644
--- a/tools/perf/ui/gtk/annotate.c
+++ b/tools/perf/ui/gtk/annotate.c
@@ -60,6 +60,30 @@ static int perf_gtk__get_offset(char *buf, size_t size, struct symbol *sym,
return scnprintf(buf, size, "%"PRIx64, start + dl->offset);
}
+static int perf_gtk__get_line(char *buf, size_t size, struct disasm_line *dl)
+{
+ int ret = 0;
+ char *line = g_markup_escape_text(dl->line, -1);
+ const char *markup = "<span fgcolor='gray'>";
+
+ strcpy(buf, "");
+
+ if (!line)
+ return 0;
+
+ if (dl->offset != (s64) -1)
+ markup = NULL;
+
+ if (markup)
+ ret += scnprintf(buf, size, "%s", markup);
+ ret += scnprintf(buf + ret, size - ret, "%s", line);
+ if (markup)
+ ret += scnprintf(buf + ret, size - ret, "</span>");
+
+ g_free(line);
+ return ret;
+}
+
static int perf_gtk__annotate_symbol(GtkWidget *window, struct symbol *sym,
struct map *map, int evidx,
struct hist_browser_timer *hbt __maybe_unused)
@@ -93,8 +117,7 @@ static int perf_gtk__annotate_symbol(GtkWidget *window, struct symbol *sym,
for (i = 0; i < MAX_ANN_COLS; i++) {
gtk_tree_view_insert_column_with_attributes(GTK_TREE_VIEW(view),
- -1, col_names[i], renderer,
- i == ANN_COL__PERCENT ? "markup" : "text",
+ -1, col_names[i], renderer, "markup",
i, NULL);
}
@@ -110,7 +133,8 @@ static int perf_gtk__annotate_symbol(GtkWidget *window, struct symbol *sym,
gtk_list_store_set(store, &iter, ANN_COL__PERCENT, s, -1);
if (perf_gtk__get_offset(s, sizeof(s), sym, map, pos))
gtk_list_store_set(store, &iter, ANN_COL__OFFSET, s, -1);
- gtk_list_store_set(store, &iter, ANN_COL__LINE, pos->line, -1);
+ if (perf_gtk__get_line(s, sizeof(s), pos))
+ gtk_list_store_set(store, &iter, ANN_COL__LINE, s, -1);
}
gtk_container_add(GTK_CONTAINER(window), view);
--
1.7.11.7
next prev parent reply other threads:[~2012-12-21 8:21 UTC|newest]
Thread overview: 16+ messages / expand[flat|nested] mbox.gz Atom feed top
2012-12-21 8:20 [PATCH 0/6] perf annotate: Add support for GTK+ annotation browser (v1) Namhyung Kim
2012-12-21 8:20 ` [PATCH 1/6] perf ui/gtk: Factor out common browser routines Namhyung Kim
2013-01-25 11:23 ` [tip:perf/core] " tip-bot for Namhyung Kim
2012-12-21 8:20 ` [PATCH 2/6] perf ui/gtk: Setup browser window early Namhyung Kim
2013-01-25 11:24 ` [tip:perf/core] " tip-bot for Namhyung Kim
2012-12-21 8:20 ` [PATCH 3/6] perf ui/gtk: Implement basic GTK2 annotation browser Namhyung Kim
2012-12-21 14:51 ` Arnaldo Carvalho de Melo
2012-12-24 5:55 ` Namhyung Kim
2012-12-21 8:20 ` [PATCH 4/6] perf gtk/annotate: Support multiple annotation result Namhyung Kim
2012-12-21 8:20 ` Namhyung Kim [this message]
2012-12-21 8:20 ` [PATCH 6/6] perf annotate: Add --gtk option Namhyung Kim
2012-12-21 8:32 ` Borislav Petkov
2012-12-21 9:16 ` Namhyung Kim
2012-12-21 15:44 ` Borislav Petkov
2012-12-24 6:04 ` Namhyung Kim
2012-12-24 13:18 ` Borislav Petkov
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=1356078018-31905-6-git-send-email-namhyung@kernel.org \
--to=namhyung@kernel.org \
--cc=a.p.zijlstra@chello.nl \
--cc=acme@ghostprotocols.net \
--cc=linux-kernel@vger.kernel.org \
--cc=mingo@kernel.org \
--cc=namhyung.kim@lge.com \
--cc=paulus@samba.org \
--cc=penberg@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).