From: David Ahern <daahern@cisco.com>
To: linux-perf-users@vger.kernel.org, linux-kernel@vger.kernel.org
Cc: acme@ghostprotocols.net, mingo@elte.hu, peterz@infradead.org,
fweisbec@gmail.com, paulus@samba.org, tglx@linutronix.de,
David Ahern <daahern@cisco.com>
Subject: [PATCH 2/6] perf: remove print_graph_cpu and print_graph_proc from trace-event-parse
Date: Wed, 9 Mar 2011 22:23:24 -0700 [thread overview]
Message-ID: <1299734608-5223-3-git-send-email-daahern@cisco.com> (raw)
In-Reply-To: <1299734608-5223-1-git-send-email-daahern@cisco.com>
Next patch moves printing of 'common' data into perf-script which
removes the need for these functions.
Signed-off-by: David Ahern <daahern@cisco.com>
---
tools/perf/util/trace-event-parse.c | 65 +---------------------------------
1 files changed, 2 insertions(+), 63 deletions(-)
diff --git a/tools/perf/util/trace-event-parse.c b/tools/perf/util/trace-event-parse.c
index d8e622d..dd5f058 100644
--- a/tools/perf/util/trace-event-parse.c
+++ b/tools/perf/util/trace-event-parse.c
@@ -2648,63 +2648,8 @@ static void print_lat_fmt(void *data, int size __unused)
printf("%d", lock_depth);
}
-/* taken from Linux, written by Frederic Weisbecker */
-static void print_graph_cpu(int cpu)
-{
- int i;
- int log10_this = log10_cpu(cpu);
- int log10_all = log10_cpu(cpus);
-
-
- /*
- * Start with a space character - to make it stand out
- * to the right a bit when trace output is pasted into
- * email:
- */
- printf(" ");
-
- /*
- * Tricky - we space the CPU field according to the max
- * number of online CPUs. On a 2-cpu system it would take
- * a maximum of 1 digit - on a 128 cpu system it would
- * take up to 3 digits:
- */
- for (i = 0; i < log10_all - log10_this; i++)
- printf(" ");
-
- printf("%d) ", cpu);
-}
-
-#define TRACE_GRAPH_PROCINFO_LENGTH 14
#define TRACE_GRAPH_INDENT 2
-static void print_graph_proc(int pid, const char *comm)
-{
- /* sign + log10(MAX_INT) + '\0' */
- char pid_str[11];
- int spaces = 0;
- int len;
- int i;
-
- sprintf(pid_str, "%d", pid);
-
- /* 1 stands for the "-" character */
- len = strlen(comm) + strlen(pid_str) + 1;
-
- if (len < TRACE_GRAPH_PROCINFO_LENGTH)
- spaces = TRACE_GRAPH_PROCINFO_LENGTH - len;
-
- /* First spaces to align center */
- for (i = 0; i < spaces / 2; i++)
- printf(" ");
-
- printf("%s-%s", comm, pid_str);
-
- /* Last spaces to align center */
- for (i = 0; i < spaces - (spaces / 2); i++)
- printf(" ");
-}
-
static struct record *
get_return_for_leaf(int cpu, int cur_pid, unsigned long long cur_func,
struct record *next)
@@ -2876,7 +2821,7 @@ static void print_graph_nested(struct event *event, void *data)
static void
pretty_print_func_ent(void *data, int size, struct event *event,
- int cpu, int pid, const char *comm,
+ int cpu, int pid, const char *comm __unused,
unsigned long secs, unsigned long usecs)
{
struct format_field *field;
@@ -2886,9 +2831,6 @@ pretty_print_func_ent(void *data, int size, struct event *event,
printf("%5lu.%06lu | ", secs, usecs);
- print_graph_cpu(cpu);
- print_graph_proc(pid, comm);
-
printf(" | ");
if (latency_format) {
@@ -2924,7 +2866,7 @@ out_free:
static void
pretty_print_func_ret(void *data, int size __unused, struct event *event,
- int cpu, int pid, const char *comm,
+ int cpu __unused, int pid __unused, const char *comm __unused,
unsigned long secs, unsigned long usecs)
{
unsigned long long rettime, calltime;
@@ -2934,9 +2876,6 @@ pretty_print_func_ret(void *data, int size __unused, struct event *event,
printf("%5lu.%06lu | ", secs, usecs);
- print_graph_cpu(cpu);
- print_graph_proc(pid, comm);
-
printf(" | ");
if (latency_format) {
--
1.7.4
next prev parent reply other threads:[~2011-03-10 5:23 UTC|newest]
Thread overview: 20+ messages / expand[flat|nested] mbox.gz Atom feed top
2011-03-10 5:23 [PATCH 0/6 v4] perf script: add support for dumping events other than trace David Ahern
2011-03-10 5:23 ` [PATCH 1/6] perf script: change process_event prototype David Ahern
2011-03-16 13:53 ` [tip:perf/urgent] perf script: Change " tip-bot for David Ahern
2011-03-10 5:23 ` David Ahern [this message]
2011-03-16 13:54 ` [tip:perf/urgent] perf tracing: Remove print_graph_cpu and print_graph_proc from trace-event-parse tip-bot for David Ahern
2011-03-10 5:23 ` [PATCH 3/6] perf script: move printing of 'common' data from print_event and rename David Ahern
2011-03-10 15:20 ` Steven Rostedt
2011-03-10 15:51 ` Arnaldo Carvalho de Melo
2011-03-10 16:05 ` Steven Rostedt
2011-03-10 16:20 ` Arnaldo Carvalho de Melo
2011-03-10 16:45 ` David Ahern
2011-03-10 17:07 ` Steven Rostedt
2011-03-11 0:28 ` Frederic Weisbecker
2011-03-16 13:54 ` [tip:perf/urgent] perf script: Move " tip-bot for David Ahern
2011-03-10 5:23 ` [PATCH 4/6] perf script: support custom field selection for output David Ahern
2011-03-16 13:54 ` [tip:perf/urgent] perf script: Support " tip-bot for David Ahern
2011-03-10 5:23 ` [PATCH 5/6] perf script: add support for dumping symbols David Ahern
2011-03-16 13:55 ` [tip:perf/urgent] perf script: Add " tip-bot for David Ahern
2011-03-10 5:23 ` [PATCH 6/6] perf script: add support for H/W and S/W events David Ahern
2011-03-16 13:55 ` [tip:perf/urgent] perf script: Add " tip-bot for David Ahern
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=1299734608-5223-3-git-send-email-daahern@cisco.com \
--to=daahern@cisco.com \
--cc=acme@ghostprotocols.net \
--cc=fweisbec@gmail.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-perf-users@vger.kernel.org \
--cc=mingo@elte.hu \
--cc=paulus@samba.org \
--cc=peterz@infradead.org \
--cc=tglx@linutronix.de \
/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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.