X-Git-Url: https://git.lttng.org/?a=blobdiff_plain;f=instrumentation%2Fevents%2Flttng-module%2Fblock.h;h=ac52f7a4d0b32039a83551aeabc99d527d9f5d78;hb=434c6691a5af2982f6aa9a0b2fcceb2d0759a90e;hp=2af4fb326ba911e2d686a932069d0cd54e68fdc8;hpb=1c53e689434a6bdd7dc3f54c07bfb72750d1d24c;p=lttng-modules.git

diff --git a/instrumentation/events/lttng-module/block.h b/instrumentation/events/lttng-module/block.h
index 2af4fb32..ac52f7a4 100644
--- a/instrumentation/events/lttng-module/block.h
+++ b/instrumentation/events/lttng-module/block.h
@@ -221,7 +221,13 @@ DEFINE_EVENT(block_rq_with_error, block_rq_requeue,
 	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_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
@@ -304,6 +310,7 @@ DECLARE_EVENT_CLASS(block_rq,
 		__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) ?
@@ -322,16 +329,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_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,
-		  __entry->nr_sector, __entry->comm)
+		  __entry->nr_sector, __entry->comm, __entry->tid)
 )
 
 /**
@@ -388,6 +396,7 @@ TRACE_EVENT(block_bio_bounce,
 		__field( sector_t,	sector			)
 		__field( unsigned int,	nr_sector		)
 		__field( unsigned int,	rwbs			)
+		__field( pid_t,		tid			)
 		__array_text( char,		comm,	TASK_COMM_LEN	)
 	),
 
@@ -399,6 +408,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(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)
@@ -406,14 +416,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(tid, current->pid)
 #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,
-		  __entry->nr_sector, __entry->comm)
+		  __entry->nr_sector, __entry->comm, __entry->tid)
 )
 
 /**
@@ -484,6 +495,7 @@ DECLARE_EVENT_CLASS(block_bio_merge,
 		__field( sector_t,	sector			)
 		__field( unsigned int,	nr_sector		)
 		__field( unsigned int,	rwbs			)
+		__field( pid_t,		tid			)
 		__array_text( char,		comm,	TASK_COMM_LEN	)
 	),
 
@@ -494,20 +506,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(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)
+		tp_assign(tid, current->pid)
 #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,
-		  __entry->nr_sector, __entry->comm)
+		  __entry->nr_sector, __entry->comm, __entry->tid)
 )
 
 /**
@@ -557,8 +571,9 @@ TRACE_EVENT(block_bio_queue,
 		__field( dev_t,		dev			)
 		__field( sector_t,	sector			)
 		__field( unsigned int,	nr_sector		)
-		__array( char,		rwbs,	RWBS_LEN	)
-		__array( char,		comm,	TASK_COMM_LEN	)
+		__field( unsigned int,	rwbs			)
+		__field( pid_t,		tid			)
+		__array_text( char,		comm,	TASK_COMM_LEN	)
 	),
 
 	TP_fast_assign(
@@ -568,19 +583,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(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)
+		tp_assign(tid, current->pid)
 #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,
-		  __entry->nr_sector, __entry->comm)
+		  __entry->nr_sector, __entry->comm, __entry->tid)
 )
 #else
 DECLARE_EVENT_CLASS(block_bio,
@@ -594,6 +611,7 @@ DECLARE_EVENT_CLASS(block_bio,
 		__field( sector_t,	sector			)
 		__field( unsigned int,	nr_sector		)
 		__field( unsigned int,	rwbs			)
+		__field( pid_t,		tid			)
 		__array_text( char,		comm,	TASK_COMM_LEN	)
 	),
 
@@ -603,13 +621,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(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,
-		  __entry->nr_sector, __entry->comm)
+		  __entry->nr_sector, __entry->comm, __entry->tid)
 )
 
 /**
@@ -668,6 +687,7 @@ DECLARE_EVENT_CLASS(block_get_rq,
 		__field( sector_t,	sector			)
 		__field( unsigned int,	nr_sector		)
 		__field( unsigned int,	rwbs			)
+		__field( pid_t,		tid			)
 		__array_text( char,		comm,	TASK_COMM_LEN	)
         ),
 
@@ -679,6 +699,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)
+		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)
@@ -686,14 +707,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)
+		tp_assign(tid, current->pid)
 #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,
-		  __entry->nr_sector, __entry->comm)
+		  __entry->nr_sector, __entry->comm, __entry->tid)
 )
 
 /**
@@ -745,14 +767,16 @@ TRACE_EVENT(block_plug,
 	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)
+		tp_assign(tid, current->pid)
 	),
 
-	TP_printk("[%s]", __entry->comm)
+	TP_printk("[%s] %d", __entry->comm, __entry->tid)
 )
 
 DECLARE_EVENT_CLASS(block_unplug,
@@ -769,6 +793,7 @@ DECLARE_EVENT_CLASS(block_unplug,
 
 	TP_STRUCT__entry(
 		__field( int,		nr_rq			)
+		__field( pid_t,		tid			)
 		__array_text( char,		comm,	TASK_COMM_LEN	)
 	),
 
@@ -779,9 +804,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(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))
@@ -849,6 +876,7 @@ TRACE_EVENT(block_split,
 		__field( sector_t,	sector				)
 		__field( sector_t,	new_sector			)
 		__field( unsigned int,	rwbs		)
+		__field( pid_t,		tid			)
 		__array_text( char,		comm,		TASK_COMM_LEN	)
 	),
 
@@ -859,21 +887,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(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)
+		tp_assign(tid, current->pid)
 #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,
-		  __entry->comm)
+		  __entry->comm, __entry->tid)
 )
 
 /**