public inbox for linux-kernel@vger.kernel.org
 help / color / mirror / Atom feed
From: David Sharp <dhsharp@google.com>
To: rostedt@goodmis.org, linux-kernel@vger.kernel.org
Cc: mrubin@google.com, David Sharp <dhsharp@google.com>
Subject: [PATCH 14/15] small_traces: Remove trace output of large fields.
Date: Fri,  3 Dec 2010 16:13:28 -0800	[thread overview]
Message-ID: <1291421609-14665-15-git-send-email-dhsharp@google.com> (raw)
In-Reply-To: <1291421609-14665-1-git-send-email-dhsharp@google.com>

Google-Bug-Id: 3224547

Signed-off-by: David Sharp <dhsharp@google.com>
---
 kernel/trace/trace.c        |    6 ++++++
 kernel/trace/trace_output.c |   18 ++++++++++++++++++
 2 files changed, 24 insertions(+), 0 deletions(-)

diff --git a/kernel/trace/trace.c b/kernel/trace/trace.c
index ed5c14f..177d4e5 100644
--- a/kernel/trace/trace.c
+++ b/kernel/trace/trace.c
@@ -1747,6 +1747,7 @@ static void s_stop(struct seq_file *m, void *p)
 
 static void print_lat_help_header(struct seq_file *m)
 {
+#ifndef CONFIG_SMALL_TRACES
 	seq_puts(m, "#                  _------=> CPU#            \n");
 	seq_puts(m, "#                 / _-----=> irqs-off        \n");
 	seq_puts(m, "#                | / _----=> need-resched    \n");
@@ -1756,6 +1757,11 @@ static void print_lat_help_header(struct seq_file *m)
 	seq_puts(m, "#                |||||/     delay             \n");
 	seq_puts(m, "#  cmd     pid   |||||| time  |   caller      \n");
 	seq_puts(m, "#     \\   /      ||||||   \\   |   /           \n");
+#else
+	seq_puts(m, "#               CPU#   delay             \n");
+	seq_puts(m, "#  cmd     pid   | time  |   caller      \n");
+	seq_puts(m, "#     \\   /      |   \\   |   /           \n");
+#endif
 }
 
 static void print_func_help_header(struct seq_file *m)
diff --git a/kernel/trace/trace_output.c b/kernel/trace/trace_output.c
index 9e33b1f..d5d7575 100644
--- a/kernel/trace/trace_output.c
+++ b/kernel/trace/trace_output.c
@@ -531,6 +531,7 @@ seq_print_ip_sym(struct trace_seq *s, unsigned long ip, unsigned long sym_flags)
  * Prints the generic fields of irqs off, in hard or softirq, preempt
  * count and lock depth.
  */
+#ifndef CONFIG_SMALL_TRACES
 int trace_print_lat_fmt(struct trace_seq *s, struct trace_entry *entry)
 {
 	int ret;
@@ -566,6 +567,12 @@ int trace_print_lat_fmt(struct trace_seq *s, struct trace_entry *entry)
 
 	return trace_seq_printf(s, "%d", entry->lock_depth);
 }
+#else
+int trace_print_lat_fmt(struct trace_seq *s, struct trace_entry *entry)
+{
+	return 1;
+}
+#endif
 
 static int
 lat_print_generic(struct trace_seq *s, struct trace_entry *entry, int cpu)
@@ -628,6 +635,7 @@ int trace_print_lat_context(struct trace_iterator *iter)
 
 		trace_find_cmdline(entry->pid, comm);
 
+#ifndef CONFIG_SMALL_TRACES
 		ret = trace_seq_printf(s, "%16s %5d %3d %d %08x %08lx [%08llx]"
 				       " %ld.%03ldms (+%ld.%03ldms): ", comm,
 				       entry->pid, iter->cpu, entry->flags,
@@ -637,6 +645,16 @@ int trace_print_lat_context(struct trace_iterator *iter)
 				       abs_usecs % USEC_PER_MSEC,
 				       rel_usecs / USEC_PER_MSEC,
 				       rel_usecs % USEC_PER_MSEC);
