Add TID field to some block_* events

Most of the block events have the "comm" field, but we have no way to
match a block event to a certain thread which makes performing
accurate per-thread analyses difficult. Add the TID field to the events
that already export current->comm.

Signed-off-by: Julien Desfossez <jdesfossez@efficios.com>
Signed-off-by: Mathieu Desnoyers <mathieu.desnoyers@efficios.com>

diff --git a/instrumentation/events/lttng-module/block.h b/instrumentation/events/lttng-module/block.h
index e3e6b4cef1236237375d60713429af7235eef9e9..4f3460e826be0f9353c4962ef04c59e0242ccaa2 100644 (file)
--- a/instrumentation/events/lttng-module/block.h
+++ b/instrumentation/events/lttng-module/block.h
@@ -305,6 +305,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) ?
@@ -323,16 +324,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)
 )
 
 /**
@@ -389,6 +391,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   )
        ),
 
@@ -400,6 +403,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)
@@ -407,14 +411,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)
 )
 
 /**
@@ -485,6 +490,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   )
        ),
 
@@ -495,20 +501,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)
 )
 
 /**
@@ -559,6 +567,7 @@ TRACE_EVENT(block_bio_queue,
                __field( sector_t,      sector                  )
                __field( unsigned int,  nr_sector               )
                __field( unsigned int,  rwbs                    )
+               __field( pid_t,         tid                     )
                __array_text( char,             comm,   TASK_COMM_LEN   )
        ),
 
@@ -569,19 +578,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,
@@ -595,6 +606,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   )
        ),
 
@@ -604,13 +616,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)
 )
 
 /**
@@ -669,6 +682,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   )
         ),
 
@@ -680,6 +694,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)
@@ -687,14 +702,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)
 )
 
 /**
@@ -746,14 +762,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,
@@ -770,6 +788,7 @@ DECLARE_EVENT_CLASS(block_unplug,
 
        TP_STRUCT__entry(
                __field( int,           nr_rq                   )
+               __field( pid_t,         tid                     )
                __array_text( char,             comm,   TASK_COMM_LEN   )
        ),
 
@@ -780,9 +799,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))
@@ -850,6 +871,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   )
        ),
 
@@ -860,21 +882,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)
 )
 
 /**