Migrate tracepoint instrumentation to TP_FIELDS
[lttng-modules.git] / instrumentation / events / lttng-module / writeback.h
index 79f84b76559f92d72b3d34440c74c23205b900f3..b2148d86b5079ded37d7c60b94a1a96e6fb1e1d4 100644 (file)
@@ -74,46 +74,25 @@ static inline struct backing_dev_info *inode_to_bdi(struct inode *inode)
 LTTNG_TRACEPOINT_EVENT(writeback_dirty_page,
        TP_PROTO(struct page *page, struct address_space *mapping),
        TP_ARGS(page, mapping),
-       TP_STRUCT__entry (
-               __array_text(char, name, 32)
-               __field(unsigned long, ino)
-               __field(pgoff_t, index)
-       ),
-       TP_fast_assign(
-               tp_memcpy(name,
+       TP_FIELDS(
+               ctf_array_text(char, name,
                        mapping ? dev_name(inode_to_bdi(mapping->host)->dev) : "(unknown)", 32)
-               tp_assign(ino, mapping ? mapping->host->i_ino : 0)
-               tp_assign(index, page->index)
-       ),
-       TP_printk("bdi %s: ino=%lu index=%lu",
-               __entry->name,
-               __entry->ino,
-               __entry->index
+               ctf_integer(unsigned long, ino, mapping ? mapping->host->i_ino : 0)
+               ctf_integer(pgoff_t, index, page->index)
        )
 )
 
 LTTNG_TRACEPOINT_EVENT_CLASS(writeback_dirty_inode_template,
        TP_PROTO(struct inode *inode, int flags),
        TP_ARGS(inode, flags),
-       TP_STRUCT__entry (
-               __array_text(char, name, 32)
-               __field(unsigned long, ino)
-               __field(unsigned long, state)
-               __field(unsigned long, flags)
-       ),
-       TP_fast_assign(
+       TP_FIELDS(
                /* may be called for files on pseudo FSes w/ unregistered bdi */
-               tp_memcpy(name,
+               ctf_array_text(char, name,
                        inode_to_bdi(inode)->dev ?
                                dev_name(inode_to_bdi(inode)->dev) : "(unknown)", 32)
-               tp_assign(ino, inode->i_ino)
-               tp_assign(state, inode->i_state)
-               tp_assign(flags, flags)
-       ),
-       TP_printk("bdi %s: ino=%lu flags=%s",
-               __entry->name,
-               __entry->ino,
-               show_inode_state(__entry->flags)
+               ctf_integer(unsigned long, ino, inode->i_ino)
+               ctf_integer(unsigned long, state, inode->i_state)
+               ctf_integer(unsigned long, flags, flags)
        )
 )
 #define LTTNG_TRACEPOINT_EVENT_WRITEBACK_DIRTY_INODE_TEMPLATE(name) \
@@ -127,21 +106,11 @@ LTTNG_TRACEPOINT_EVENT_WRITEBACK_DIRTY_INODE_TEMPLATE(writeback_mark_inode_dirty
 LTTNG_TRACEPOINT_EVENT_CLASS(writeback_write_inode_template,
        TP_PROTO(struct inode *inode, struct writeback_control *wbc),
        TP_ARGS(inode, wbc),
-       TP_STRUCT__entry (
-               __array_text(char, name, 32)
-               __field(unsigned long, ino)
-               __field(int, sync_mode)
-       ),
-       TP_fast_assign(
-               tp_memcpy(name,
+       TP_FIELDS(
+               ctf_array_text(char, name,
                        dev_name(inode_to_bdi(inode)->dev), 32)
-               tp_assign(ino, inode->i_ino)
-               tp_assign(sync_mode, wbc->sync_mode)
-       ),
-       TP_printk("bdi %s: ino=%lu sync_mode=%d",
-               __entry->name,
-               __entry->ino,
-               __entry->sync_mode
+               ctf_integer(unsigned long, ino, inode->i_ino)
+               ctf_integer(int, sync_mode, wbc->sync_mode)
        )
 )
 
@@ -157,44 +126,25 @@ LTTNG_TRACEPOINT_EVENT_WRITEBACK_WRITE_INODE(writeback_write_inode)
 LTTNG_TRACEPOINT_EVENT(writeback_dirty_page,
        TP_PROTO(struct page *page, struct address_space *mapping),
        TP_ARGS(page, mapping),
-       TP_STRUCT__entry (
-               __array_text(char, name, 32)
-               __field(unsigned long, ino)
-               __field(pgoff_t, index)
-       ),
-       TP_fast_assign(
-               tp_memcpy(name,
+       TP_FIELDS(
+               ctf_array_text(char, name,
                        mapping ? dev_name(mapping->backing_dev_info->dev) : "(unknown)", 32)
-               tp_assign(ino, mapping ? mapping->host->i_ino : 0)
-               tp_assign(index, page->index)
-       ),
-       TP_printk("bdi %s: ino=%lu index=%lu",
-               __entry->name,
-               __entry->ino,
-               __entry->index
+               ctf_integer(unsigned long, ino, mapping ? mapping->host->i_ino : 0)
+               ctf_integer(pgoff_t, index, page->index)
        )
 )
 
 LTTNG_TRACEPOINT_EVENT_CLASS(writeback_dirty_inode_template,
        TP_PROTO(struct inode *inode, int flags),
        TP_ARGS(inode, flags),
-       TP_STRUCT__entry (
-               __array_text(char, name, 32)
-               __field(unsigned long, ino)
-               __field(unsigned long, flags)
-       ),
-       TP_fast_assign(
+       TP_FIELDS(
                /* may be called for files on pseudo FSes w/ unregistered bdi */
-               tp_memcpy(name,
+               ctf_array_text(char, name,
                        inode->i_mapping->backing_dev_info->dev ?
-                               dev_name(inode->i_mapping->backing_dev_info->dev) : "(unknown)", 32)
-               tp_assign(ino, inode->i_ino)
-               tp_assign(flags, flags)
-       ),
-       TP_printk("bdi %s: ino=%lu flags=%s",
-               __entry->name,
-               __entry->ino,
-               show_inode_state(__entry->flags)
+                               dev_name(inode->i_mapping->backing_dev_info->dev)
+                               : "(unknown)", 32)
+               ctf_integer(unsigned long, ino, inode->i_ino)
+               ctf_integer(unsigned long, flags, flags)
        )
 )
 #define LTTNG_TRACEPOINT_EVENT_WRITEBACK_DIRTY_INODE_TEMPLATE(name) \
@@ -207,21 +157,11 @@ LTTNG_TRACEPOINT_EVENT_WRITEBACK_DIRTY_INODE_TEMPLATE(writeback_dirty_inode)
 LTTNG_TRACEPOINT_EVENT_CLASS(writeback_write_inode_template,
        TP_PROTO(struct inode *inode, struct writeback_control *wbc),
        TP_ARGS(inode, wbc),
-       TP_STRUCT__entry (
-               __array_text(char, name, 32)
-               __field(unsigned long, ino)
-               __field(int, sync_mode)
-       ),
-       TP_fast_assign(
-               tp_memcpy(name,
+       TP_FIELDS(
+               ctf_array_text(char, name,
                        dev_name(inode->i_mapping->backing_dev_info->dev), 32)
-               tp_assign(ino, inode->i_ino)
-               tp_assign(sync_mode, wbc->sync_mode)
-       ),
-       TP_printk("bdi %s: ino=%lu sync_mode=%d",
-               __entry->name,
-               __entry->ino,
-               __entry->sync_mode
+               ctf_integer(unsigned long, ino, inode->i_ino)
+               ctf_integer(int, sync_mode, wbc->sync_mode)
        )
 )
 
@@ -239,15 +179,9 @@ LTTNG_TRACEPOINT_EVENT_WRITEBACK_WRITE_INODE(writeback_write_inode)
 LTTNG_TRACEPOINT_EVENT_CLASS(writeback_work_class,
        TP_PROTO(struct backing_dev_info *bdi, struct wb_writeback_work *work),
        TP_ARGS(bdi, work),
-       TP_STRUCT__entry(
-               __array_text(char, name, 32)
-       ),
-       TP_fast_assign(
-               tp_memcpy(name, bdi->dev ? dev_name(bdi->dev) :
+       TP_FIELDS(
+               ctf_array_text(char, name, bdi->dev ? dev_name(bdi->dev) :
                                "(unknown)", 32)
-       ),
-       TP_printk("bdi %s",
-                 __entry->name
        )
 )
 
@@ -256,15 +190,10 @@ LTTNG_TRACEPOINT_EVENT_CLASS(writeback_work_class,
 LTTNG_TRACEPOINT_EVENT_CLASS(writeback_work_class,
        TP_PROTO(struct backing_dev_info *bdi, struct wb_writeback_work *work),
        TP_ARGS(bdi, work),
-       TP_STRUCT__entry(
-               __array_text(char, name, 32)
-       ),
-       TP_fast_assign(
-               tp_memcpy(name, dev_name(bdi->dev ? bdi->dev :
+       TP_FIELDS(
+               ctf_array_text(char, name,
+                       dev_name(bdi->dev ? bdi->dev :
                                default_backing_dev_info.dev), 32)
-       ),
-       TP_printk("bdi %s",
-                 __entry->name
        )
 )
 
@@ -286,26 +215,17 @@ LTTNG_TRACEPOINT_EVENT_WRITEBACK_WORK_INSTANCE(writeback_wait)
 LTTNG_TRACEPOINT_EVENT(writeback_pages_written,
        TP_PROTO(long pages_written),
        TP_ARGS(pages_written),
-       TP_STRUCT__entry(
-               __field(long,           pages)
-       ),
-       TP_fast_assign(
-               tp_assign(pages, pages_written)
-       ),
-       TP_printk("%ld", __entry->pages)
+       TP_FIELDS(
+               ctf_integer(long, pages, pages_written)
+       )
 )
 
 LTTNG_TRACEPOINT_EVENT_CLASS(writeback_class,
        TP_PROTO(struct backing_dev_info *bdi),
        TP_ARGS(bdi),
-       TP_STRUCT__entry(
-               __array_text(char, name, 32)
-       ),
-       TP_fast_assign(
-               tp_memcpy(name, dev_name(bdi->dev), 32)
-       ),
-       TP_printk("bdi %s",
-                 __entry->name
+       TP_FIELDS(
+               ctf_array_text(char, name,
+                       dev_name(bdi->dev), 32)
        )
 )
 #undef DEFINE_WRITEBACK_EVENT
@@ -341,19 +261,9 @@ LTTNG_TRACEPOINT_EVENT_MAP(balance_dirty_written,
 
        TP_ARGS(bdi, written),
 
-       TP_STRUCT__entry(
-               __array(char,   name, 32)
-               __field(int,    written)
-       ),
-
-       TP_fast_assign(
-               tp_memcpy(name, dev_name(bdi->dev), 32)
-               tp_assign(written, written)
-       ),
-
-       TP_printk("bdi %s written %d",
-                 __entry->name,
-                 __entry->written
+       TP_FIELDS(
+               ctf_array_text(char, name, dev_name(bdi->dev), 32)
+               ctf_integer(int, written, written)
        )
 )
 #endif
@@ -361,62 +271,23 @@ LTTNG_TRACEPOINT_EVENT_MAP(balance_dirty_written,
 LTTNG_TRACEPOINT_EVENT_CLASS(writeback_wbc_class,
        TP_PROTO(struct writeback_control *wbc, struct backing_dev_info *bdi),
        TP_ARGS(wbc, bdi),
-       TP_STRUCT__entry(
-               __array_text(char, name, 32)
-               __field(long, nr_to_write)
-               __field(long, pages_skipped)
-               __field(int, sync_mode)
-               __field(int, for_kupdate)
-               __field(int, for_background)
-               __field(int, for_reclaim)
-               __field(int, range_cyclic)
+       TP_FIELDS(
+               ctf_array_text(char, name, dev_name(bdi->dev), 32)
+               ctf_integer(long, nr_to_write, wbc->nr_to_write)
+               ctf_integer(long, pages_skipped, wbc->pages_skipped)
+               ctf_integer(int, sync_mode, wbc->sync_mode)
+               ctf_integer(int, for_kupdate, wbc->for_kupdate)
+               ctf_integer(int, for_background, wbc->for_background)
+               ctf_integer(int, for_reclaim, wbc->for_reclaim)
+               ctf_integer(int, range_cyclic, wbc->range_cyclic)
 #if (LINUX_VERSION_CODE < KERNEL_VERSION(3,1,0))
-               __field(int, more_io)
-               __field(unsigned long, older_than_this)
+               ctf_integer(int, more_io, wbc->more_io)
+               ctf_integer(unsigned long, older_than_this,
+                       wbc->older_than_this ? *wbc->older_than_this : 0)
 #endif
-               __field(long, range_start)
-               __field(long, range_end)
-       ),
-
-       TP_fast_assign(
-               tp_memcpy(name, dev_name(bdi->dev), 32)
-               tp_assign(nr_to_write, wbc->nr_to_write)
-               tp_assign(pages_skipped, wbc->pages_skipped)
-               tp_assign(sync_mode, wbc->sync_mode)
-               tp_assign(for_kupdate, wbc->for_kupdate)
-               tp_assign(for_background, wbc->for_background)
-               tp_assign(for_reclaim, wbc->for_reclaim)
-               tp_assign(range_cyclic, wbc->range_cyclic)
-#if (LINUX_VERSION_CODE < KERNEL_VERSION(3,1,0))
-               tp_assign(more_io, wbc->more_io)
-               tp_assign(older_than_this, wbc->older_than_this ?
-                                               *wbc->older_than_this : 0)
-#endif
-               tp_assign(range_start, (long)wbc->range_start)
-               tp_assign(range_end, (long)wbc->range_end)
-       ),
-
-       TP_printk("bdi %s: towrt=%ld skip=%ld mode=%d kupd=%d "
-#if (LINUX_VERSION_CODE < KERNEL_VERSION(3,1,0))
-               "bgrd=%d reclm=%d cyclic=%d more=%d older=0x%lx "
-#else
-               "bgrd=%d reclm=%d cyclic=%d "
-#endif
-               "start=0x%lx end=0x%lx",
-               __entry->name,
-               __entry->nr_to_write,
-               __entry->pages_skipped,
-               __entry->sync_mode,
-               __entry->for_kupdate,
-               __entry->for_background,
-               __entry->for_reclaim,
-               __entry->range_cyclic,
-#if (LINUX_VERSION_CODE < KERNEL_VERSION(3,1,0))
-               __entry->more_io,
-               __entry->older_than_this,
-#endif
-               __entry->range_start,
-               __entry->range_end)
+               ctf_integer(long, range_start, (long) wbc->range_start)
+               ctf_integer(long, range_end, (long) wbc->range_end)
+       )
 )
 
 #undef DEFINE_WBC_EVENT
@@ -448,38 +319,19 @@ LTTNG_TRACEPOINT_EVENT(writeback_queue_io,
 #else
        TP_ARGS(wb, older_than_this, moved),
 #endif
-       TP_STRUCT__entry(
-               __array(char,           name, 32)
-#if (LINUX_VERSION_CODE >= KERNEL_VERSION(3,2,0))
-#else
-               __field(unsigned long,  older)
-               __field(long,           age)
-#endif
-               __field(int,            moved)
-       ),
-       TP_fast_assign(
-               tp_memcpy(name, dev_name(wb->bdi->dev), 32)
+       TP_FIELDS(
+               ctf_array_text(char, name, dev_name(wb->bdi->dev), 32)
 #if (LINUX_VERSION_CODE >= KERNEL_VERSION(3,2,0))
 #else
-               tp_assign(older, older_than_this ?  *older_than_this : 0)
-               tp_assign(age, older_than_this ?
-                       (jiffies - *older_than_this) * 1000 / HZ : -1)
+               ctf_integer(unsigned long, older,
+                       older_than_this ? *older_than_this : 0)
+               ctf_integer(long, age,
+                       older_than_this ?
+                               (jiffies - *older_than_this) * 1000 / HZ
+                               : -1)
 #endif
-               tp_assign(moved, moved)
-       ),
-#if (LINUX_VERSION_CODE >= KERNEL_VERSION(3,2,0))
-       TP_printk("bdi %s: enqueue=%d",
-               __entry->name,
-               __entry->moved,
-       )
-#else
-       TP_printk("bdi %s: older=%lu age=%ld enqueue=%d",
-               __entry->name,
-               __entry->older, /* older_than_this in jiffies */
-               __entry->age,   /* older_than_this in relative milliseconds */
-               __entry->moved
+               ctf_integer(int, moved, moved)
        )
-#endif
 )
 
 LTTNG_TRACEPOINT_EVENT_MAP(global_dirty_state,
@@ -494,39 +346,15 @@ LTTNG_TRACEPOINT_EVENT_MAP(global_dirty_state,
                dirty_thresh
        ),
 
-       TP_STRUCT__entry(
-               __field(unsigned long,  nr_dirty)
-               __field(unsigned long,  nr_writeback)
-               __field(unsigned long,  nr_unstable)
-               __field(unsigned long,  background_thresh)
-               __field(unsigned long,  dirty_thresh)
-               __field(unsigned long,  dirty_limit)
-               __field(unsigned long,  nr_dirtied)
-               __field(unsigned long,  nr_written)
-       ),
-
-       TP_fast_assign(
-               tp_assign(nr_dirty, global_page_state(NR_FILE_DIRTY))
-               tp_assign(nr_writeback, global_page_state(NR_WRITEBACK))
-               tp_assign(nr_unstable, global_page_state(NR_UNSTABLE_NFS))
-               tp_assign(nr_dirtied, global_page_state(NR_DIRTIED))
-               tp_assign(nr_written, global_page_state(NR_WRITTEN))
-               tp_assign(background_thresh, background_thresh)
-               tp_assign(dirty_thresh, dirty_thresh)
-               tp_assign(dirty_limit, global_dirty_limit)
-       ),
-
-       TP_printk("dirty=%lu writeback=%lu unstable=%lu "
-                 "bg_thresh=%lu thresh=%lu limit=%lu "
-                 "dirtied=%lu written=%lu",
-                 __entry->nr_dirty,
-                 __entry->nr_writeback,
-                 __entry->nr_unstable,
-                 __entry->background_thresh,
-                 __entry->dirty_thresh,
-                 __entry->dirty_limit,
-                 __entry->nr_dirtied,
-                 __entry->nr_written
+       TP_FIELDS(
+               ctf_integer(unsigned long, nr_dirty, global_page_state(NR_FILE_DIRTY))
+               ctf_integer(unsigned long, nr_writeback, global_page_state(NR_WRITEBACK))
+               ctf_integer(unsigned long, nr_unstable, global_page_state(NR_UNSTABLE_NFS))
+               ctf_integer(unsigned long, nr_dirtied, global_page_state(NR_DIRTIED))
+               ctf_integer(unsigned long, nr_written, global_page_state(NR_WRITTEN))
+               ctf_integer(unsigned long, background_thresh, background_thresh)
+               ctf_integer(unsigned long, dirty_thresh, dirty_thresh)
+               ctf_integer(unsigned long, dirty_limit, global_dirty_limit)
        )
 )
 #endif
@@ -545,38 +373,15 @@ LTTNG_TRACEPOINT_EVENT_MAP(bdi_dirty_ratelimit,
 
        TP_ARGS(bdi, dirty_rate, task_ratelimit),
 
-       TP_STRUCT__entry(
-               __array(char,           bdi, 32)
-               __field(unsigned long,  write_bw)
-               __field(unsigned long,  avg_write_bw)
-               __field(unsigned long,  dirty_rate)
-               __field(unsigned long,  dirty_ratelimit)
-               __field(unsigned long,  task_ratelimit)
-               __field(unsigned long,  balanced_dirty_ratelimit)
-       ),
-
-       TP_fast_assign(
-               tp_memcpy(bdi, dev_name(bdi->dev), 32)
-               tp_assign(write_bw, KBps(bdi->write_bandwidth))
-               tp_assign(avg_write_bw, KBps(bdi->avg_write_bandwidth))
-               tp_assign(dirty_rate, KBps(dirty_rate))
-               tp_assign(dirty_ratelimit, KBps(bdi->dirty_ratelimit))
-               tp_assign(task_ratelimit, KBps(task_ratelimit))
-               tp_assign(balanced_dirty_ratelimit,
+       TP_FIELDS(
+               ctf_array_text(char, bdi, dev_name(bdi->dev), 32)
+               ctf_integer(unsigned long, write_bw, KBps(bdi->write_bandwidth))
+               ctf_integer(unsigned long, avg_write_bw, KBps(bdi->avg_write_bandwidth))
+               ctf_integer(unsigned long, dirty_rate, KBps(dirty_rate))
+               ctf_integer(unsigned long, dirty_ratelimit, KBps(bdi->dirty_ratelimit))
+               ctf_integer(unsigned long, task_ratelimit, KBps(task_ratelimit))
+               ctf_integer(unsigned long, balanced_dirty_ratelimit,
                                        KBps(bdi->balanced_dirty_ratelimit))
-       ),
-
-       TP_printk("bdi %s: "
-                 "write_bw=%lu awrite_bw=%lu dirty_rate=%lu "
-                 "dirty_ratelimit=%lu task_ratelimit=%lu "
-                 "balanced_dirty_ratelimit=%lu",
-                 __entry->bdi,
-                 __entry->write_bw,            /* write bandwidth */
-                 __entry->avg_write_bw,        /* avg write bandwidth */
-                 __entry->dirty_rate,          /* bdi dirty rate */
-                 __entry->dirty_ratelimit,     /* base ratelimit */
-                 __entry->task_ratelimit, /* ratelimit with position control */
-                 __entry->balanced_dirty_ratelimit /* the balanced ratelimit */
        )
 )
 
@@ -602,96 +407,40 @@ LTTNG_TRACEPOINT_EVENT_MAP(balance_dirty_pages,
        TP_ARGS(bdi, thresh, bg_thresh, dirty, bdi_thresh, bdi_dirty,
                dirty_ratelimit, task_ratelimit,
 #if (LINUX_VERSION_CODE >= KERNEL_VERSION(3,3,0))
-               dirtied, period, pause, start_time),
+               dirtied, period, pause, start_time
 #else
-               dirtied, pause, start_time),
-#endif
-       TP_STRUCT__entry(
-               __array(         char,  bdi, 32)
-               __field(unsigned long,  limit)
-               __field(unsigned long,  setpoint)
-               __field(unsigned long,  dirty)
-               __field(unsigned long,  bdi_setpoint)
-               __field(unsigned long,  bdi_dirty)
-               __field(unsigned long,  dirty_ratelimit)
-               __field(unsigned long,  task_ratelimit)
-               __field(unsigned int,   dirtied)
-               __field(unsigned int,   dirtied_pause)
-               __field(unsigned long,  paused)
-               __field(         long,  pause)
-#if (LINUX_VERSION_CODE >= KERNEL_VERSION(3,3,0))
-               __field(unsigned long,  period)
-               __field(         long,  think)
+               dirtied, pause, start_time
 #endif
        ),
 
-       TP_fast_assign(
-               tp_memcpy(bdi, dev_name(bdi->dev), 32)
-               tp_assign(limit, global_dirty_limit)
-               tp_assign(setpoint,
+       TP_FIELDS(
+               ctf_array_text(char, bdi, dev_name(bdi->dev), 32)
+               ctf_integer(unsigned long, limit, global_dirty_limit)
+               ctf_integer(unsigned long, setpoint,
                        (global_dirty_limit + (thresh + bg_thresh) / 2) / 2)
-               tp_assign(dirty, dirty)
-               tp_assign(bdi_setpoint,
+               ctf_integer(unsigned long, dirty, dirty)
+               ctf_integer(unsigned long, bdi_setpoint,
                        ((global_dirty_limit + (thresh + bg_thresh) / 2) / 2) *
-                       bdi_thresh / (thresh + 1))
-               tp_assign(bdi_dirty, bdi_dirty)
-               tp_assign(dirty_ratelimit, KBps(dirty_ratelimit))
-               tp_assign(task_ratelimit, KBps(task_ratelimit))
-               tp_assign(dirtied, dirtied)
-               tp_assign(dirtied_pause, current->nr_dirtied_pause)
+                               bdi_thresh / (thresh + 1))
+               ctf_integer(unsigned long, bdi_dirty, bdi_dirty)
+               ctf_integer(unsigned long, dirty_ratelimit,
+                       KBps(dirty_ratelimit))
+               ctf_integer(unsigned long, task_ratelimit,
+                       KBps(task_ratelimit))
+               ctf_integer(unsigned int, dirtied, dirtied)
+               ctf_integer(unsigned int, dirtied_pause,
+                       current->nr_dirtied_pause)
+               ctf_integer(unsigned long, paused,
+                       (jiffies - start_time) * 1000 / HZ)
+               ctf_integer(long, pause, pause * 1000 / HZ)
 #if (LINUX_VERSION_CODE >= KERNEL_VERSION(3,3,0))
-               tp_assign(think, current->dirty_paused_when == 0 ? 0 :
-                       (long)(jiffies - current->dirty_paused_when) * 1000/HZ)
-               tp_assign(period, period * 1000 / HZ)
-#endif
-               tp_assign(pause, pause * 1000 / HZ)
-               tp_assign(paused, (jiffies - start_time) * 1000 / HZ)
-       ),
-
-
-#if (LINUX_VERSION_CODE >= KERNEL_VERSION(3,3,0))
-       TP_printk("bdi %s: "
-                 "limit=%lu setpoint=%lu dirty=%lu "
-                 "bdi_setpoint=%lu bdi_dirty=%lu "
-                 "dirty_ratelimit=%lu task_ratelimit=%lu "
-                 "dirtied=%u dirtied_pause=%u "
-                 "paused=%lu pause=%ld period=%lu think=%ld",
-                 __entry->bdi,
-                 __entry->limit,
-                 __entry->setpoint,
-                 __entry->dirty,
-                 __entry->bdi_setpoint,
-                 __entry->bdi_dirty,
-                 __entry->dirty_ratelimit,
-                 __entry->task_ratelimit,
-                 __entry->dirtied,
-                 __entry->dirtied_pause,
-                 __entry->paused,      /* ms */
-                 __entry->pause,       /* ms */
-                 __entry->period,      /* ms */
-                 __entry->think        /* ms */
-         )
-#else
-       TP_printk("bdi %s: "
-                 "limit=%lu setpoint=%lu dirty=%lu "
-                 "bdi_setpoint=%lu bdi_dirty=%lu "
-                 "dirty_ratelimit=%lu task_ratelimit=%lu "
-                 "dirtied=%u dirtied_pause=%u "
-                 "paused=%lu pause=%ld",
-                 __entry->bdi,
-                 __entry->limit,
-                 __entry->setpoint,
-                 __entry->dirty,
-                 __entry->bdi_setpoint,
-                 __entry->bdi_dirty,
-                 __entry->dirty_ratelimit,
-                 __entry->task_ratelimit,
-                 __entry->dirtied,
-                 __entry->dirtied_pause,
-                 __entry->paused,      /* ms */
-                 __entry->pause        /* ms */
-         )
+               ctf_integer(unsigned long, period,
+                       period * 1000 / HZ)
+               ctf_integer(long, think,
+                       current->dirty_paused_when == 0 ? 0 :
+                               (long)(jiffies - current->dirty_paused_when) * 1000/HZ)
 #endif
+       )
 )
 #endif
 
@@ -701,26 +450,12 @@ LTTNG_TRACEPOINT_EVENT(writeback_sb_inodes_requeue,
        TP_PROTO(struct inode *inode),
        TP_ARGS(inode),
 
-       TP_STRUCT__entry(
-               __array_text(char, name, 32)
-               __field(unsigned long, ino)
-               __field(unsigned long, state)
-               __field(unsigned long, dirtied_when)
-       ),
-
-       TP_fast_assign(
-               tp_memcpy(name, dev_name(inode_to_bdi(inode)->dev), 32)
-               tp_assign(ino, inode->i_ino)
-               tp_assign(state, inode->i_state)
-               tp_assign(dirtied_when, inode->dirtied_when)
-       ),
-
-       TP_printk("bdi %s: ino=%lu state=%s dirtied_when=%lu age=%lu",
-                 __entry->name,
-                 __entry->ino,
-                 show_inode_state(__entry->state),
-                 __entry->dirtied_when,
-                 (jiffies - __entry->dirtied_when) / HZ
+       TP_FIELDS(
+               ctf_array_text(char, name,
+                       dev_name(inode_to_bdi(inode)->dev), 32)
+               ctf_integer(unsigned long, ino, inode->i_ino)
+               ctf_integer(unsigned long, state, inode->i_state)
+               ctf_integer(unsigned long, dirtied_when, inode->dirtied_when)
        )
 )
 #endif
@@ -732,19 +467,10 @@ LTTNG_TRACEPOINT_EVENT_CLASS(writeback_congest_waited_template,
 
        TP_ARGS(usec_timeout, usec_delayed),
 
-       TP_STRUCT__entry(
-               __field(        unsigned int,   usec_timeout    )
-               __field(        unsigned int,   usec_delayed    )
-       ),
-
-       TP_fast_assign(
-               tp_assign(usec_timeout, usec_timeout)
-               tp_assign(usec_delayed, usec_delayed)
-       ),
-
-       TP_printk("usec_timeout=%u usec_delayed=%u",
-                       __entry->usec_timeout,
-                       __entry->usec_delayed)
+       TP_FIELDS(
+               ctf_integer(unsigned int, usec_timeout, usec_timeout)
+               ctf_integer(unsigned int, usec_delayed, usec_delayed)
+       )
 )
 
 LTTNG_TRACEPOINT_EVENT_INSTANCE(writeback_congest_waited_template, writeback_congestion_wait,
@@ -772,36 +498,17 @@ LTTNG_TRACEPOINT_EVENT_CLASS(writeback_single_inode_template,
 
        TP_ARGS(inode, wbc, nr_to_write),
 
-       TP_STRUCT__entry(
-               __array_text(char, name, 32)
-               __field(unsigned long, ino)
-               __field(unsigned long, state)
-               __field(unsigned long, dirtied_when)
-               __field(unsigned long, writeback_index)
-               __field(long, nr_to_write)
-               __field(unsigned long, wrote)
-       ),
-
-       TP_fast_assign(
-               tp_memcpy(name, dev_name(inode_to_bdi(inode)->dev), 32)
-               tp_assign(ino, inode->i_ino)
-               tp_assign(state, inode->i_state)
-               tp_assign(dirtied_when, inode->dirtied_when)
-               tp_assign(writeback_index, inode->i_mapping->writeback_index)
-               tp_assign(nr_to_write, nr_to_write)
-               tp_assign(wrote, nr_to_write - wbc->nr_to_write)
-       ),
-
-       TP_printk("bdi %s: ino=%lu state=%s dirtied_when=%lu age=%lu "
-                 "index=%lu to_write=%ld wrote=%lu",
-                 __entry->name,
-                 __entry->ino,
-                 show_inode_state(__entry->state),
-                 __entry->dirtied_when,
-                 (jiffies - __entry->dirtied_when) / HZ,
-                 __entry->writeback_index,
-                 __entry->nr_to_write,
-                 __entry->wrote
+       TP_FIELDS(
+               ctf_array_text(char, name,
+                       dev_name(inode_to_bdi(inode)->dev), 32)
+               ctf_integer(unsigned long, ino, inode->i_ino)
+               ctf_integer(unsigned long, state, inode->i_state)
+               ctf_integer(unsigned long, dirtied_when, inode->dirtied_when)
+               ctf_integer(unsigned long, writeback_index,
+                       inode->i_mapping->writeback_index)
+               ctf_integer(long, nr_to_write, nr_to_write)
+               ctf_integer(unsigned long, wrote,
+                       nr_to_write - wbc->nr_to_write)
        )
 )
 
This page took 0.039919 seconds and 4 git commands to generate.