From: Ingo Molnar <mingo@elte•hu>
To: Jens Axboe <jens.axboe@oracle•com>
Cc: Stephen Rothwell <sfr@canb•auug.org.au>,
linux-next@vger•kernel.org,
Mathieu Desnoyers <mathieu.desnoyers@polymtl•ca>,
Arnaldo Carvalho de Melo <acme@redhat•com>
Subject: Re: linux-next: block tree build failure
Date: Wed, 26 Nov 2008 12:16:21 +0100 [thread overview]
Message-ID: <20081126111621.GA20601@elte.hu> (raw)
In-Reply-To: <20081126104700.GI26308@kernel.dk>
* Jens Axboe <jens.axboe@oracle•com> wrote:
> > the other direction (you merging ftrace bits) doesnt look too hot,
> > you'd have to pick up:
> >
> > 95 files changed, 5308 insertions(+), 1603 deletions(-)
>
> Lets do that, it's just a single patch here from Arnaldo. I have
> attached it to this email.
thanks, here's the conversion to tracepoints below. Stephen, you might
want to pick up the blk tree straight away plus the fix below.
Ingo
--------------->
>From 65ae5a3c622e707dbf7630397e94b7e2e9cd0ea5 Mon Sep 17 00:00:00 2001
From: Ingo Molnar <mingo@elte•hu>
Date: Wed, 26 Nov 2008 11:59:56 +0100
Subject: [PATCH] blktrace: port to tracepoints, update
Port to the new tracepoints API: split DEFINE_TRACE() and DECLARE_TRACE()
sites.
Signed-off-by: Ingo Molnar <mingo@elte•hu>
---
block/blktrace.c | 18 ++++++++++
include/trace/block.h | 84 +++++++++++++++++++++++++++++--------------------
2 files changed, 68 insertions(+), 34 deletions(-)
diff --git a/block/blktrace.c b/block/blktrace.c
index b0a2cae..1dba3fb 100644
--- a/block/blktrace.c
+++ b/block/blktrace.c
@@ -35,6 +35,24 @@ static atomic_t blk_probes_ref = ATOMIC_INIT(0);
static int blk_register_tracepoints(void);
static void blk_unregister_tracepoints(void);
+DEFINE_TRACE(block_bio_backmerge);
+DEFINE_TRACE(block_bio_bounce);
+DEFINE_TRACE(block_bio_complete);
+DEFINE_TRACE(block_bio_frontmerge);
+DEFINE_TRACE(block_bio_queue);
+DEFINE_TRACE(block_getrq);
+DEFINE_TRACE(block_plug);
+DEFINE_TRACE(block_remap);
+DEFINE_TRACE(block_rq_abort);
+DEFINE_TRACE(block_rq_complete);
+DEFINE_TRACE(block_rq_insert);
+DEFINE_TRACE(block_rq_issue);
+DEFINE_TRACE(block_rq_requeue);
+DEFINE_TRACE(block_sleeprq);
+DEFINE_TRACE(block_split);
+DEFINE_TRACE(block_unplug_io);
+DEFINE_TRACE(block_unplug_timer);
+
/*
* Send out a notify message.
*/
diff --git a/include/trace/block.h b/include/trace/block.h
index 3cc2675..25c6a1f 100644
--- a/include/trace/block.h
+++ b/include/trace/block.h
@@ -4,57 +4,73 @@
#include <linux/blkdev.h>
#include <linux/tracepoint.h>
-DEFINE_TRACE(block_rq_abort,
+DECLARE_TRACE(block_rq_abort,
TPPROTO(struct request_queue *q, struct request *rq),
- TPARGS(q, rq));
-DEFINE_TRACE(block_rq_insert,
+ TPARGS(q, rq));
+
+DECLARE_TRACE(block_rq_insert,
TPPROTO(struct request_queue *q, struct request *rq),
- TPARGS(q, rq));
-DEFINE_TRACE(block_rq_issue,
+ TPARGS(q, rq));
+
+DECLARE_TRACE(block_rq_issue,
TPPROTO(struct request_queue *q, struct request *rq),
- TPARGS(q, rq));
-DEFINE_TRACE(block_rq_requeue,
+ TPARGS(q, rq));
+
+DECLARE_TRACE(block_rq_requeue,
TPPROTO(struct request_queue *q, struct request *rq),
- TPARGS(q, rq));
-DEFINE_TRACE(block_rq_complete,
+ TPARGS(q, rq));
+
+DECLARE_TRACE(block_rq_complete,
TPPROTO(struct request_queue *q, struct request *rq),
- TPARGS(q, rq));
-DEFINE_TRACE(block_bio_bounce,
+ TPARGS(q, rq));
+
+DECLARE_TRACE(block_bio_bounce,
TPPROTO(struct request_queue *q, struct bio *bio),
- TPARGS(q, bio));
-DEFINE_TRACE(block_bio_complete,
+ TPARGS(q, bio));
+
+DECLARE_TRACE(block_bio_complete,
TPPROTO(struct request_queue *q, struct bio *bio),
- TPARGS(q, bio));
-DEFINE_TRACE(block_bio_backmerge,
+ TPARGS(q, bio));
+
+DECLARE_TRACE(block_bio_backmerge,
TPPROTO(struct request_queue *q, struct bio *bio),
- TPARGS(q, bio));
-DEFINE_TRACE(block_bio_frontmerge,
+ TPARGS(q, bio));
+
+DECLARE_TRACE(block_bio_frontmerge,
TPPROTO(struct request_queue *q, struct bio *bio),
- TPARGS(q, bio));
-DEFINE_TRACE(block_bio_queue,
+ TPARGS(q, bio));
+
+DECLARE_TRACE(block_bio_queue,
TPPROTO(struct request_queue *q, struct bio *bio),
- TPARGS(q, bio));
-DEFINE_TRACE(block_getrq,
+ TPARGS(q, bio));
+
+DECLARE_TRACE(block_getrq,
TPPROTO(struct request_queue *q, struct bio *bio, int rw),
- TPARGS(q, bio, rw));
-DEFINE_TRACE(block_sleeprq,
+ TPARGS(q, bio, rw));
+
+DECLARE_TRACE(block_sleeprq,
TPPROTO(struct request_queue *q, struct bio *bio, int rw),
- TPARGS(q, bio, rw));
-DEFINE_TRACE(block_plug,
+ TPARGS(q, bio, rw));
+
+DECLARE_TRACE(block_plug,
TPPROTO(struct request_queue *q),
- TPARGS(q));
-DEFINE_TRACE(block_unplug_timer,
+ TPARGS(q));
+
+DECLARE_TRACE(block_unplug_timer,
TPPROTO(struct request_queue *q),
- TPARGS(q));
-DEFINE_TRACE(block_unplug_io,
+ TPARGS(q));
+
+DECLARE_TRACE(block_unplug_io,
TPPROTO(struct request_queue *q),
- TPARGS(q));
-DEFINE_TRACE(block_split,
+ TPARGS(q));
+
+DECLARE_TRACE(block_split,
TPPROTO(struct request_queue *q, struct bio *bio, unsigned int pdu),
- TPARGS(q, bio, pdu));
-DEFINE_TRACE(block_remap,
+ TPARGS(q, bio, pdu));
+
+DECLARE_TRACE(block_remap,
TPPROTO(struct request_queue *q, struct bio *bio, dev_t dev,
sector_t from, sector_t to),
- TPARGS(q, bio, dev, from, to));
+ TPARGS(q, bio, dev, from, to));
#endif
next prev parent reply other threads:[~2008-11-26 11:16 UTC|newest]
Thread overview: 94+ messages / expand[flat|nested] mbox.gz Atom feed top
2008-11-26 10:29 linux-next: block tree build failure Stephen Rothwell
2008-11-26 10:42 ` Ingo Molnar
2008-11-26 10:47 ` Jens Axboe
2008-11-26 11:06 ` [PATCH] Blktrace : conversion to tracepoint define Mathieu Desnoyers
2008-11-26 11:22 ` Ingo Molnar
2008-11-26 11:23 ` Ingo Molnar
2008-11-26 11:27 ` Mathieu Desnoyers
2008-11-26 11:37 ` Ingo Molnar
2008-11-26 11:56 ` Mathieu Desnoyers
2008-11-26 11:16 ` Ingo Molnar [this message]
2008-11-26 11:20 ` linux-next: block tree build failure Jens Axboe
2008-11-26 11:28 ` Ingo Molnar
2008-11-26 11:23 ` Mathieu Desnoyers
2008-11-26 11:25 ` Ingo Molnar
-- strict thread matches above, loose matches on Subject: below --
2009-12-07 8:44 Stephen Rothwell
2009-12-07 8:49 ` Jens Axboe
2009-12-07 9:23 ` Stephen Rothwell
2009-12-07 9:28 ` Jens Axboe
2009-12-04 3:36 Stephen Rothwell
2009-12-04 7:43 ` Jens Axboe
2009-12-04 13:54 ` Jens Axboe
2009-12-04 22:49 ` Stephen Rothwell
2009-12-05 9:20 ` Jens Axboe
2009-10-27 3:34 Stephen Rothwell
2009-10-27 5:31 ` Jens Axboe
2009-10-27 5:50 ` Stephen Rothwell
2009-10-07 2:55 Stephen Rothwell
[not found] ` <20091007135505.df1f058c.sfr-3FnU+UHB4dNDw9hX6IcOSA@public.gmane.org>
2009-10-07 6:33 ` Jens Axboe
2009-09-23 4:51 Stephen Rothwell
2009-09-23 7:11 ` Lars Ellenberg
2009-09-23 7:32 ` Stephen Rothwell
[not found] ` <20090923071152.GA8000-pI6ZZpWkm2Ob3Om96lsyHpni2hclXnRB@public.gmane.org>
2009-09-23 11:12 ` Lars Ellenberg
[not found] ` <20090923111225.GC8000-pI6ZZpWkm2Ob3Om96lsyHpni2hclXnRB@public.gmane.org>
2009-09-23 11:56 ` Stephen Rothwell
2009-09-14 4:27 Stephen Rothwell
2009-09-14 6:25 ` Jens Axboe
2009-09-11 4:32 Stephen Rothwell
2009-09-11 5:30 ` Jens Axboe
2009-09-01 4:59 Stephen Rothwell
2009-09-01 5:30 ` Stephen Rothwell
2009-09-01 5:38 ` Jens Axboe
2009-09-01 8:13 ` Jens Axboe
2009-09-01 8:38 ` Stephen Rothwell
2009-07-07 3:49 Stephen Rothwell
2009-07-07 6:38 ` Jens Axboe
2009-07-07 6:45 ` Stephen Rothwell
2009-07-07 13:57 ` Christoph Hellwig
2009-07-07 14:31 ` Jens Axboe
2009-07-08 3:17 ` Stephen Rothwell
2009-07-08 6:55 ` Jens Axboe
2009-07-07 13:55 ` Christoph Hellwig
2009-07-08 0:41 ` Stephen Rothwell
2009-06-26 2:53 Stephen Rothwell
2009-06-26 4:34 ` NeilBrown
2009-06-26 4:39 ` Jens Axboe
2009-06-26 5:49 ` Neil Brown
2009-06-26 9:00 ` Jens Axboe
2009-05-25 4:35 Stephen Rothwell
2009-05-25 5:38 ` Martin K. Petersen
2009-05-25 5:54 ` Stephen Rothwell
2009-05-13 4:04 Stephen Rothwell
2009-05-13 9:21 ` Tejun Heo
2009-05-13 12:07 ` James Bottomley
2009-05-15 0:45 ` Tejun Heo
2009-05-15 2:35 ` James Bottomley
2009-05-15 2:47 ` Tejun Heo
2009-05-15 3:24 ` James Bottomley
2009-05-15 3:38 ` Tejun Heo
2009-04-09 3:37 Stephen Rothwell
2009-04-14 2:35 ` Stephen Rothwell
2009-04-14 6:21 ` Jens Axboe
2009-04-14 6:26 ` Stephen Rothwell
2009-04-14 6:32 ` Jens Axboe
[not found] <20081110145442.d60e57b7.sfr@canb.auug.org.au>
2008-11-10 4:13 ` malahal
2008-11-10 4:46 ` malahal
2008-11-10 12:12 ` Jens Axboe
2008-09-18 3:04 Stephen Rothwell
2008-09-18 4:31 ` Jens Axboe
2008-09-15 5:18 Stephen Rothwell
2008-09-15 5:38 ` Alex Dubov
2008-09-15 13:18 ` Jens Axboe
2008-09-03 6:15 Stephen Rothwell
2008-09-03 6:34 ` Jens Axboe
2008-09-03 7:04 ` Andrew Morton
2008-09-03 7:07 ` Jens Axboe
2008-09-03 8:50 ` Stephen Rothwell
2008-09-03 16:05 ` Andrew Morton
2008-09-03 16:27 ` Tejun Heo
2008-09-03 16:32 ` Andrew Morton
2008-09-03 17:29 ` Tejun Heo
2008-09-04 4:06 ` Andrew Morton
2008-08-29 5:07 Stephen Rothwell
2008-08-29 9:00 ` Jens Axboe
[not found] <20080627165326.9222c841.sfr@canb.auug.org.au>
2008-06-27 7:00 ` Jens Axboe
2008-06-27 7:14 ` Jens Axboe
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=20081126111621.GA20601@elte.hu \
--to=mingo@elte$(echo .)hu \
--cc=acme@redhat$(echo .)com \
--cc=jens.axboe@oracle$(echo .)com \
--cc=linux-next@vger$(echo .)kernel.org \
--cc=mathieu.desnoyers@polymtl$(echo .)ca \
--cc=sfr@canb$(echo .)auug.org.au \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
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