Migrate tracepoint instrumentation to TP_FIELDS
[lttng-modules.git] / instrumentation / events / lttng-module / ext3.h
index 0c6cc98dd9726550670d948e0457159c753c778d..9c7813ee1b952e61faf9579e11523611114e5454 100644 (file)
@@ -12,34 +12,19 @@ LTTNG_TRACEPOINT_EVENT(ext3_free_inode,
 
        TP_ARGS(inode),
 
-       TP_STRUCT__entry(
-               __field(        dev_t,  dev                     )
-               __field(        ino_t,  ino                     )
-               __field(        umode_t, mode                   )
-               __field(        uid_t,  uid                     )
-               __field(        gid_t,  gid                     )
-               __field(        blkcnt_t, blocks                )
-       ),
-
-       TP_fast_assign(
-               tp_assign(dev, inode->i_sb->s_dev)
-               tp_assign(ino, inode->i_ino)
-               tp_assign(mode, inode->i_mode)
+       TP_FIELDS(
+               ctf_integer(dev_t, dev, inode->i_sb->s_dev)
+               ctf_integer(ino_t, ino, inode->i_ino)
+               ctf_integer(umode_t, mode, inode->i_mode)
 #if (LINUX_VERSION_CODE >= KERNEL_VERSION(3,5,0))
-               tp_assign(uid, i_uid_read(inode))
-               tp_assign(gid, i_gid_read(inode))
+               ctf_integer(uid_t, uid, i_uid_read(inode))
+               ctf_integer(gid_t, gid, i_gid_read(inode))
 #else
-               tp_assign(uid, inode->i_uid)
-               tp_assign(gid, inode->i_gid)
+               ctf_integer(uid_t, uid, inode->i_uid)
+               ctf_integer(gid_t, gid, inode->i_gid)
 #endif
-               tp_assign(blocks, inode->i_blocks)
-       ),
-
-       TP_printk("dev %d,%d ino %lu mode 0%o uid %u gid %u blocks %lu",
-                 MAJOR(__entry->dev), MINOR(__entry->dev),
-                 (unsigned long) __entry->ino,
-                 __entry->mode, __entry->uid, __entry->gid,
-                 (unsigned long) __entry->blocks)
+               ctf_integer(blkcnt_t, blocks, inode->i_blocks)
+       )
 )
 
 LTTNG_TRACEPOINT_EVENT(ext3_request_inode,
@@ -47,21 +32,11 @@ LTTNG_TRACEPOINT_EVENT(ext3_request_inode,
 
        TP_ARGS(dir, mode),
 
-       TP_STRUCT__entry(
-               __field(        dev_t,  dev                     )
-               __field(        ino_t,  dir                     )
-               __field(        umode_t, mode                   )
-       ),
-
-       TP_fast_assign(
-               tp_assign(dev, dir->i_sb->s_dev)
-               tp_assign(dir, dir->i_ino)
-               tp_assign(mode, mode)
-       ),
-
-       TP_printk("dev %d,%d dir %lu mode 0%o",
-                 MAJOR(__entry->dev), MINOR(__entry->dev),
-                 (unsigned long) __entry->dir, __entry->mode)
+       TP_FIELDS(
+               ctf_integer(dev_t, dev, dir->i_sb->s_dev)
+               ctf_integer(ino_t, dir, dir->i_ino)
+               ctf_integer(umode_t, mode, mode)
+       )
 )
 
 LTTNG_TRACEPOINT_EVENT(ext3_allocate_inode,
@@ -69,24 +44,12 @@ LTTNG_TRACEPOINT_EVENT(ext3_allocate_inode,
 
        TP_ARGS(inode, dir, mode),
 
-       TP_STRUCT__entry(
-               __field(        dev_t,  dev                     )
-               __field(        ino_t,  ino                     )
-               __field(        ino_t,  dir                     )
-               __field(        umode_t, mode                   )
-       ),
-
-       TP_fast_assign(
-               tp_assign(dev, inode->i_sb->s_dev)
-               tp_assign(ino, inode->i_ino)
-               tp_assign(dir, dir->i_ino)
-               tp_assign(mode, mode)
-       ),
-
-       TP_printk("dev %d,%d ino %lu dir %lu mode 0%o",
-                 MAJOR(__entry->dev), MINOR(__entry->dev),
-                 (unsigned long) __entry->ino,
-                 (unsigned long) __entry->dir, __entry->mode)
+       TP_FIELDS(
+               ctf_integer(dev_t, dev, inode->i_sb->s_dev)
+               ctf_integer(ino_t, ino, inode->i_ino)
+               ctf_integer(ino_t, dir, dir->i_ino)
+               ctf_integer(umode_t, mode, mode)
+       )
 )
 
 LTTNG_TRACEPOINT_EVENT(ext3_evict_inode,
@@ -94,21 +57,11 @@ LTTNG_TRACEPOINT_EVENT(ext3_evict_inode,
 
        TP_ARGS(inode),
 
-       TP_STRUCT__entry(
-               __field(        dev_t,  dev                     )
-               __field(        ino_t,  ino                     )
-               __field(        int,    nlink                   )
-       ),
-
-       TP_fast_assign(
-               tp_assign(dev, inode->i_sb->s_dev)
-               tp_assign(ino, inode->i_ino)
-               tp_assign(nlink, inode->i_nlink)
-       ),
-
-       TP_printk("dev %d,%d ino %lu nlink %d",
-                 MAJOR(__entry->dev), MINOR(__entry->dev),
-                 (unsigned long) __entry->ino, __entry->nlink)
+       TP_FIELDS(
+               ctf_integer(dev_t, dev, inode->i_sb->s_dev)
+               ctf_integer(ino_t, ino, inode->i_ino)
+               ctf_integer(int, nlink, inode->i_nlink)
+       )
 )
 
 LTTNG_TRACEPOINT_EVENT(ext3_drop_inode,
@@ -116,21 +69,11 @@ LTTNG_TRACEPOINT_EVENT(ext3_drop_inode,
 
        TP_ARGS(inode, drop),
 
-       TP_STRUCT__entry(
-               __field(        dev_t,  dev                     )
-               __field(        ino_t,  ino                     )
-               __field(        int,    drop                    )
-       ),
-
-       TP_fast_assign(
-               tp_assign(dev, inode->i_sb->s_dev)
-               tp_assign(ino, inode->i_ino)
-               tp_assign(drop, drop)
-       ),
-
-       TP_printk("dev %d,%d ino %lu drop %d",
-                 MAJOR(__entry->dev), MINOR(__entry->dev),
-                 (unsigned long) __entry->ino, __entry->drop)
+       TP_FIELDS(
+               ctf_integer(dev_t, dev, inode->i_sb->s_dev)
+               ctf_integer(ino_t, ino, inode->i_ino)
+               ctf_integer(int, drop, drop)
+       )
 )
 
 LTTNG_TRACEPOINT_EVENT(ext3_mark_inode_dirty,
@@ -138,21 +81,11 @@ LTTNG_TRACEPOINT_EVENT(ext3_mark_inode_dirty,
 
        TP_ARGS(inode, IP),
 
-       TP_STRUCT__entry(
-               __field(        dev_t,  dev                     )
-               __field(        ino_t,  ino                     )
-               __field(unsigned long,  ip                      )
-       ),
-
-       TP_fast_assign(
-               tp_assign(dev, inode->i_sb->s_dev)
-               tp_assign(ino, inode->i_ino)
-               tp_assign(ip, IP)
-       ),
-
-       TP_printk("dev %d,%d ino %lu caller %pF",
-                 MAJOR(__entry->dev), MINOR(__entry->dev),
-                 (unsigned long) __entry->ino, (void *)__entry->ip)
+       TP_FIELDS(
+               ctf_integer(dev_t, dev, inode->i_sb->s_dev)
+               ctf_integer(ino_t, ino, inode->i_ino)
+               ctf_integer(unsigned long, ip, IP)
+       )
 )
 
 LTTNG_TRACEPOINT_EVENT(ext3_write_begin,
@@ -161,27 +94,13 @@ LTTNG_TRACEPOINT_EVENT(ext3_write_begin,
 
        TP_ARGS(inode, pos, len, flags),
 
-       TP_STRUCT__entry(
-               __field(        dev_t,  dev                     )
-               __field(        ino_t,  ino                     )
-               __field(        loff_t, pos                     )
-               __field(        unsigned int, len               )
-               __field(        unsigned int, flags             )
-       ),
-
-       TP_fast_assign(
-               tp_assign(dev, inode->i_sb->s_dev)
-               tp_assign(ino, inode->i_ino)
-               tp_assign(pos, pos)
-               tp_assign(len, len)
-               tp_assign(flags, flags)
-       ),
-
-       TP_printk("dev %d,%d ino %lu pos %llu len %u flags %u",
-                 MAJOR(__entry->dev), MINOR(__entry->dev),
-                 (unsigned long) __entry->ino,
-                 (unsigned long long) __entry->pos, __entry->len,
-                 __entry->flags)
+       TP_FIELDS(
+               ctf_integer(dev_t, dev, inode->i_sb->s_dev)
+               ctf_integer(ino_t, ino, inode->i_ino)
+               ctf_integer(loff_t, pos, pos)
+               ctf_integer(unsigned int, len, len)
+               ctf_integer(unsigned int, flags, flags)
+       )
 )
 
 LTTNG_TRACEPOINT_EVENT_CLASS(ext3__write_end,
@@ -190,27 +109,13 @@ LTTNG_TRACEPOINT_EVENT_CLASS(ext3__write_end,
 
        TP_ARGS(inode, pos, len, copied),
 
-       TP_STRUCT__entry(
-               __field(        dev_t,  dev                     )
-               __field(        ino_t,  ino                     )
-               __field(        loff_t, pos                     )
-               __field(        unsigned int, len               )
-               __field(        unsigned int, copied            )
-       ),
-
-       TP_fast_assign(
-               tp_assign(dev, inode->i_sb->s_dev)
-               tp_assign(ino, inode->i_ino)
-               tp_assign(pos, pos)
-               tp_assign(len, len)
-               tp_assign(copied, copied)
-       ),
-
-       TP_printk("dev %d,%d ino %lu pos %llu len %u copied %u",
-                 MAJOR(__entry->dev), MINOR(__entry->dev),
-                 (unsigned long) __entry->ino,
-                 (unsigned long long) __entry->pos, __entry->len,
-                 __entry->copied)
+       TP_FIELDS(
+               ctf_integer(dev_t, dev, inode->i_sb->s_dev)
+               ctf_integer(ino_t, ino, inode->i_ino)
+               ctf_integer(loff_t, pos, pos)
+               ctf_integer(unsigned int, len, len)
+               ctf_integer(unsigned int, copied, copied)
+       )
 )
 
 LTTNG_TRACEPOINT_EVENT_INSTANCE(ext3__write_end, ext3_ordered_write_end,
@@ -242,22 +147,11 @@ LTTNG_TRACEPOINT_EVENT_CLASS(ext3__page_op,
 
        TP_ARGS(page),
 
-       TP_STRUCT__entry(
-               __field(        dev_t,  dev                     )
-               __field(        ino_t,  ino                     )
-               __field(        pgoff_t, index                  )
-
-       ),
-
-       TP_fast_assign(
-               tp_assign(index, page->index)
-               tp_assign(ino, page->mapping->host->i_ino)
-               tp_assign(dev, page->mapping->host->i_sb->s_dev)
-       ),
-
-       TP_printk("dev %d,%d ino %lu page_index %lu",
-                 MAJOR(__entry->dev), MINOR(__entry->dev),
-                 (unsigned long) __entry->ino, __entry->index)
+       TP_FIELDS(
+               ctf_integer(dev_t, dev, page->mapping->host->i_sb->s_dev)
+               ctf_integer(ino_t, ino, page->mapping->host->i_ino)
+               ctf_integer(pgoff_t, index, page->index)
+       )
 )
 
 LTTNG_TRACEPOINT_EVENT_INSTANCE(ext3__page_op, ext3_ordered_writepage,
@@ -302,27 +196,13 @@ LTTNG_TRACEPOINT_EVENT(ext3_invalidatepage,
 
        TP_ARGS(page, offset, length),
 
-       TP_STRUCT__entry(
-               __field(        pgoff_t, index                  )
-               __field(        unsigned int, offset            )
-               __field(        unsigned int, length            )
-               __field(        ino_t,  ino                     )
-               __field(        dev_t,  dev                     )
-
-       ),
-
-       TP_fast_assign(
-               tp_assign(index, page->index)
-               tp_assign(offset, offset)
-               tp_assign(length, length)
-               tp_assign(ino, page->mapping->host->i_ino)
-               tp_assign(dev, page->mapping->host->i_sb->s_dev)
-       ),
-
-       TP_printk("dev %d,%d ino %lu page_index %lu offset %u length %u",
-                 MAJOR(__entry->dev), MINOR(__entry->dev),
-                 (unsigned long) __entry->ino,
-                 __entry->index, __entry->offset, __entry->length)
+       TP_FIELDS(
+               ctf_integer(pgoff_t, index, page->index)
+               ctf_integer(unsigned int, offset, offset)
+               ctf_integer(unsigned int, length, length)
+               ctf_integer(ino_t, ino, page->mapping->host->i_ino)
+               ctf_integer(dev_t, dev, page->mapping->host->i_sb->s_dev)
+       )
 )
 
 #else
@@ -332,25 +212,12 @@ LTTNG_TRACEPOINT_EVENT(ext3_invalidatepage,
 
        TP_ARGS(page, offset),
 
-       TP_STRUCT__entry(
-               __field(        pgoff_t, index                  )
-               __field(        unsigned long, offset           )
-               __field(        ino_t,  ino                     )
-               __field(        dev_t,  dev                     )
-
-       ),
-
-       TP_fast_assign(
-               tp_assign(index, page->index)
-               tp_assign(offset, offset)
-               tp_assign(ino, page->mapping->host->i_ino)
-               tp_assign(dev, page->mapping->host->i_sb->s_dev)
-       ),
-
-       TP_printk("dev %d,%d ino %lu page_index %lu offset %lu",
-                 MAJOR(__entry->dev), MINOR(__entry->dev),
-                 (unsigned long) __entry->ino,
-                 __entry->index, __entry->offset)
+       TP_FIELDS(
+               ctf_integer(pgoff_t, index, page->index)
+               ctf_integer(unsigned long, offset, offset)
+               ctf_integer(ino_t, ino, page->mapping->host->i_ino)
+               ctf_integer(dev_t, dev, page->mapping->host->i_sb->s_dev)
+       )
 )
 
 #endif
@@ -361,22 +228,11 @@ LTTNG_TRACEPOINT_EVENT(ext3_discard_blocks,
 
        TP_ARGS(sb, blk, count),
 
-       TP_STRUCT__entry(
-               __field(        dev_t,          dev             )
-               __field(        unsigned long,  blk             )
-               __field(        unsigned long,  count           )
-
-       ),
-
-       TP_fast_assign(
-               tp_assign(dev, sb->s_dev)
-               tp_assign(blk, blk)
-               tp_assign(count, count)
-       ),
-
-       TP_printk("dev %d,%d blk %lu count %lu",
-                 MAJOR(__entry->dev), MINOR(__entry->dev),
-                 __entry->blk, __entry->count)
+       TP_FIELDS(
+               ctf_integer(dev_t, dev, sb->s_dev)
+               ctf_integer(unsigned long, blk, blk)
+               ctf_integer(unsigned long, count, count)
+       )
 )
 
 LTTNG_TRACEPOINT_EVENT(ext3_request_blocks,
@@ -385,24 +241,12 @@ LTTNG_TRACEPOINT_EVENT(ext3_request_blocks,
 
        TP_ARGS(inode, goal, count),
 
-       TP_STRUCT__entry(
-               __field(        dev_t,  dev                     )
-               __field(        ino_t,  ino                     )
-               __field(        unsigned long, count            )
-               __field(        unsigned long,  goal            )
-       ),
-
-       TP_fast_assign(
-               tp_assign(dev, inode->i_sb->s_dev)
-               tp_assign(ino, inode->i_ino)
-               tp_assign(count, count)
-               tp_assign(goal, goal)
-       ),
-
-       TP_printk("dev %d,%d ino %lu count %lu goal %lu ",
-                 MAJOR(__entry->dev), MINOR(__entry->dev),
-                 (unsigned long) __entry->ino,
-                 __entry->count, __entry->goal)
+       TP_FIELDS(
+               ctf_integer(dev_t, dev, inode->i_sb->s_dev)
+               ctf_integer(ino_t, ino, inode->i_ino)
+               ctf_integer(unsigned long, count, count)
+               ctf_integer(unsigned long, goal, goal)
+       )
 )
 
 LTTNG_TRACEPOINT_EVENT(ext3_allocate_blocks,
@@ -411,27 +255,13 @@ LTTNG_TRACEPOINT_EVENT(ext3_allocate_blocks,
 
        TP_ARGS(inode, goal, count, block),
 
-       TP_STRUCT__entry(
-               __field(        dev_t,  dev                     )
-               __field(        ino_t,  ino                     )
-               __field(        unsigned long,  block           )
-               __field(        unsigned long, count            )
-               __field(        unsigned long,  goal            )
-       ),
-
-       TP_fast_assign(
-               tp_assign(dev, inode->i_sb->s_dev)
-               tp_assign(ino, inode->i_ino)
-               tp_assign(block, block)
-               tp_assign(count, count)
-               tp_assign(goal, goal)
-       ),
-
-       TP_printk("dev %d,%d ino %lu count %lu block %lu goal %lu",
-                 MAJOR(__entry->dev), MINOR(__entry->dev),
-                 (unsigned long) __entry->ino,
-                  __entry->count, __entry->block,
-                 __entry->goal)
+       TP_FIELDS(
+               ctf_integer(dev_t, dev, inode->i_sb->s_dev)
+               ctf_integer(ino_t, ino, inode->i_ino)
+               ctf_integer(unsigned long, block, block)
+               ctf_integer(unsigned long, count, count)
+               ctf_integer(unsigned long, goal, goal)
+       )
 )
 
 LTTNG_TRACEPOINT_EVENT(ext3_free_blocks,
@@ -440,26 +270,13 @@ LTTNG_TRACEPOINT_EVENT(ext3_free_blocks,
 
        TP_ARGS(inode, block, count),
 
-       TP_STRUCT__entry(
-               __field(        dev_t,  dev                     )
-               __field(        ino_t,  ino                     )
-               __field(        umode_t, mode                   )
-               __field(        unsigned long,  block           )
-               __field(        unsigned long,  count           )
-       ),
-
-       TP_fast_assign(
-               tp_assign(dev, inode->i_sb->s_dev)
-               tp_assign(ino, inode->i_ino)
-               tp_assign(mode, inode->i_mode)
-               tp_assign(block, block)
-               tp_assign(count, count)
-       ),
-
-       TP_printk("dev %d,%d ino %lu mode 0%o block %lu count %lu",
-                 MAJOR(__entry->dev), MINOR(__entry->dev),
-                 (unsigned long) __entry->ino,
-                 __entry->mode, __entry->block, __entry->count)
+       TP_FIELDS(
+               ctf_integer(dev_t, dev, inode->i_sb->s_dev)
+               ctf_integer(ino_t, ino, inode->i_ino)
+               ctf_integer(umode_t, mode, inode->i_mode)
+               ctf_integer(unsigned long, block, block)
+               ctf_integer(unsigned long, count, count)
+       )
 )
 
 LTTNG_TRACEPOINT_EVENT(ext3_sync_file_enter,
@@ -467,24 +284,12 @@ LTTNG_TRACEPOINT_EVENT(ext3_sync_file_enter,
 
        TP_ARGS(file, datasync),
 
-       TP_STRUCT__entry(
-               __field(        dev_t,  dev                     )
-               __field(        ino_t,  ino                     )
-               __field(        ino_t,  parent                  )
-               __field(        int,    datasync                )
-       ),
-
-       TP_fast_assign(
-               tp_assign(dev, file->f_path.dentry->d_inode->i_sb->s_dev)
-               tp_assign(ino, file->f_path.dentry->d_inode->i_ino)
-               tp_assign(datasync, datasync)
-               tp_assign(parent, file->f_path.dentry->d_parent->d_inode->i_ino)
-       ),
-
-       TP_printk("dev %d,%d ino %lu parent %ld datasync %d ",
-                 MAJOR(__entry->dev), MINOR(__entry->dev),
-                 (unsigned long) __entry->ino,
-                 (unsigned long) __entry->parent, __entry->datasync)
+       TP_FIELDS(
+               ctf_integer(dev_t, dev, file->f_path.dentry->d_inode->i_sb->s_dev)
+               ctf_integer(ino_t, ino, file->f_path.dentry->d_inode->i_ino)
+               ctf_integer(ino_t, parent, file->f_path.dentry->d_parent->d_inode->i_ino)
+               ctf_integer(int, datasync, datasync)
+       )
 )
 
 LTTNG_TRACEPOINT_EVENT(ext3_sync_file_exit,
@@ -492,22 +297,11 @@ LTTNG_TRACEPOINT_EVENT(ext3_sync_file_exit,
 
        TP_ARGS(inode, ret),
 
-       TP_STRUCT__entry(
-               __field(        int,    ret                     )
-               __field(        ino_t,  ino                     )
-               __field(        dev_t,  dev                     )
-       ),
-
-       TP_fast_assign(
-               tp_assign(ret, ret)
-               tp_assign(ino, inode->i_ino)
-               tp_assign(dev, inode->i_sb->s_dev)
-       ),
-
-       TP_printk("dev %d,%d ino %lu ret %d",
-                 MAJOR(__entry->dev), MINOR(__entry->dev),
-                 (unsigned long) __entry->ino,
-                 __entry->ret)
+       TP_FIELDS(
+               ctf_integer(dev_t, dev, inode->i_sb->s_dev)
+               ctf_integer(ino_t, ino, inode->i_ino)
+               ctf_integer(int, ret, ret)
+       )
 )
 
 LTTNG_TRACEPOINT_EVENT(ext3_sync_fs,
@@ -515,20 +309,10 @@ LTTNG_TRACEPOINT_EVENT(ext3_sync_fs,
 
        TP_ARGS(sb, wait),
 
-       TP_STRUCT__entry(
-               __field(        dev_t,  dev                     )
-               __field(        int,    wait                    )
-
-       ),
-
-       TP_fast_assign(
-               tp_assign(dev, sb->s_dev)
-               tp_assign(wait, wait)
-       ),
-
-       TP_printk("dev %d,%d wait %d",
-                 MAJOR(__entry->dev), MINOR(__entry->dev),
-                 __entry->wait)
+       TP_FIELDS(
+               ctf_integer(dev_t, dev, sb->s_dev)
+               ctf_integer(int, wait, wait)
+       )
 )
 
 LTTNG_TRACEPOINT_EVENT(ext3_rsv_window_add,
@@ -537,21 +321,11 @@ LTTNG_TRACEPOINT_EVENT(ext3_rsv_window_add,
 
        TP_ARGS(sb, rsv_node),
 
-       TP_STRUCT__entry(
-               __field(        unsigned long,  start           )
-               __field(        unsigned long,  end             )
-               __field(        dev_t,  dev                     )
-       ),
-
-       TP_fast_assign(
-               tp_assign(dev, sb->s_dev)
-               tp_assign(start, rsv_node->rsv_window._rsv_start)
-               tp_assign(end, rsv_node->rsv_window._rsv_end)
-       ),
-
-       TP_printk("dev %d,%d start %lu end %lu",
-                 MAJOR(__entry->dev), MINOR(__entry->dev),
-                 __entry->start, __entry->end)
+       TP_FIELDS(
+               ctf_integer(unsigned long, start, rsv_node->rsv_window._rsv_start)
+               ctf_integer(unsigned long, end, rsv_node->rsv_window._rsv_end)
+               ctf_integer(dev_t, dev, sb->s_dev)
+       )
 )
 
 LTTNG_TRACEPOINT_EVENT(ext3_discard_reservation,
@@ -560,24 +334,12 @@ LTTNG_TRACEPOINT_EVENT(ext3_discard_reservation,
 
        TP_ARGS(inode, rsv_node),
 
-       TP_STRUCT__entry(
-               __field(        unsigned long,  start           )
-               __field(        unsigned long,  end             )
-               __field(        ino_t,  ino                     )
-               __field(        dev_t,  dev                     )
-       ),
-
-       TP_fast_assign(
-               tp_assign(start, rsv_node->rsv_window._rsv_start)
-               tp_assign(end, rsv_node->rsv_window._rsv_end)
-               tp_assign(ino, inode->i_ino)
-               tp_assign(dev, inode->i_sb->s_dev)
-       ),
-
-       TP_printk("dev %d,%d ino %lu start %lu end %lu",
-                 MAJOR(__entry->dev), MINOR(__entry->dev),
-                 (unsigned long)__entry->ino, __entry->start,
-                 __entry->end)
+       TP_FIELDS(
+               ctf_integer(unsigned long, start, rsv_node->rsv_window._rsv_start)
+               ctf_integer(unsigned long, end, rsv_node->rsv_window._rsv_end)
+               ctf_integer(ino_t, ino, inode->i_ino)
+               ctf_integer(dev_t, dev, inode->i_sb->s_dev)
+       )
 )
 
 LTTNG_TRACEPOINT_EVENT(ext3_alloc_new_reservation,
@@ -585,19 +347,10 @@ LTTNG_TRACEPOINT_EVENT(ext3_alloc_new_reservation,
 
        TP_ARGS(sb, goal),
 
-       TP_STRUCT__entry(
-               __field(        dev_t,  dev                     )
-               __field(        unsigned long,  goal            )
-       ),
-
-       TP_fast_assign(
-               tp_assign(dev, sb->s_dev)
-               tp_assign(goal, goal)
-       ),
-
-       TP_printk("dev %d,%d goal %lu",
-                 MAJOR(__entry->dev), MINOR(__entry->dev),
-                 __entry->goal)
+       TP_FIELDS(
+               ctf_integer(dev_t, dev, sb->s_dev)
+               ctf_integer(unsigned long, goal, goal)
+       )
 )
 
 LTTNG_TRACEPOINT_EVENT(ext3_reserved,
@@ -606,23 +359,12 @@ LTTNG_TRACEPOINT_EVENT(ext3_reserved,
 
        TP_ARGS(sb, block, rsv_node),
 
-       TP_STRUCT__entry(
-               __field(        unsigned long,  block           )
-               __field(        unsigned long,  start           )
-               __field(        unsigned long,  end             )
-               __field(        dev_t,  dev                     )
-       ),
-
-       TP_fast_assign(
-               tp_assign(block, block)
-               tp_assign(start, rsv_node->rsv_window._rsv_start)
-               tp_assign(end, rsv_node->rsv_window._rsv_end)
-               tp_assign(dev, sb->s_dev)
-       ),
-
-       TP_printk("dev %d,%d block %lu, start %lu end %lu",
-                 MAJOR(__entry->dev), MINOR(__entry->dev),
-                 __entry->block, __entry->start, __entry->end)
+       TP_FIELDS(
+               ctf_integer(unsigned long, block, block)
+               ctf_integer(unsigned long, start, rsv_node->rsv_window._rsv_start)
+               ctf_integer(unsigned long, end, rsv_node->rsv_window._rsv_end)
+               ctf_integer(dev_t, dev, sb->s_dev)
+       )
 )
 
 LTTNG_TRACEPOINT_EVENT(ext3_forget,
@@ -630,26 +372,13 @@ LTTNG_TRACEPOINT_EVENT(ext3_forget,
 
        TP_ARGS(inode, is_metadata, block),
 
-       TP_STRUCT__entry(
-               __field(        dev_t,  dev                     )
-               __field(        ino_t,  ino                     )
-               __field(        umode_t, mode                   )
-               __field(        int,    is_metadata             )
-               __field(        unsigned long,  block           )
-       ),
-
-       TP_fast_assign(
-               tp_assign(dev, inode->i_sb->s_dev)
-               tp_assign(ino, inode->i_ino)
-               tp_assign(mode, inode->i_mode)
-               tp_assign(is_metadata, is_metadata)
-               tp_assign(block, block)
-       ),
-
-       TP_printk("dev %d,%d ino %lu mode 0%o is_metadata %d block %lu",
-                 MAJOR(__entry->dev), MINOR(__entry->dev),
-                 (unsigned long) __entry->ino,
-                 __entry->mode, __entry->is_metadata, __entry->block)
+       TP_FIELDS(
+               ctf_integer(dev_t, dev, inode->i_sb->s_dev)
+               ctf_integer(ino_t, ino, inode->i_ino)
+               ctf_integer(umode_t, mode, inode->i_mode)
+               ctf_integer(int, is_metadata, is_metadata)
+               ctf_integer(unsigned long, block, block)
+       )
 )
 
 LTTNG_TRACEPOINT_EVENT(ext3_read_block_bitmap,
@@ -657,20 +386,10 @@ LTTNG_TRACEPOINT_EVENT(ext3_read_block_bitmap,
 
        TP_ARGS(sb, group),
 
-       TP_STRUCT__entry(
-               __field(        dev_t,  dev                     )
-               __field(        __u32,  group                   )
-
-       ),
-
-       TP_fast_assign(
-               tp_assign(dev, sb->s_dev)
-               tp_assign(group, group)
-       ),
-
-       TP_printk("dev %d,%d group %u",
-                 MAJOR(__entry->dev), MINOR(__entry->dev),
-                 __entry->group)
+       TP_FIELDS(
+               ctf_integer(dev_t, dev, sb->s_dev)
+               ctf_integer(__u32, group, group)
+       )
 )
 
 LTTNG_TRACEPOINT_EVENT(ext3_direct_IO_enter,
@@ -678,27 +397,13 @@ LTTNG_TRACEPOINT_EVENT(ext3_direct_IO_enter,
 
        TP_ARGS(inode, offset, len, rw),
 
-       TP_STRUCT__entry(
-               __field(        ino_t,  ino                     )
-               __field(        dev_t,  dev                     )
-               __field(        loff_t, pos                     )
-               __field(        unsigned long,  len             )
-               __field(        int,    rw                      )
-       ),
-
-       TP_fast_assign(
-               tp_assign(ino, inode->i_ino)
-               tp_assign(dev, inode->i_sb->s_dev)
-               tp_assign(pos, offset)
-               tp_assign(len, len)
-               tp_assign(rw, rw)
-       ),
-
-       TP_printk("dev %d,%d ino %lu pos %llu len %lu rw %d",
-                 MAJOR(__entry->dev), MINOR(__entry->dev),
-                 (unsigned long) __entry->ino,
-                 (unsigned long long) __entry->pos, __entry->len,
-                 __entry->rw)
+       TP_FIELDS(
+               ctf_integer(dev_t, dev, inode->i_sb->s_dev)
+               ctf_integer(ino_t, ino, inode->i_ino)
+               ctf_integer(loff_t, pos, offset)
+               ctf_integer(unsigned long, len, len)
+               ctf_integer(int, rw, rw)
+       )
 )
 
 LTTNG_TRACEPOINT_EVENT(ext3_direct_IO_exit,
@@ -707,29 +412,14 @@ LTTNG_TRACEPOINT_EVENT(ext3_direct_IO_exit,
 
        TP_ARGS(inode, offset, len, rw, ret),
 
-       TP_STRUCT__entry(
-               __field(        ino_t,  ino                     )
-               __field(        dev_t,  dev                     )
-               __field(        loff_t, pos                     )
-               __field(        unsigned long,  len             )
-               __field(        int,    rw                      )
-               __field(        int,    ret                     )
-       ),
-
-       TP_fast_assign(
-               tp_assign(ino, inode->i_ino)
-               tp_assign(dev, inode->i_sb->s_dev)
-               tp_assign(pos, offset)
-               tp_assign(len, len)
-               tp_assign(rw, rw)
-               tp_assign(ret, ret)
-       ),
-
-       TP_printk("dev %d,%d ino %lu pos %llu len %lu rw %d ret %d",
-                 MAJOR(__entry->dev), MINOR(__entry->dev),
-                 (unsigned long) __entry->ino,
-                 (unsigned long long) __entry->pos, __entry->len,
-                 __entry->rw, __entry->ret)
+       TP_FIELDS(
+               ctf_integer(dev_t, dev, inode->i_sb->s_dev)
+               ctf_integer(ino_t, ino, inode->i_ino)
+               ctf_integer(loff_t, pos, offset)
+               ctf_integer(unsigned long, len, len)
+               ctf_integer(int, rw, rw)
+               ctf_integer(int, ret, ret)
+       )
 )
 
 LTTNG_TRACEPOINT_EVENT(ext3_unlink_enter,
@@ -737,25 +427,12 @@ LTTNG_TRACEPOINT_EVENT(ext3_unlink_enter,
 
        TP_ARGS(parent, dentry),
 
-       TP_STRUCT__entry(
-               __field(        ino_t,  parent                  )
-               __field(        ino_t,  ino                     )
-               __field(        loff_t, size                    )
-               __field(        dev_t,  dev                     )
-       ),
-
-       TP_fast_assign(
-               tp_assign(parent, parent->i_ino)
-               tp_assign(ino, dentry->d_inode->i_ino)
-               tp_assign(size, dentry->d_inode->i_size)
-               tp_assign(dev, dentry->d_inode->i_sb->s_dev)
-       ),
-
-       TP_printk("dev %d,%d ino %lu size %lld parent %ld",
-                 MAJOR(__entry->dev), MINOR(__entry->dev),
-                 (unsigned long) __entry->ino,
-                 (unsigned long long)__entry->size,
-                 (unsigned long) __entry->parent)
+       TP_FIELDS(
+               ctf_integer(ino_t, parent, parent->i_ino)
+               ctf_integer(ino_t, ino, dentry->d_inode->i_ino)
+               ctf_integer(loff_t, size, dentry->d_inode->i_size)
+               ctf_integer(dev_t, dev, dentry->d_inode->i_sb->s_dev)
+       )
 )
 
 LTTNG_TRACEPOINT_EVENT(ext3_unlink_exit,
@@ -763,22 +440,11 @@ LTTNG_TRACEPOINT_EVENT(ext3_unlink_exit,
 
        TP_ARGS(dentry, ret),
 
-       TP_STRUCT__entry(
-               __field(        ino_t,  ino                     )
-               __field(        dev_t,  dev                     )
-               __field(        int,    ret                     )
-       ),
-
-       TP_fast_assign(
-               tp_assign(ino, dentry->d_inode->i_ino)
-               tp_assign(dev, dentry->d_inode->i_sb->s_dev)
-               tp_assign(ret, ret)
-       ),
-
-       TP_printk("dev %d,%d ino %lu ret %d",
-                 MAJOR(__entry->dev), MINOR(__entry->dev),
-                 (unsigned long) __entry->ino,
-                 __entry->ret)
+       TP_FIELDS(
+               ctf_integer(dev_t, dev, dentry->d_inode->i_sb->s_dev)
+               ctf_integer(ino_t, ino, dentry->d_inode->i_ino)
+               ctf_integer(int, ret, ret)
+       )
 )
 
 LTTNG_TRACEPOINT_EVENT_CLASS(ext3__truncate,
@@ -786,21 +452,11 @@ LTTNG_TRACEPOINT_EVENT_CLASS(ext3__truncate,
 
        TP_ARGS(inode),
 
-       TP_STRUCT__entry(
-               __field(        ino_t,          ino             )
-               __field(        dev_t,          dev             )
-               __field(        blkcnt_t,       blocks          )
-       ),
-
-       TP_fast_assign(
-               tp_assign(ino, inode->i_ino)
-               tp_assign(dev, inode->i_sb->s_dev)
-               tp_assign(blocks, inode->i_blocks)
-       ),
-
-       TP_printk("dev %d,%d ino %lu blocks %lu",
-                 MAJOR(__entry->dev), MINOR(__entry->dev),
-                 (unsigned long) __entry->ino, (unsigned long) __entry->blocks)
+       TP_FIELDS(
+               ctf_integer(dev_t, dev, inode->i_sb->s_dev)
+               ctf_integer(ino_t, ino, inode->i_ino)
+               ctf_integer(blkcnt_t, blocks, inode->i_blocks)
+       )
 )
 
 LTTNG_TRACEPOINT_EVENT_INSTANCE(ext3__truncate, ext3_truncate_enter,
@@ -823,26 +479,13 @@ LTTNG_TRACEPOINT_EVENT(ext3_get_blocks_enter,
 
        TP_ARGS(inode, lblk, len, create),
 
-       TP_STRUCT__entry(
-               __field(        ino_t,          ino             )
-               __field(        dev_t,          dev             )
-               __field(        unsigned long,  lblk            )
-               __field(        unsigned long,  len             )
-               __field(        int,            create          )
-       ),
-
-       TP_fast_assign(
-               tp_assign(ino, inode->i_ino)
-               tp_assign(dev, inode->i_sb->s_dev)
-               tp_assign(lblk, lblk)
-               tp_assign(len, len)
-               tp_assign(create, create)
-       ),
-
-       TP_printk("dev %d,%d ino %lu lblk %lu len %lu create %u",
-                 MAJOR(__entry->dev), MINOR(__entry->dev),
-                 (unsigned long) __entry->ino,
-                 __entry->lblk, __entry->len, __entry->create)
+       TP_FIELDS(
+               ctf_integer(dev_t, dev, inode->i_sb->s_dev)
+               ctf_integer(ino_t, ino, inode->i_ino)
+               ctf_integer(unsigned long, lblk, lblk)
+               ctf_integer(unsigned long, len, len)
+               ctf_integer(int, create, create)
+       )
 )
 
 LTTNG_TRACEPOINT_EVENT(ext3_get_blocks_exit,
@@ -851,29 +494,14 @@ LTTNG_TRACEPOINT_EVENT(ext3_get_blocks_exit,
 
        TP_ARGS(inode, lblk, pblk, len, ret),
 
-       TP_STRUCT__entry(
-               __field(        ino_t,          ino             )
-               __field(        dev_t,          dev             )
-               __field(        unsigned long,  lblk            )
-               __field(        unsigned long,  pblk            )
-               __field(        unsigned long,  len             )
-               __field(        int,            ret             )
-       ),
-
-       TP_fast_assign(
-               tp_assign(ino, inode->i_ino)
-               tp_assign(dev, inode->i_sb->s_dev)
-               tp_assign(lblk, lblk)
-               tp_assign(pblk, pblk)
-               tp_assign(len, len)
-               tp_assign(ret, ret)
-       ),
-
-       TP_printk("dev %d,%d ino %lu lblk %lu pblk %lu len %lu ret %d",
-                 MAJOR(__entry->dev), MINOR(__entry->dev),
-                 (unsigned long) __entry->ino,
-                  __entry->lblk, __entry->pblk,
-                 __entry->len, __entry->ret)
+       TP_FIELDS(
+               ctf_integer(dev_t, dev, inode->i_sb->s_dev)
+               ctf_integer(ino_t, ino, inode->i_ino)
+               ctf_integer(unsigned long, lblk, lblk)
+               ctf_integer(unsigned long, pblk, pblk)
+               ctf_integer(unsigned long, len, len)
+               ctf_integer(int, ret, ret)
+       )
 )
 
 LTTNG_TRACEPOINT_EVENT(ext3_load_inode,
@@ -881,19 +509,10 @@ LTTNG_TRACEPOINT_EVENT(ext3_load_inode,
 
        TP_ARGS(inode),
 
-       TP_STRUCT__entry(
-               __field(        ino_t,  ino             )
-               __field(        dev_t,  dev             )
-       ),
-
-       TP_fast_assign(
-               tp_assign(ino, inode->i_ino)
-               tp_assign(dev, inode->i_sb->s_dev)
-       ),
-
-       TP_printk("dev %d,%d ino %lu",
-                 MAJOR(__entry->dev), MINOR(__entry->dev),
-                 (unsigned long) __entry->ino)
+       TP_FIELDS(
+               ctf_integer(dev_t, dev, inode->i_sb->s_dev)
+               ctf_integer(ino_t, ino, inode->i_ino)
+       )
 )
 
 #endif /* LTTNG_TRACE_EXT3_H */
This page took 0.033217 seconds and 4 git commands to generate.