From: tip-bot for David Sharp <dhsharp@google.com>
To: linux-tip-commits@vger.kernel.org
Cc: linux-kernel@vger.kernel.org, hpa@zytor.com, mingo@redhat.com,
rostedt@goodmis.org, dhsharp@google.com, tglx@linutronix.de
Subject: [tip:perf/core] tracing: Adjust conditional expression latency formatting.
Date: Fri, 11 Mar 2011 09:50:31 GMT [thread overview]
Message-ID: <tip-10da37a645b5e915d8572cc2b1f5eb11ada3ea4f@git.kernel.org> (raw)
In-Reply-To: <1291421609-14665-13-git-send-email-dhsharp@google.com>
Commit-ID: 10da37a645b5e915d8572cc2b1f5eb11ada3ea4f
Gitweb: http://git.kernel.org/tip/10da37a645b5e915d8572cc2b1f5eb11ada3ea4f
Author: David Sharp <dhsharp@google.com>
AuthorDate: Fri, 3 Dec 2010 16:13:26 -0800
Committer: Steven Rostedt <rostedt@goodmis.org>
CommitDate: Thu, 10 Mar 2011 10:34:35 -0500
tracing: Adjust conditional expression latency formatting.
Formatting change only to improve code readability. No code changes except to
introduce intermediate variables.
Signed-off-by: David Sharp <dhsharp@google.com>
LKML-Reference: <1291421609-14665-13-git-send-email-dhsharp@google.com>
[ Keep variable declarations and assignment separate ]
Signed-off-by: Steven Rostedt <rostedt@goodmis.org>
---
kernel/trace/trace_output.c | 26 ++++++++++++++++++--------
1 files changed, 18 insertions(+), 8 deletions(-)
diff --git a/kernel/trace/trace_output.c b/kernel/trace/trace_output.c
index 151f32e..456be90 100644
--- a/kernel/trace/trace_output.c
+++ b/kernel/trace/trace_output.c
@@ -533,20 +533,30 @@ seq_print_ip_sym(struct trace_seq *s, unsigned long ip, unsigned long sym_flags)
*/
int trace_print_lat_fmt(struct trace_seq *s, struct trace_entry *entry)
{
- int hardirq, softirq;
+ char hardsoft_irq;
+ char need_resched;
+ char irqs_off;
+ int hardirq;
+ int softirq;
int ret;
hardirq = entry->flags & TRACE_FLAG_HARDIRQ;
softirq = entry->flags & TRACE_FLAG_SOFTIRQ;
+ irqs_off =
+ (entry->flags & TRACE_FLAG_IRQS_OFF) ? 'd' :
+ (entry->flags & TRACE_FLAG_IRQS_NOSUPPORT) ? 'X' :
+ '.';
+ need_resched =
+ (entry->flags & TRACE_FLAG_NEED_RESCHED) ? 'N' : '.';
+ hardsoft_irq =
+ (hardirq && softirq) ? 'H' :
+ hardirq ? 'h' :
+ softirq ? 's' :
+ '.';
+
if (!trace_seq_printf(s, "%c%c%c",
- (entry->flags & TRACE_FLAG_IRQS_OFF) ? 'd' :
- (entry->flags & TRACE_FLAG_IRQS_NOSUPPORT) ?
- 'X' : '.',
- (entry->flags & TRACE_FLAG_NEED_RESCHED) ?
- 'N' : '.',
- (hardirq && softirq) ? 'H' :
- hardirq ? 'h' : softirq ? 's' : '.'))
+ irqs_off, need_resched, hardsoft_irq))
return 0;
if (entry->preempt_count)
next prev parent reply other threads:[~2011-03-11 9:50 UTC|newest]
Thread overview: 75+ 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-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-bot for David Sharp [this message]
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 ` [PATCH 14/15] small_traces: Remove trace output of large fields David Sharp
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=tip-10da37a645b5e915d8572cc2b1f5eb11ada3ea4f@git.kernel.org \
--to=dhsharp@google.com \
--cc=hpa@zytor.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-tip-commits@vger.kernel.org \
--cc=mingo@redhat.com \
--cc=rostedt@goodmis.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.