+#else
+		ret = trace_seq_printf(s, "%16s %5d %3d %08lx [%08llx]"
+				       " %ld.%03ldms (+%ld.%03ldms): ", comm,
+				       entry->pid, iter->cpu, iter->idx,
+				       ns2usecs(iter->ts),
+				       abs_usecs / USEC_PER_MSEC,
+				       abs_usecs % USEC_PER_MSEC,
+				       rel_usecs / USEC_PER_MSEC,
+				       rel_usecs % USEC_PER_MSEC);
+#endif
 	} else {
 		ret = lat_print_generic(s, entry, iter->cpu);
 		if (ret)
-- 
1.7.3.1


  parent reply	other threads:[~2010-12-04  0:15 UTC|newest]

Thread overview: 74+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2010-12-04  0:13 [Patch 00/15] Reduce tracing payload size David Sharp
2010-12-04  0:13 ` [PATCH 01/15] tracing: Add a 'buffer_overwrite' debugfs file David Sharp
2010-12-04  1:57   ` Steven Rostedt
2010-12-08 20:15     ` David Sharp
2010-12-08 21:46       ` [PATCH] tracing: Add an 'overwrite' trace_option David Sharp
2010-12-14  0:39         ` David Sharp
2011-03-09  0:45         ` David Sharp
2011-03-11  9:45         ` [tip:perf/core] " tip-bot for David Sharp
2010-12-04  0:13 ` [PATCH 02/15] ring_buffer.c: Remove unused #include <linux/trace_irq.h> David Sharp
2011-03-11  9:46   ` [tip:perf/core] ring-buffer: " tip-bot for David Sharp
2010-12-04  0:13 ` [PATCH 03/15] ring_buffer: Align buffer_page struct allocations only to fit the flags David Sharp
2010-12-04  1:43   ` Steven Rostedt
2010-12-07 22:44     ` David Sharp
2010-12-04  0:13 ` [PATCH 04/15] ftrace: pack event structures David Sharp
2011-03-08 23:30   ` Steven Rostedt
2011-03-09  1:09     ` Steven Rostedt
2011-03-09  6:39     ` David Miller
2011-03-09 15:18       ` Steven Rostedt
2011-03-10 23:21         ` David Sharp
2011-03-11  3:37           ` Steven Rostedt
2011-03-09 13:01   ` Steven Rostedt
2010-12-04  0:13 ` [PATCH 05/15] ftrace: fix event alignment: ftrace:context_switch and ftrace:wakeup David Sharp
2011-03-11  9:48   ` [tip:perf/core] tracing: Fix " tip-bot for David Sharp
2010-12-04  0:13 ` [PATCH 06/15] ftrace: fix event alignment: module:module_request David Sharp
2010-12-04  1:47   ` Steven Rostedt
2010-12-06  1:28     ` Li Zefan
2011-03-11  9:48   ` [tip:perf/core] tracing: Fix " tip-bot for David Sharp
2010-12-04  0:13 ` [PATCH 07/15] ftrace: fix event alignment: kvm:kvm_hv_hypercall David Sharp
2010-12-04  1:49   ` Steven Rostedt
2010-12-04  8:11   ` Avi Kivity
2010-12-06 20:38     ` David Sharp
2010-12-07  9:22       ` Avi Kivity
2010-12-07 21:16         ` David Sharp
2010-12-08  9:18           ` Avi Kivity
2011-03-08 23:55             ` Steven Rostedt
2011-03-09  8:50               ` Avi Kivity
2011-03-09 12:54                 ` Steven Rostedt
2011-03-09 13:01                   ` Avi Kivity
2011-03-11  9:49   ` [tip:perf/core] tracing: Fix " tip-bot for David Sharp
2010-12-04  0:13 ` [PATCH 08/15] ftrace: fix event alignment: mce:mce_record David Sharp
2010-12-04  1:50   ` Steven Rostedt
2010-12-09 13:33     ` Frederic Weisbecker
2011-03-11  9:49   ` [tip:perf/core] tracing: Fix " tip-bot for David Sharp
2010-12-04  0:13 ` [PATCH 09/15] ftrace: fix event alignment: skb:kfree_skb David Sharp
2010-12-04  1:52   ` Steven Rostedt
2010-12-04 13:38     ` Neil Horman
2011-03-11  9:50   ` [tip:perf/core] tracing: Fix " tip-bot for David Sharp
2010-12-04  0:13 ` [PATCH 10/15] ftrace: fix event alignment: jbd2:* David Sharp
2010-12-04  1:52   ` Steven Rostedt
2011-03-09  0:03     ` Steven Rostedt
2011-03-09  0:31       ` Ted Ts'o
2011-03-09  0:41         ` Steven Rostedt
2010-12-04  0:13 ` [PATCH 11/15] ftrace: fix event alignment: ext4:* David Sharp
2010-12-04  1:53   ` Steven Rostedt
2011-03-09  0:04     ` Steven Rostedt
2010-12-04  0:13 ` [PATCH 12/15] trace_output.c: adjust conditional expression formatting David Sharp
2011-03-11  9:50   ` [tip:perf/core] tracing: Adjust conditional expression latency formatting tip-bot for David Sharp
2010-12-04  0:13 ` [PATCH 13/15] small_traces: Add config option to shrink trace events David Sharp
2010-12-04  1:56   ` Steven Rostedt
2010-12-04  2:33     ` David Sharp
2010-12-04  2:54       ` Steven Rostedt
2010-12-09 14:55         ` Frederic Weisbecker
2010-12-09 15:08           ` Steven Rostedt
2010-12-09 15:28             ` Frederic Weisbecker
2010-12-09 16:16               ` Mathieu Desnoyers
2011-03-09  0:23   ` Steven Rostedt
2010-12-04  0:13 ` David Sharp [this message]
2010-12-04  0:13 ` [PATCH 15/15] small_traces: Remove 8 bytes from trace_entry David Sharp
2010-12-06 13:22 ` [Patch 00/15] Reduce tracing payload size Andi Kleen
2010-12-06 13:56   ` Ted Ts'o
2010-12-06 14:58     ` Andi Kleen
2010-12-06 16:17       ` Steven Rostedt
2010-12-06 16:31       ` Miguel Ojeda
2010-12-06 16:41         ` Andi Kleen

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=1291421609-14665-15-git-send-email-dhsharp@google.com \
    --to=dhsharp@google.com \
    --cc=linux-kernel@vger.kernel.org \
    --cc=mrubin@google.com \
    --cc=rostedt@goodmis.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