From: Steven Rostedt <rostedt@goodmis.org>
To: linux-kernel@vger.kernel.org
Cc: Ingo Molnar <mingo@elte.hu>,
Andrew Morton <akpm@linux-foundation.org>,
Minchan Kim <minchan.kim@gmail.com>, Mel Gorman <mel@csn.ul.ie>,
Christoph Hellwig <hch@infradead.org>,
Rik van Riel <riel@redhat.com>,
Pekka Enberg <penberg@cs.helsinki.fi>,
Peter Zijlstra <peterz@infradead.org>,
Frederic Weisbecker <fweisbec@gmail.com>,
Theodore Tso <tytso@mit.edu>,
Mathieu Desnoyers <compudj@krystal.dyndns.org>,
Lai Jiangshan <laijs@cn.fujitsu.com>,
Zhaolei <zhaolei@cn.fujitsu.com>,
KOSAKI Motohiro <kosaki.motohiro@jp.fujitsu.com>,
Jason Baron <jbaron@redhat.com>,
Jiaying Zhang <jiayingz@google.com>,
Tom Zanussi <tzanussi@gmail.com>,
Xiao Guangrong <xiaoguangrong@cn.fujitsu.com>
Subject: [PATCH 06/11] tracing: convert the block trace points to use the new tag format
Date: Wed, 10 Jun 2009 01:42:12 -0400 [thread overview]
Message-ID: <20090610054254.000869193@goodmis.org> (raw)
In-Reply-To: <20090610054206.510574695@goodmis.org>
[-- Attachment #1: 0006-tracing-convert-the-block-trace-points-to-use-the-ne.patch --]
[-- Type: text/plain, Size: 7872 bytes --]
From: Steven Rostedt <srostedt@redhat.com>
Convert the block trace points to use the new tag format for easier parsing
by userspace tools.
Signed-off-by: Steven Rostedt <rostedt@goodmis.org>
---
include/trace/events/block.h | 101 ++++++++++++++----------------------------
1 files changed, 34 insertions(+), 67 deletions(-)
diff --git a/include/trace/events/block.h b/include/trace/events/block.h
index 53effd4..f12cee3 100644
--- a/include/trace/events/block.h
+++ b/include/trace/events/block.h
@@ -34,11 +34,8 @@ TRACE_EVENT(block_rq_abort,
blk_dump_cmd(__get_str(cmd), rq);
),
- TP_printk("%d,%d %s (%s) %llu + %u [%d]",
- MAJOR(__entry->dev), MINOR(__entry->dev),
- __entry->rwbs, __get_str(cmd),
- (unsigned long long)__entry->sector,
- __entry->nr_sector, __entry->errors)
+ TP_FORMAT("<major:dev>,<minor:dev> <strarray:rwbs> (<string:cmd>) "
+ "<uint:sector> + <uint:nr_sector> [<int:errors>]")
);
TRACE_EVENT(block_rq_insert,
@@ -69,11 +66,9 @@ TRACE_EVENT(block_rq_insert,
memcpy(__entry->comm, current->comm, TASK_COMM_LEN);
),
- TP_printk("%d,%d %s %u (%s) %llu + %u [%s]",
- MAJOR(__entry->dev), MINOR(__entry->dev),
- __entry->rwbs, __entry->bytes, __get_str(cmd),
- (unsigned long long)__entry->sector,
- __entry->nr_sector, __entry->comm)
+ TP_FORMAT("<major:dev>,<minor:dev> <strarray:rwbs> <uint:bytes>"
+ " (<string:cmd>) <uint:sector> + <uint:nr_sector>"
+ " [<strarray:comm>]")
);
TRACE_EVENT(block_rq_issue,
@@ -104,11 +99,9 @@ TRACE_EVENT(block_rq_issue,
memcpy(__entry->comm, current->comm, TASK_COMM_LEN);
),
- TP_printk("%d,%d %s %u (%s) %llu + %u [%s]",
- MAJOR(__entry->dev), MINOR(__entry->dev),
- __entry->rwbs, __entry->bytes, __get_str(cmd),
- (unsigned long long)__entry->sector,
- __entry->nr_sector, __entry->comm)
+ TP_FORMAT("<major:dev>,<minor:dev> <strarray:rwbs> <uint:bytes>"
+ " (<string:cmd>) <uint:sector> + <uint:nr_sector>"
+ " [<strarray:comm>]")
);
TRACE_EVENT(block_rq_requeue,
@@ -137,11 +130,8 @@ TRACE_EVENT(block_rq_requeue,
blk_dump_cmd(__get_str(cmd), rq);
),
- TP_printk("%d,%d %s (%s) %llu + %u [%d]",
- MAJOR(__entry->dev), MINOR(__entry->dev),
- __entry->rwbs, __get_str(cmd),
- (unsigned long long)__entry->sector,
- __entry->nr_sector, __entry->errors)
+ TP_FORMAT("<major:dev>,<minor:dev> <strarray:rwbs> (<string:cmd>)"
+ " <uint:sector> + <uint:nr_sector> [<int:errors>]")
);
TRACE_EVENT(block_rq_complete,
@@ -170,11 +160,8 @@ TRACE_EVENT(block_rq_complete,
blk_dump_cmd(__get_str(cmd), rq);
),
- TP_printk("%d,%d %s (%s) %llu + %u [%d]",
- MAJOR(__entry->dev), MINOR(__entry->dev),
- __entry->rwbs, __get_str(cmd),
- (unsigned long long)__entry->sector,
- __entry->nr_sector, __entry->errors)
+ TP_FORMAT("<major:dev>,<minor:dev> <strarray:rwbs> (<string:cmd>) "
+ "<uint:sector> + <uint:nr_sector> [<int:errors>]")
);
TRACE_EVENT(block_bio_bounce,
@@ -198,10 +185,8 @@ TRACE_EVENT(block_bio_bounce,
memcpy(__entry->comm, current->comm, TASK_COMM_LEN);
),
- TP_printk("%d,%d %s %llu + %u [%s]",
- MAJOR(__entry->dev), MINOR(__entry->dev), __entry->rwbs,
- (unsigned long long)__entry->sector,
- __entry->nr_sector, __entry->comm)
+ TP_FORMAT("<major:dev>,<minor:dev> <strarray:rwbs> "
+ "<uint:sector> + <uint:nr_sector> [<strarray:comm>]")
);
TRACE_EVENT(block_bio_complete,
@@ -225,10 +210,8 @@ TRACE_EVENT(block_bio_complete,
blk_fill_rwbs(__entry->rwbs, bio->bi_rw, bio->bi_size);
),
- TP_printk("%d,%d %s %llu + %u [%d]",
- MAJOR(__entry->dev), MINOR(__entry->dev), __entry->rwbs,
- (unsigned long long)__entry->sector,
- __entry->nr_sector, __entry->error)
+ TP_FORMAT("<major:dev>,<minor:dev> <strarray:rwbs> <uint:sector>"
+ " + <uint:nr_sector> [<int:error>]")
);
TRACE_EVENT(block_bio_backmerge,
@@ -253,10 +236,8 @@ TRACE_EVENT(block_bio_backmerge,
memcpy(__entry->comm, current->comm, TASK_COMM_LEN);
),
- TP_printk("%d,%d %s %llu + %u [%s]",
- MAJOR(__entry->dev), MINOR(__entry->dev), __entry->rwbs,
- (unsigned long long)__entry->sector,
- __entry->nr_sector, __entry->comm)
+ TP_FORMAT("<major:dev>,<minor:dev> <strarray:rwbs> "
+ "<uint:sector> + <uint:nr_sector> [<strarray:comm>]")
);
TRACE_EVENT(block_bio_frontmerge,
@@ -281,10 +262,8 @@ TRACE_EVENT(block_bio_frontmerge,
memcpy(__entry->comm, current->comm, TASK_COMM_LEN);
),
- TP_printk("%d,%d %s %llu + %u [%s]",
- MAJOR(__entry->dev), MINOR(__entry->dev), __entry->rwbs,
- (unsigned long long)__entry->sector,
- __entry->nr_sector, __entry->comm)
+ TP_FORMAT("<major:dev>,<minor:dev> <strarray:rwbs> "
+ "<uint:sector> + <uint:nr_sector> [<strarray:comm>]")
);
TRACE_EVENT(block_bio_queue,
@@ -309,10 +288,8 @@ TRACE_EVENT(block_bio_queue,
memcpy(__entry->comm, current->comm, TASK_COMM_LEN);
),
- TP_printk("%d,%d %s %llu + %u [%s]",
- MAJOR(__entry->dev), MINOR(__entry->dev), __entry->rwbs,
- (unsigned long long)__entry->sector,
- __entry->nr_sector, __entry->comm)
+ TP_FORMAT("<major:dev>,<minor:dev> <strarray:rwbs> "
+ "<uint:sector> + <uint:nr_sector> [<strarray:comm>]")
);
TRACE_EVENT(block_getrq,
@@ -338,10 +315,8 @@ TRACE_EVENT(block_getrq,
memcpy(__entry->comm, current->comm, TASK_COMM_LEN);
),
- TP_printk("%d,%d %s %llu + %u [%s]",
- MAJOR(__entry->dev), MINOR(__entry->dev), __entry->rwbs,
- (unsigned long long)__entry->sector,
- __entry->nr_sector, __entry->comm)
+ TP_FORMAT("<major:dev>,<minor:dev> <strarray:rwbs> "
+ "<uint:sector> + <uint:nr_sector> [<strarray:comm>]")
);
TRACE_EVENT(block_sleeprq,
@@ -367,10 +342,8 @@ TRACE_EVENT(block_sleeprq,
memcpy(__entry->comm, current->comm, TASK_COMM_LEN);
),
- TP_printk("%d,%d %s %llu + %u [%s]",
- MAJOR(__entry->dev), MINOR(__entry->dev), __entry->rwbs,
- (unsigned long long)__entry->sector,
- __entry->nr_sector, __entry->comm)
+ TP_FORMAT("<major:dev>,<minor:dev> <strarray:rwbs> "
+ "<uint:sector> + <uint:nr_sector> [<strarray:comm>]")
);
TRACE_EVENT(block_plug,
@@ -387,7 +360,7 @@ TRACE_EVENT(block_plug,
memcpy(__entry->comm, current->comm, TASK_COMM_LEN);
),
- TP_printk("[%s]", __entry->comm)
+ TP_FORMAT("[<strarray:comm>]")
);
TRACE_EVENT(block_unplug_timer,
@@ -406,7 +379,7 @@ TRACE_EVENT(block_unplug_timer,
memcpy(__entry->comm, current->comm, TASK_COMM_LEN);
),
- TP_printk("[%s] %d", __entry->comm, __entry->nr_rq)
+ TP_FORMAT("[<strarray:comm>] <int:nr_rq>")
);
TRACE_EVENT(block_unplug_io,
@@ -425,7 +398,7 @@ TRACE_EVENT(block_unplug_io,
memcpy(__entry->comm, current->comm, TASK_COMM_LEN);
),
- TP_printk("[%s] %d", __entry->comm, __entry->nr_rq)
+ TP_FORMAT("[<strarray:comm>] <int:nr_rq>")
);
TRACE_EVENT(block_split,
@@ -451,11 +424,8 @@ TRACE_EVENT(block_split,
memcpy(__entry->comm, current->comm, TASK_COMM_LEN);
),
- TP_printk("%d,%d %s %llu / %llu [%s]",
- MAJOR(__entry->dev), MINOR(__entry->dev), __entry->rwbs,
- (unsigned long long)__entry->sector,
- (unsigned long long)__entry->new_sector,
- __entry->comm)
+ TP_FORMAT("<major:dev>,<minor:dev> <strarray:rwbs> <uint:sector> / "
+ "<uint:new_sector> [<strarray:comm>]")
);
TRACE_EVENT(block_remap,
@@ -483,12 +453,9 @@ TRACE_EVENT(block_remap,
blk_fill_rwbs(__entry->rwbs, bio->bi_rw, bio->bi_size);
),
- TP_printk("%d,%d %s %llu + %u <- (%d,%d) %llu",
- MAJOR(__entry->dev), MINOR(__entry->dev), __entry->rwbs,
- (unsigned long long)__entry->sector,
- __entry->nr_sector,
- MAJOR(__entry->old_dev), MINOR(__entry->old_dev),
- (unsigned long long)__entry->old_sector)
+ TP_FORMAT("<major:dev>,<minor:dev> <strarray:rwbs> <uint:sector> + "
+ "<uint:nr_sector> <<- (<major:old_dev>,<minor:old_dev>) "
+ "<uint:old_sector>")
);
#endif /* _TRACE_BLOCK_H */
--
1.6.3.1
--
next prev parent reply other threads:[~2009-06-10 5:44 UTC|newest]
Thread overview: 29+ messages / expand[flat|nested] mbox.gz Atom feed top
2009-06-10 5:42 [PATCH 00/11] [GIT PULL] more updates for the " Steven Rostedt
2009-06-10 5:42 ` [PATCH 01/11] tracing/events: convert block trace points to TRACE_EVENT(), fix Steven Rostedt
2009-06-10 5:42 ` [PATCH 02/11] tracing: add nsec2sec print formats Steven Rostedt
2009-06-10 5:42 ` [PATCH 03/11] tracing: convert lockdep lock_acquired trace point to use nsec2usec tag Steven Rostedt
2009-06-10 5:42 ` [PATCH 04/11] tracing: add major and minor tags for print format Steven Rostedt
2009-06-10 5:42 ` [PATCH 05/11] tracing: use << to print < instead of \< Steven Rostedt
2009-06-10 5:42 ` Steven Rostedt [this message]
2009-06-10 5:42 ` [PATCH 07/11] tracing: add test for strings in event tag format Steven Rostedt
2009-06-10 5:42 ` [PATCH 08/11] tracing: add func and symfunc to " Steven Rostedt
2009-06-10 7:48 ` Frederic Weisbecker
2009-06-10 12:55 ` Steven Rostedt
2009-06-10 5:42 ` [PATCH 09/11] tracing: check full name for field Steven Rostedt
2009-06-10 5:42 ` [PATCH 10/11] tracing: update sample code with new tag format Steven Rostedt
2009-06-10 5:42 ` [PATCH 11/11] tracing: move > to out of macros and into print statement Steven Rostedt
2009-06-10 9:26 ` [PATCH 00/11] [GIT PULL] more updates for the tag format Ingo Molnar
2009-06-10 11:11 ` Frédéric Weisbecker
2009-06-10 13:01 ` Theodore Tso
2009-06-10 13:49 ` Steven Rostedt
2009-06-10 14:39 ` Mathieu Desnoyers
2009-06-10 15:21 ` Steven Rostedt
2009-06-10 16:03 ` Theodore Tso
2009-06-10 16:17 ` Steven Rostedt
2009-06-11 13:03 ` Christoph Hellwig
2009-06-11 15:47 ` Theodore Tso
2009-06-11 17:14 ` Frederic Weisbecker
2009-06-11 19:20 ` Theodore Tso
2009-06-19 8:14 ` [BUG] bugs in jbd2_dev_to_name() (was Re: [PATCH 00/11] [GIT PULL] more updates for the tag format) Li Zefan
2009-06-19 12:32 ` Theodore Tso
2009-06-22 1:36 ` Li Zefan
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=20090610054254.000869193@goodmis.org \
--to=rostedt@goodmis.org \
--cc=akpm@linux-foundation.org \
--cc=compudj@krystal.dyndns.org \
--cc=fweisbec@gmail.com \
--cc=hch@infradead.org \
--cc=jbaron@redhat.com \
--cc=jiayingz@google.com \
--cc=kosaki.motohiro@jp.fujitsu.com \
--cc=laijs@cn.fujitsu.com \
--cc=linux-kernel@vger.kernel.org \
--cc=mel@csn.ul.ie \
--cc=minchan.kim@gmail.com \
--cc=mingo@elte.hu \
--cc=penberg@cs.helsinki.fi \
--cc=peterz@infradead.org \
--cc=riel@redhat.com \
--cc=tytso@mit.edu \
--cc=tzanussi@gmail.com \
--cc=xiaoguangrong@cn.fujitsu.com \
--cc=zhaolei@cn.fujitsu.com \
/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
Powered by JetHome