projects
/
lttng-modules.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Fix: correct typo in kernel version number
[lttng-modules.git]
/
instrumentation
/
events
/
lttng-module
/
block.h
diff --git
a/instrumentation/events/lttng-module/block.h
b/instrumentation/events/lttng-module/block.h
index e3e6b4cef1236237375d60713429af7235eef9e9..ad0a3639df6ae3c378e1d8345318430f2890deaf 100644
(file)
--- a/
instrumentation/events/lttng-module/block.h
+++ b/
instrumentation/events/lttng-module/block.h
@@
-221,7
+221,10
@@
DEFINE_EVENT(block_rq_with_error, block_rq_requeue,
TP_ARGS(q, rq)
)
TP_ARGS(q, rq)
)
-#if (LINUX_VERSION_CODE >= KERNEL_VERSION(3,15,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_KERNEL_RANGE(3,2,58, 3,3,0))
/**
@@
-305,6
+308,7
@@
DECLARE_EVENT_CLASS(block_rq,
__field( unsigned int, nr_sector )
__field( unsigned int, bytes )
__field( unsigned int, rwbs )
__field( unsigned int, nr_sector )
__field( unsigned int, bytes )
__field( unsigned int, rwbs )
+ __field( pid_t, tid )
__array_text( char, comm, TASK_COMM_LEN )
__dynamic_array_hex( unsigned char, cmd,
(rq->cmd_type == REQ_TYPE_BLOCK_PC) ?
__array_text( char, comm, TASK_COMM_LEN )
__dynamic_array_hex( unsigned char, cmd,
(rq->cmd_type == REQ_TYPE_BLOCK_PC) ?
@@
-323,16
+327,17
@@
DECLARE_EVENT_CLASS(block_rq,
tp_memcpy_dyn(cmd, (rq->cmd_type == REQ_TYPE_BLOCK_PC) ?
rq->cmd : NULL)
tp_memcpy(comm, current->comm, TASK_COMM_LEN)
tp_memcpy_dyn(cmd, (rq->cmd_type == REQ_TYPE_BLOCK_PC) ?
rq->cmd : NULL)
tp_memcpy(comm, current->comm, TASK_COMM_LEN)
+ tp_assign(tid, current->pid)
),
),
- TP_printk("%d,%d %s %u (%s) %llu + %u [%s]",
+ TP_printk("%d,%d %s %u (%s) %llu + %u [%s]
%d
",
MAJOR(__entry->dev), MINOR(__entry->dev),
__print_rwbs_flags(__entry->rwbs),
__entry->bytes,
__blk_dump_cmd(__get_dynamic_array(cmd),
__get_dynamic_array_len(cmd)),
(unsigned long long)__entry->sector,
MAJOR(__entry->dev), MINOR(__entry->dev),
__print_rwbs_flags(__entry->rwbs),
__entry->bytes,
__blk_dump_cmd(__get_dynamic_array(cmd),
__get_dynamic_array_len(cmd)),
(unsigned long long)__entry->sector,
- __entry->nr_sector, __entry->comm)
+ __entry->nr_sector, __entry->comm
, __entry->tid
)
)
/**
)
/**
@@
-389,6
+394,7
@@
TRACE_EVENT(block_bio_bounce,
__field( sector_t, sector )
__field( unsigned int, nr_sector )
__field( unsigned int, rwbs )
__field( sector_t, sector )
__field( unsigned int, nr_sector )
__field( unsigned int, rwbs )
+ __field( pid_t, tid )
__array_text( char, comm, TASK_COMM_LEN )
),
__array_text( char, comm, TASK_COMM_LEN )
),
@@
-400,6
+406,7
@@
TRACE_EVENT(block_bio_bounce,
tp_assign(nr_sector, bio_sectors(bio))
blk_fill_rwbs(rwbs, bio->bi_rw, bio->bi_iter.bi_size)
tp_memcpy(comm, current->comm, TASK_COMM_LEN)
tp_assign(nr_sector, bio_sectors(bio))
blk_fill_rwbs(rwbs, bio->bi_rw, bio->bi_iter.bi_size)
tp_memcpy(comm, current->comm, TASK_COMM_LEN)
+ tp_assign(tid, current->pid)
#else /* #if (LINUX_VERSION_CODE >= KERNEL_VERSION(3,14,0)) */
tp_assign(dev, bio->bi_bdev ?
bio->bi_bdev->bd_dev : 0)
#else /* #if (LINUX_VERSION_CODE >= KERNEL_VERSION(3,14,0)) */
tp_assign(dev, bio->bi_bdev ?
bio->bi_bdev->bd_dev : 0)
@@
-407,14
+414,15
@@
TRACE_EVENT(block_bio_bounce,
tp_assign(nr_sector, bio->bi_size >> 9)
blk_fill_rwbs(rwbs, bio->bi_rw, bio->bi_size)
tp_memcpy(comm, current->comm, TASK_COMM_LEN)
tp_assign(nr_sector, bio->bi_size >> 9)
blk_fill_rwbs(rwbs, bio->bi_rw, bio->bi_size)
tp_memcpy(comm, current->comm, TASK_COMM_LEN)
+ tp_assign(tid, current->pid)
#endif /* #else #if (LINUX_VERSION_CODE >= KERNEL_VERSION(3,14,0)) */
),
#endif /* #else #if (LINUX_VERSION_CODE >= KERNEL_VERSION(3,14,0)) */
),
- TP_printk("%d,%d %s %llu + %u [%s]",
+ TP_printk("%d,%d %s %llu + %u [%s]
%d
",
MAJOR(__entry->dev), MINOR(__entry->dev),
__print_rwbs_flags(__entry->rwbs),
(unsigned long long)__entry->sector,
MAJOR(__entry->dev), MINOR(__entry->dev),
__print_rwbs_flags(__entry->rwbs),
(unsigned long long)__entry->sector,
- __entry->nr_sector, __entry->comm)
+ __entry->nr_sector, __entry->comm
, __entry->tid
)
)
/**
)
/**
@@
-485,6
+493,7
@@
DECLARE_EVENT_CLASS(block_bio_merge,
__field( sector_t, sector )
__field( unsigned int, nr_sector )
__field( unsigned int, rwbs )
__field( sector_t, sector )
__field( unsigned int, nr_sector )
__field( unsigned int, rwbs )
+ __field( pid_t, tid )
__array_text( char, comm, TASK_COMM_LEN )
),
__array_text( char, comm, TASK_COMM_LEN )
),
@@
-495,20
+504,22
@@
DECLARE_EVENT_CLASS(block_bio_merge,
tp_assign(nr_sector, bio_sectors(bio))
blk_fill_rwbs(rwbs, bio->bi_rw, bio->bi_iter.bi_size)
tp_memcpy(comm, current->comm, TASK_COMM_LEN)
tp_assign(nr_sector, bio_sectors(bio))
blk_fill_rwbs(rwbs, bio->bi_rw, bio->bi_iter.bi_size)
tp_memcpy(comm, current->comm, TASK_COMM_LEN)
+ tp_assign(tid, current->pid)
#else /* #if (LINUX_VERSION_CODE >= KERNEL_VERSION(3,14,0)) */
tp_assign(dev, bio->bi_bdev->bd_dev)
tp_assign(sector, bio->bi_sector)
tp_assign(nr_sector, bio->bi_size >> 9)
blk_fill_rwbs(rwbs, bio->bi_rw, bio->bi_size)
tp_memcpy(comm, current->comm, TASK_COMM_LEN)
#else /* #if (LINUX_VERSION_CODE >= KERNEL_VERSION(3,14,0)) */
tp_assign(dev, bio->bi_bdev->bd_dev)
tp_assign(sector, bio->bi_sector)
tp_assign(nr_sector, bio->bi_size >> 9)
blk_fill_rwbs(rwbs, bio->bi_rw, bio->bi_size)
tp_memcpy(comm, current->comm, TASK_COMM_LEN)
+ tp_assign(tid, current->pid)
#endif /* #else #if (LINUX_VERSION_CODE >= KERNEL_VERSION(3,14,0)) */
),
#endif /* #else #if (LINUX_VERSION_CODE >= KERNEL_VERSION(3,14,0)) */
),
- TP_printk("%d,%d %s %llu + %u [%s]",
+ TP_printk("%d,%d %s %llu + %u [%s]
%d
",
MAJOR(__entry->dev), MINOR(__entry->dev),
__print_rwbs_flags(__entry->rwbs),
(unsigned long long)__entry->sector,
MAJOR(__entry->dev), MINOR(__entry->dev),
__print_rwbs_flags(__entry->rwbs),
(unsigned long long)__entry->sector,
- __entry->nr_sector, __entry->comm)
+ __entry->nr_sector, __entry->comm
, __entry->tid
)
)
/**
)
/**
@@
-559,6
+570,7
@@
TRACE_EVENT(block_bio_queue,
__field( sector_t, sector )
__field( unsigned int, nr_sector )
__field( unsigned int, rwbs )
__field( sector_t, sector )
__field( unsigned int, nr_sector )
__field( unsigned int, rwbs )
+ __field( pid_t, tid )
__array_text( char, comm, TASK_COMM_LEN )
),
__array_text( char, comm, TASK_COMM_LEN )
),
@@
-569,19
+581,21
@@
TRACE_EVENT(block_bio_queue,
tp_assign(nr_sector, bio_sectors(bio))
blk_fill_rwbs(rwbs, bio->bi_rw, bio->bi_iter.bi_size)
tp_memcpy(comm, current->comm, TASK_COMM_LEN)
tp_assign(nr_sector, bio_sectors(bio))
blk_fill_rwbs(rwbs, bio->bi_rw, bio->bi_iter.bi_size)
tp_memcpy(comm, current->comm, TASK_COMM_LEN)
+ tp_assign(tid, current->pid)
#else /* #if (LINUX_VERSION_CODE >= KERNEL_VERSION(3,14,0)) */
tp_assign(dev, bio->bi_bdev->bd_dev)
tp_assign(sector, bio->bi_sector)
tp_assign(nr_sector, bio->bi_size >> 9)
blk_fill_rwbs(rwbs, bio->bi_rw, bio->bi_size)
tp_memcpy(comm, current->comm, TASK_COMM_LEN)
#else /* #if (LINUX_VERSION_CODE >= KERNEL_VERSION(3,14,0)) */
tp_assign(dev, bio->bi_bdev->bd_dev)
tp_assign(sector, bio->bi_sector)
tp_assign(nr_sector, bio->bi_size >> 9)
blk_fill_rwbs(rwbs, bio->bi_rw, bio->bi_size)
tp_memcpy(comm, current->comm, TASK_COMM_LEN)
+ tp_assign(tid, current->pid)
#endif /* #else #if (LINUX_VERSION_CODE >= KERNEL_VERSION(3,14,0)) */
),
#endif /* #else #if (LINUX_VERSION_CODE >= KERNEL_VERSION(3,14,0)) */
),
- TP_printk("%d,%d %s %llu + %u [%s]",
+ TP_printk("%d,%d %s %llu + %u [%s]
%d
",
MAJOR(__entry->dev), MINOR(__entry->dev), __entry->rwbs,
(unsigned long long)__entry->sector,
MAJOR(__entry->dev), MINOR(__entry->dev), __entry->rwbs,
(unsigned long long)__entry->sector,
- __entry->nr_sector, __entry->comm)
+ __entry->nr_sector, __entry->comm
, __entry->tid
)
)
#else
DECLARE_EVENT_CLASS(block_bio,
)
#else
DECLARE_EVENT_CLASS(block_bio,
@@
-595,6
+609,7
@@
DECLARE_EVENT_CLASS(block_bio,
__field( sector_t, sector )
__field( unsigned int, nr_sector )
__field( unsigned int, rwbs )
__field( sector_t, sector )
__field( unsigned int, nr_sector )
__field( unsigned int, rwbs )
+ __field( pid_t, tid )
__array_text( char, comm, TASK_COMM_LEN )
),
__array_text( char, comm, TASK_COMM_LEN )
),
@@
-604,13
+619,14
@@
DECLARE_EVENT_CLASS(block_bio,
tp_assign(nr_sector, bio->bi_size >> 9)
blk_fill_rwbs(rwbs, bio->bi_rw, bio->bi_size)
tp_memcpy(comm, current->comm, TASK_COMM_LEN)
tp_assign(nr_sector, bio->bi_size >> 9)
blk_fill_rwbs(rwbs, bio->bi_rw, bio->bi_size)
tp_memcpy(comm, current->comm, TASK_COMM_LEN)
+ tp_assign(tid, current->pid)
),
),
- TP_printk("%d,%d %s %llu + %u [%s]",
+ TP_printk("%d,%d %s %llu + %u [%s]
%d
",
MAJOR(__entry->dev), MINOR(__entry->dev),
__print_rwbs_flags(__entry->rwbs),
(unsigned long long)__entry->sector,
MAJOR(__entry->dev), MINOR(__entry->dev),
__print_rwbs_flags(__entry->rwbs),
(unsigned long long)__entry->sector,
- __entry->nr_sector, __entry->comm)
+ __entry->nr_sector, __entry->comm
, __entry->tid
)
)
/**
)
/**
@@
-669,6
+685,7
@@
DECLARE_EVENT_CLASS(block_get_rq,
__field( sector_t, sector )
__field( unsigned int, nr_sector )
__field( unsigned int, rwbs )
__field( sector_t, sector )
__field( unsigned int, nr_sector )
__field( unsigned int, rwbs )
+ __field( pid_t, tid )
__array_text( char, comm, TASK_COMM_LEN )
),
__array_text( char, comm, TASK_COMM_LEN )
),
@@
-680,6
+697,7
@@
DECLARE_EVENT_CLASS(block_get_rq,
blk_fill_rwbs(rwbs, bio ? bio->bi_rw : 0,
bio ? bio_sectors(bio) : 0)
tp_memcpy(comm, current->comm, TASK_COMM_LEN)
blk_fill_rwbs(rwbs, bio ? bio->bi_rw : 0,
bio ? bio_sectors(bio) : 0)
tp_memcpy(comm, current->comm, TASK_COMM_LEN)
+ tp_assign(tid, current->pid)
#else /* #if (LINUX_VERSION_CODE >= KERNEL_VERSION(3,14,0)) */
tp_assign(dev, bio ? bio->bi_bdev->bd_dev : 0)
tp_assign(sector, bio ? bio->bi_sector : 0)
#else /* #if (LINUX_VERSION_CODE >= KERNEL_VERSION(3,14,0)) */
tp_assign(dev, bio ? bio->bi_bdev->bd_dev : 0)
tp_assign(sector, bio ? bio->bi_sector : 0)
@@
-687,14
+705,15
@@
DECLARE_EVENT_CLASS(block_get_rq,
blk_fill_rwbs(rwbs, bio ? bio->bi_rw : 0,
bio ? bio->bi_size >> 9 : 0)
tp_memcpy(comm, current->comm, TASK_COMM_LEN)
blk_fill_rwbs(rwbs, bio ? bio->bi_rw : 0,
bio ? bio->bi_size >> 9 : 0)
tp_memcpy(comm, current->comm, TASK_COMM_LEN)
+ tp_assign(tid, current->pid)
#endif /* #else #if (LINUX_VERSION_CODE >= KERNEL_VERSION(3,14,0)) */
),
#endif /* #else #if (LINUX_VERSION_CODE >= KERNEL_VERSION(3,14,0)) */
),
- TP_printk("%d,%d %s %llu + %u [%s]",
+ TP_printk("%d,%d %s %llu + %u [%s]
%d
",
MAJOR(__entry->dev), MINOR(__entry->dev),
__print_rwbs_flags(__entry->rwbs),
(unsigned long long)__entry->sector,
MAJOR(__entry->dev), MINOR(__entry->dev),
__print_rwbs_flags(__entry->rwbs),
(unsigned long long)__entry->sector,
- __entry->nr_sector, __entry->comm)
+ __entry->nr_sector, __entry->comm
, __entry->tid
)
)
/**
)
/**
@@
-746,14
+765,16
@@
TRACE_EVENT(block_plug,
TP_ARGS(q),
TP_STRUCT__entry(
TP_ARGS(q),
TP_STRUCT__entry(
+ __field( pid_t, tid )
__array_text( char, comm, TASK_COMM_LEN )
),
TP_fast_assign(
tp_memcpy(comm, current->comm, TASK_COMM_LEN)
__array_text( char, comm, TASK_COMM_LEN )
),
TP_fast_assign(
tp_memcpy(comm, current->comm, TASK_COMM_LEN)
+ tp_assign(tid, current->pid)
),
),
- TP_printk("[%s]
", __entry->comm
)
+ TP_printk("[%s]
%d", __entry->comm, __entry->tid
)
)
DECLARE_EVENT_CLASS(block_unplug,
)
DECLARE_EVENT_CLASS(block_unplug,
@@
-770,6
+791,7
@@
DECLARE_EVENT_CLASS(block_unplug,
TP_STRUCT__entry(
__field( int, nr_rq )
TP_STRUCT__entry(
__field( int, nr_rq )
+ __field( pid_t, tid )
__array_text( char, comm, TASK_COMM_LEN )
),
__array_text( char, comm, TASK_COMM_LEN )
),
@@
-780,9
+802,11
@@
DECLARE_EVENT_CLASS(block_unplug,
tp_assign(nr_rq, q->rq.count[READ] + q->rq.count[WRITE])
#endif
tp_memcpy(comm, current->comm, TASK_COMM_LEN)
tp_assign(nr_rq, q->rq.count[READ] + q->rq.count[WRITE])
#endif
tp_memcpy(comm, current->comm, TASK_COMM_LEN)
+ tp_assign(tid, current->pid)
),
),
- TP_printk("[%s] %d", __entry->comm, __entry->nr_rq)
+ TP_printk("[%s] %d %d", __entry->comm, , __entry->tid,
+ __entry->nr_rq)
)
#if (LINUX_VERSION_CODE < KERNEL_VERSION(2,6,39))
)
#if (LINUX_VERSION_CODE < KERNEL_VERSION(2,6,39))
@@
-850,6
+874,7
@@
TRACE_EVENT(block_split,
__field( sector_t, sector )
__field( sector_t, new_sector )
__field( unsigned int, rwbs )
__field( sector_t, sector )
__field( sector_t, new_sector )
__field( unsigned int, rwbs )
+ __field( pid_t, tid )
__array_text( char, comm, TASK_COMM_LEN )
),
__array_text( char, comm, TASK_COMM_LEN )
),
@@
-860,21
+885,23
@@
TRACE_EVENT(block_split,
tp_assign(new_sector, new_sector)
blk_fill_rwbs(rwbs, bio->bi_rw, bio->bi_iter.bi_size)
tp_memcpy(comm, current->comm, TASK_COMM_LEN)
tp_assign(new_sector, new_sector)
blk_fill_rwbs(rwbs, bio->bi_rw, bio->bi_iter.bi_size)
tp_memcpy(comm, current->comm, TASK_COMM_LEN)
+ tp_assign(tid, current->pid)
#else /* #if (LINUX_VERSION_CODE >= KERNEL_VERSION(3,14,0)) */
tp_assign(dev, bio->bi_bdev->bd_dev)
tp_assign(sector, bio->bi_sector)
tp_assign(new_sector, new_sector)
blk_fill_rwbs(rwbs, bio->bi_rw, bio->bi_size)
tp_memcpy(comm, current->comm, TASK_COMM_LEN)
#else /* #if (LINUX_VERSION_CODE >= KERNEL_VERSION(3,14,0)) */
tp_assign(dev, bio->bi_bdev->bd_dev)
tp_assign(sector, bio->bi_sector)
tp_assign(new_sector, new_sector)
blk_fill_rwbs(rwbs, bio->bi_rw, bio->bi_size)
tp_memcpy(comm, current->comm, TASK_COMM_LEN)
+ tp_assign(tid, current->pid)
#endif /* #else #if (LINUX_VERSION_CODE >= KERNEL_VERSION(3,14,0)) */
),
#endif /* #else #if (LINUX_VERSION_CODE >= KERNEL_VERSION(3,14,0)) */
),
- TP_printk("%d,%d %s %llu / %llu [%s]",
+ TP_printk("%d,%d %s %llu / %llu [%s]
%d
",
MAJOR(__entry->dev), MINOR(__entry->dev),
__print_rwbs_flags(__entry->rwbs),
(unsigned long long)__entry->sector,
(unsigned long long)__entry->new_sector,
MAJOR(__entry->dev), MINOR(__entry->dev),
__print_rwbs_flags(__entry->rwbs),
(unsigned long long)__entry->sector,
(unsigned long long)__entry->new_sector,
- __entry->comm)
+ __entry->comm
, __entry->tid
)
)
/**
)
/**
This page took
0.028136 seconds
and
4
git commands to generate.