X-Git-Url: http://git.liburcu.org/?a=blobdiff_plain;f=instrumentation%2Fevents%2Flttng-module%2Fblock.h;h=424fbc14908ea512c1f684c359666a526d2f1d96;hb=e655c2d56f2df45ab547aec57c98aabf25d78325;hp=4f3460e826be0f9353c4962ef04c59e0242ccaa2;hpb=542a3926a8169cefba35c61f8e50666f94182340;p=lttng-modules.git diff --git a/instrumentation/events/lttng-module/block.h b/instrumentation/events/lttng-module/block.h index 4f3460e8..424fbc14 100644 --- a/instrumentation/events/lttng-module/block.h +++ b/instrumentation/events/lttng-module/block.h @@ -1,12 +1,12 @@ #undef TRACE_SYSTEM #define TRACE_SYSTEM block -#if !defined(_TRACE_BLOCK_H) || defined(TRACE_HEADER_MULTI_READ) -#define _TRACE_BLOCK_H +#if !defined(LTTNG_TRACE_BLOCK_H) || defined(TRACE_HEADER_MULTI_READ) +#define LTTNG_TRACE_BLOCK_H +#include "../../../probes/lttng-tracepoint-event.h" #include #include -#include #include #include @@ -99,7 +99,7 @@ enum { #endif #if (LINUX_VERSION_CODE >= KERNEL_VERSION(3,9,0)) -DECLARE_EVENT_CLASS(block_buffer, +LTTNG_TRACEPOINT_EVENT_CLASS(block_buffer, TP_PROTO(struct buffer_head *bh), @@ -129,7 +129,7 @@ DECLARE_EVENT_CLASS(block_buffer, * * Called from touch_buffer(). */ -DEFINE_EVENT(block_buffer, block_touch_buffer, +LTTNG_TRACEPOINT_EVENT_INSTANCE(block_buffer, block_touch_buffer, TP_PROTO(struct buffer_head *bh), @@ -142,7 +142,7 @@ DEFINE_EVENT(block_buffer, block_touch_buffer, * * Called from mark_buffer_dirty(). */ -DEFINE_EVENT(block_buffer, block_dirty_buffer, +LTTNG_TRACEPOINT_EVENT_INSTANCE(block_buffer, block_dirty_buffer, TP_PROTO(struct buffer_head *bh), @@ -150,7 +150,7 @@ DEFINE_EVENT(block_buffer, block_dirty_buffer, ) #endif -DECLARE_EVENT_CLASS(block_rq_with_error, +LTTNG_TRACEPOINT_EVENT_CLASS(block_rq_with_error, TP_PROTO(struct request_queue *q, struct request *rq), @@ -198,7 +198,7 @@ DECLARE_EVENT_CLASS(block_rq_with_error, * can be examined to determine which device and sectors the pending * operation would access. */ -DEFINE_EVENT(block_rq_with_error, block_rq_abort, +LTTNG_TRACEPOINT_EVENT_INSTANCE(block_rq_with_error, block_rq_abort, TP_PROTO(struct request_queue *q, struct request *rq), @@ -214,15 +214,20 @@ DEFINE_EVENT(block_rq_with_error, block_rq_abort, * @q. For some reason the request was not completed and needs to be * put back in the queue. */ -DEFINE_EVENT(block_rq_with_error, block_rq_requeue, +LTTNG_TRACEPOINT_EVENT_INSTANCE(block_rq_with_error, block_rq_requeue, TP_PROTO(struct request_queue *q, struct request *rq), TP_ARGS(q, rq) ) -#if (LINUX_VERSION_CODE >= KERNEL_VERSION(3,15,0) \ - || LTTNG_KERNEL_RANGE(3,2,58, 3,3,0)) +#if (LINUX_VERSION_CODE >= KERNEL_VERSION(3,14,5) \ + || LTTNG_KERNEL_RANGE(3,12,21, 3,13,0) \ + || LTTNG_KERNEL_RANGE(3,10,41, 3,11,0) \ + || LTTNG_KERNEL_RANGE(3,4,91, 3,5,0) \ + || LTTNG_KERNEL_RANGE(3,2,58, 3,3,0) \ + || LTTNG_UBUNTU_KERNEL_RANGE(3,13,11,31, 3,14,0,0) \ + || LTTNG_RHEL_KERNEL_RANGE(3,10,0,7,1, 3,11,0,0,0)) /** * block_rq_complete - block IO operation completed by device driver @@ -236,7 +241,7 @@ DEFINE_EVENT(block_rq_with_error, block_rq_requeue, * do for the request. If @rq->bio is non-NULL then there is * additional work required to complete the request. */ -TRACE_EVENT(block_rq_complete, +LTTNG_TRACEPOINT_EVENT(block_rq_complete, TP_PROTO(struct request_queue *q, struct request *rq, unsigned int nr_bytes), @@ -284,7 +289,7 @@ TRACE_EVENT(block_rq_complete, * do for the request. If @rq->bio is non-NULL then there is * additional work required to complete the request. */ -DEFINE_EVENT(block_rq_with_error, block_rq_complete, +LTTNG_TRACEPOINT_EVENT_INSTANCE(block_rq_with_error, block_rq_complete, TP_PROTO(struct request_queue *q, struct request *rq), @@ -293,7 +298,7 @@ DEFINE_EVENT(block_rq_with_error, block_rq_complete, #endif /* #else #if (LINUX_VERSION_CODE >= KERNEL_VERSION(3,15,0)) */ -DECLARE_EVENT_CLASS(block_rq, +LTTNG_TRACEPOINT_EVENT_CLASS(block_rq, TP_PROTO(struct request_queue *q, struct request *rq), @@ -347,7 +352,7 @@ DECLARE_EVENT_CLASS(block_rq, * be examined to determine which device and sectors the pending * operation would access. */ -DEFINE_EVENT(block_rq, block_rq_insert, +LTTNG_TRACEPOINT_EVENT_INSTANCE(block_rq, block_rq_insert, TP_PROTO(struct request_queue *q, struct request *rq), @@ -362,7 +367,7 @@ DEFINE_EVENT(block_rq, block_rq_insert, * Called when block operation request @rq from queue @q is sent to a * device driver for processing. */ -DEFINE_EVENT(block_rq, block_rq_issue, +LTTNG_TRACEPOINT_EVENT_INSTANCE(block_rq, block_rq_issue, TP_PROTO(struct request_queue *q, struct request *rq), @@ -380,7 +385,7 @@ DEFINE_EVENT(block_rq, block_rq_issue, * bounce buffer requires extra copying of data and decreases * performance. */ -TRACE_EVENT(block_bio_bounce, +LTTNG_TRACEPOINT_EVENT(block_bio_bounce, TP_PROTO(struct request_queue *q, struct bio *bio), @@ -431,7 +436,7 @@ TRACE_EVENT(block_bio_bounce, * This tracepoint indicates there is no further work to do on this * block IO operation @bio. */ -TRACE_EVENT(block_bio_complete, +LTTNG_TRACEPOINT_EVENT(block_bio_complete, #if (LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,38)) TP_PROTO(struct request_queue *q, struct bio *bio, int error), @@ -479,7 +484,7 @@ TRACE_EVENT(block_bio_complete, ) #if (LINUX_VERSION_CODE >= KERNEL_VERSION(3,9,0)) -DECLARE_EVENT_CLASS(block_bio_merge, +LTTNG_TRACEPOINT_EVENT_CLASS(block_bio_merge, TP_PROTO(struct request_queue *q, struct request *rq, struct bio *bio), @@ -527,7 +532,7 @@ DECLARE_EVENT_CLASS(block_bio_merge, * Merging block request @bio to the end of an existing block request * in queue @q. */ -DEFINE_EVENT(block_bio_merge, block_bio_backmerge, +LTTNG_TRACEPOINT_EVENT_INSTANCE(block_bio_merge, block_bio_backmerge, TP_PROTO(struct request_queue *q, struct request *rq, struct bio *bio), @@ -542,7 +547,7 @@ DEFINE_EVENT(block_bio_merge, block_bio_backmerge, * Merging block IO operation @bio to the beginning of an existing block * operation in queue @q. */ -DEFINE_EVENT(block_bio_merge, block_bio_frontmerge, +LTTNG_TRACEPOINT_EVENT_INSTANCE(block_bio_merge, block_bio_frontmerge, TP_PROTO(struct request_queue *q, struct request *rq, struct bio *bio), @@ -556,7 +561,7 @@ DEFINE_EVENT(block_bio_merge, block_bio_frontmerge, * * About to place the block IO operation @bio into queue @q. */ -TRACE_EVENT(block_bio_queue, +LTTNG_TRACEPOINT_EVENT(block_bio_queue, TP_PROTO(struct request_queue *q, struct bio *bio), @@ -595,7 +600,7 @@ TRACE_EVENT(block_bio_queue, __entry->nr_sector, __entry->comm, __entry->tid) ) #else -DECLARE_EVENT_CLASS(block_bio, +LTTNG_TRACEPOINT_EVENT_CLASS(block_bio, TP_PROTO(struct request_queue *q, struct bio *bio), @@ -634,7 +639,7 @@ DECLARE_EVENT_CLASS(block_bio, * Merging block request @bio to the end of an existing block request * in queue @q. */ -DEFINE_EVENT(block_bio, block_bio_backmerge, +LTTNG_TRACEPOINT_EVENT_INSTANCE(block_bio, block_bio_backmerge, TP_PROTO(struct request_queue *q, struct bio *bio), @@ -649,7 +654,7 @@ DEFINE_EVENT(block_bio, block_bio_backmerge, * Merging block IO operation @bio to the beginning of an existing block * operation in queue @q. */ -DEFINE_EVENT(block_bio, block_bio_frontmerge, +LTTNG_TRACEPOINT_EVENT_INSTANCE(block_bio, block_bio_frontmerge, TP_PROTO(struct request_queue *q, struct bio *bio), @@ -663,7 +668,7 @@ DEFINE_EVENT(block_bio, block_bio_frontmerge, * * About to place the block IO operation @bio into queue @q. */ -DEFINE_EVENT(block_bio, block_bio_queue, +LTTNG_TRACEPOINT_EVENT_INSTANCE(block_bio, block_bio_queue, TP_PROTO(struct request_queue *q, struct bio *bio), @@ -671,7 +676,7 @@ DEFINE_EVENT(block_bio, block_bio_queue, ) #endif -DECLARE_EVENT_CLASS(block_get_rq, +LTTNG_TRACEPOINT_EVENT_CLASS(block_get_rq, TP_PROTO(struct request_queue *q, struct bio *bio, int rw), @@ -722,7 +727,7 @@ DECLARE_EVENT_CLASS(block_get_rq, * A request struct for queue @q has been allocated to handle the * block IO operation @bio. */ -DEFINE_EVENT(block_get_rq, block_getrq, +LTTNG_TRACEPOINT_EVENT_INSTANCE(block_get_rq, block_getrq, TP_PROTO(struct request_queue *q, struct bio *bio, int rw), @@ -740,7 +745,7 @@ DEFINE_EVENT(block_get_rq, block_getrq, * available. This tracepoint event is generated each time the * process goes to sleep waiting for request struct become available. */ -DEFINE_EVENT(block_get_rq, block_sleeprq, +LTTNG_TRACEPOINT_EVENT_INSTANCE(block_get_rq, block_sleeprq, TP_PROTO(struct request_queue *q, struct bio *bio, int rw), @@ -755,7 +760,7 @@ DEFINE_EVENT(block_get_rq, block_sleeprq, * to be sent to the device driver. Instead, accumulate requests in * the queue to improve throughput performance of the block device. */ -TRACE_EVENT(block_plug, +LTTNG_TRACEPOINT_EVENT(block_plug, TP_PROTO(struct request_queue *q), @@ -774,7 +779,7 @@ TRACE_EVENT(block_plug, TP_printk("[%s] %d", __entry->comm, __entry->tid) ) -DECLARE_EVENT_CLASS(block_unplug, +LTTNG_TRACEPOINT_EVENT_CLASS(block_unplug, #if (LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,39)) TP_PROTO(struct request_queue *q, unsigned int depth, bool explicit), @@ -814,7 +819,7 @@ DECLARE_EVENT_CLASS(block_unplug, * Unplug the request queue @q because a timer expired and allow block * operation requests to be sent to the device driver. */ -DEFINE_EVENT(block_unplug, block_unplug_timer, +LTTNG_TRACEPOINT_EVENT_INSTANCE(block_unplug, block_unplug_timer, TP_PROTO(struct request_queue *q), @@ -832,9 +837,9 @@ DEFINE_EVENT(block_unplug, block_unplug_timer, * on elements in the request queue. */ #if (LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,39)) -DEFINE_EVENT(block_unplug, block_unplug, +LTTNG_TRACEPOINT_EVENT_INSTANCE(block_unplug, block_unplug, #else -DEFINE_EVENT(block_unplug, block_unplug_io, +LTTNG_TRACEPOINT_EVENT_INSTANCE(block_unplug, block_unplug_io, #endif #if (LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,39)) @@ -859,7 +864,7 @@ DEFINE_EVENT(block_unplug, block_unplug_io, * @new_sector. This split may be required due to hardware limitation * such as operation crossing device boundaries in a RAID system. */ -TRACE_EVENT(block_split, +LTTNG_TRACEPOINT_EVENT(block_split, TP_PROTO(struct request_queue *q, struct bio *bio, unsigned int new_sector), @@ -912,9 +917,9 @@ TRACE_EVENT(block_split, * raw block device. */ #if (LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,38)) -TRACE_EVENT(block_bio_remap, +LTTNG_TRACEPOINT_EVENT(block_bio_remap, #else -TRACE_EVENT(block_remap, +LTTNG_TRACEPOINT_EVENT(block_remap, #endif TP_PROTO(struct request_queue *q, struct bio *bio, dev_t dev, @@ -970,7 +975,7 @@ TRACE_EVENT(block_remap, * operation request @rq holds the current information and @from hold * the original sector. */ -TRACE_EVENT(block_rq_remap, +LTTNG_TRACEPOINT_EVENT(block_rq_remap, TP_PROTO(struct request_queue *q, struct request *rq, dev_t dev, sector_t from), @@ -1008,7 +1013,7 @@ TRACE_EVENT(block_rq_remap, #undef __print_rwbs_flags #undef blk_fill_rwbs -#endif /* _TRACE_BLOCK_H */ +#endif /* LTTNG_TRACE_BLOCK_H */ /* This part must be outside protection */ #include "../../../probes/define_trace.h"