Remove semicolons in TP_fast_assign blocks

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

diff --git a/instrumentation/events/lttng-module/asoc.h b/instrumentation/events/lttng-module/asoc.h
index cb9e701b2aea5b03d8442a33582233ed7a78d146..6ffc923de4037859157bfa7c085458e439c3b378 100644 (file)
--- a/instrumentation/events/lttng-module/asoc.h
+++ b/instrumentation/events/lttng-module/asoc.h
@@ -37,10 +37,10 @@ DECLARE_EVENT_CLASS(snd_soc_reg,
        ),
 
        TP_fast_assign(
-               tp_strcpy(name, codec->name);
-               tp_assign(id, codec->id);
-               tp_assign(reg, reg);
-               tp_assign(val, val);
+               tp_strcpy(name, codec->name)
+               tp_assign(id, codec->id)
+               tp_assign(reg, reg)
+               tp_assign(val, val)
        ),
 
        TP_printk("codec=%s.%d reg=%x val=%x", __get_str(name),
@@ -82,10 +82,10 @@ DECLARE_EVENT_CLASS(snd_soc_preg,
        ),
 
        TP_fast_assign(
-               tp_strcpy(name, platform->name);
-               tp_assign(id, platform->id);
-               tp_assign(reg, reg);
-               tp_assign(val, val);
+               tp_strcpy(name, platform->name)
+               tp_assign(id, platform->id)
+               tp_assign(reg, reg)
+               tp_assign(val, val)
        ),
 
        TP_printk("platform=%s.%d reg=%x val=%x", __get_str(name),
@@ -124,8 +124,8 @@ DECLARE_EVENT_CLASS(snd_soc_card,
        ),
 
        TP_fast_assign(
-               tp_strcpy(name, card->name);
-               tp_assign(val, val);
+               tp_strcpy(name, card->name)
+               tp_assign(val, val)
        ),
 
        TP_printk("card=%s val=%d", __get_str(name), (int)__entry->val)
@@ -158,7 +158,7 @@ DECLARE_EVENT_CLASS(snd_soc_dapm_basic,
        ),
 
        TP_fast_assign(
-               tp_strcpy(name, card->name);
+               tp_strcpy(name, card->name)
        ),
 
        TP_printk("card=%s", __get_str(name))
@@ -192,8 +192,8 @@ DECLARE_EVENT_CLASS(snd_soc_dapm_widget,
        ),
 
        TP_fast_assign(
-               tp_strcpy(name, w->name);
-               tp_assign(val, val);
+               tp_strcpy(name, w->name)
+               tp_assign(val, val)
        ),
 
        TP_printk("widget=%s val=%d", __get_str(name),
@@ -239,10 +239,10 @@ TRACE_EVENT(snd_soc_dapm_walk_done,
        ),
 
        TP_fast_assign(
-               tp_strcpy(name, card->name);
-               tp_assign(power_checks, card->dapm_stats.power_checks);
-               tp_assign(path_checks, card->dapm_stats.path_checks);
-               tp_assign(neighbour_checks, card->dapm_stats.neighbour_checks);
+               tp_strcpy(name, card->name)
+               tp_assign(power_checks, card->dapm_stats.power_checks)
+               tp_assign(path_checks, card->dapm_stats.path_checks)
+               tp_assign(neighbour_checks, card->dapm_stats.neighbour_checks)
        ),
 
        TP_printk("%s: checks %d power, %d path, %d neighbour",
@@ -262,7 +262,7 @@ TRACE_EVENT(snd_soc_jack_irq,
        ),
 
        TP_fast_assign(
-               tp_strcpy(name, name);
+               tp_strcpy(name, name)
        ),
 
        TP_printk("%s", __get_str(name))
@@ -281,9 +281,9 @@ TRACE_EVENT(snd_soc_jack_report,
        ),
 
        TP_fast_assign(
-               tp_strcpy(name, jack->jack->name);
-               tp_assign(mask, mask);
-               tp_assign(val, val);
+               tp_strcpy(name, jack->jack->name)
+               tp_assign(mask, mask)
+               tp_assign(val, val)
        ),
 
        TP_printk("jack=%s %x/%x", __get_str(name), (int)__entry->val,
@@ -302,8 +302,8 @@ TRACE_EVENT(snd_soc_jack_notify,
        ),
 
        TP_fast_assign(
-               tp_strcpy(name, jack->jack->name);
-               tp_assign(val, val);
+               tp_strcpy(name, jack->jack->name)
+               tp_assign(val, val)
        ),
 
        TP_printk("jack=%s %x", __get_str(name), (int)__entry->val)
@@ -324,10 +324,10 @@ TRACE_EVENT(snd_soc_cache_sync,
        ),
 
        TP_fast_assign(
-               tp_strcpy(name, codec->name);
-               tp_strcpy(status, status);
-               tp_strcpy(type, type);
-               tp_assign(id, codec->id);
+               tp_strcpy(name, codec->name)
+               tp_strcpy(status, status)
+               tp_strcpy(type, type)
+               tp_assign(id, codec->id)
        ),
 
        TP_printk("codec=%s.%d type=%s status=%s", __get_str(name),

diff --git a/instrumentation/events/lttng-module/ext3.h b/instrumentation/events/lttng-module/ext3.h
index e02ecf428ef0d64e6443ee42a9082cc3d551eeac..de80df952734c44487a985aab2f9dcd7d4697a27 100644 (file)
--- a/instrumentation/events/lttng-module/ext3.h
+++ b/instrumentation/events/lttng-module/ext3.h
@@ -27,12 +27,12 @@ TRACE_EVENT(ext3_free_inode,
        ),
 
        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(uid, inode->i_uid);
-               tp_assign(gid, inode->i_gid);
-               tp_assign(blocks, inode->i_blocks);
+               tp_assign(dev, inode->i_sb->s_dev)
+               tp_assign(ino, inode->i_ino)
+               tp_assign(mode, inode->i_mode)
+               tp_assign(uid, inode->i_uid)
+               tp_assign(gid, inode->i_gid)
+               tp_assign(blocks, inode->i_blocks)
        ),
 
        TP_printk("dev %d,%d ino %lu mode 0%o uid %u gid %u blocks %lu",
@@ -54,9 +54,9 @@ TRACE_EVENT(ext3_request_inode,
        ),
 
        TP_fast_assign(
-               tp_assign(dev, dir->i_sb->s_dev);
-               tp_assign(dir, dir->i_ino);
-               tp_assign(mode, mode);
+               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",
@@ -77,10 +77,10 @@ TRACE_EVENT(ext3_allocate_inode,
        ),
 
        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_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",
@@ -101,9 +101,9 @@ TRACE_EVENT(ext3_evict_inode,
        ),
 
        TP_fast_assign(
-               tp_assign(dev, inode->i_sb->s_dev);
-               tp_assign(ino, inode->i_ino);
-               tp_assign(nlink, inode->i_nlink);
+               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",
@@ -123,9 +123,9 @@ TRACE_EVENT(ext3_drop_inode,
        ),
 
        TP_fast_assign(
-               tp_assign(dev, inode->i_sb->s_dev);
-               tp_assign(ino, inode->i_ino);
-               tp_assign(drop, drop);
+               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",
@@ -145,9 +145,9 @@ TRACE_EVENT(ext3_mark_inode_dirty,
        ),
 
        TP_fast_assign(
-               tp_assign(dev, inode->i_sb->s_dev);
-               tp_assign(ino, inode->i_ino);
-               tp_assign(ip, IP);
+               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",
@@ -170,11 +170,11 @@ TRACE_EVENT(ext3_write_begin,
        ),
 
        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_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",
@@ -199,11 +199,11 @@ DECLARE_EVENT_CLASS(ext3__write_end,
        ),
 
        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_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",
@@ -250,9 +250,9 @@ DECLARE_EVENT_CLASS(ext3__page_op,
        ),
 
        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_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",
@@ -309,10 +309,10 @@ TRACE_EVENT(ext3_invalidatepage,
        ),
 
        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_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",
@@ -335,9 +335,9 @@ TRACE_EVENT(ext3_discard_blocks,
        ),
 
        TP_fast_assign(
-               tp_assign(dev, sb->s_dev);
-               tp_assign(blk, blk);
-               tp_assign(count, count);
+               tp_assign(dev, sb->s_dev)
+               tp_assign(blk, blk)
+               tp_assign(count, count)
        ),
 
        TP_printk("dev %d,%d blk %lu count %lu",
@@ -359,10 +359,10 @@ TRACE_EVENT(ext3_request_blocks,
        ),
 
        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_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 ",
@@ -386,11 +386,11 @@ TRACE_EVENT(ext3_allocate_blocks,
        ),
 
        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_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",
@@ -415,11 +415,11 @@ TRACE_EVENT(ext3_free_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_assign(block, block);
-               tp_assign(count, count);
+               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",
@@ -443,10 +443,10 @@ TRACE_EVENT(ext3_sync_file_enter,
        TP_fast_assign(
                dentry = file->f_path.dentry;
 
-               tp_assign(dev, dentry->d_inode->i_sb->s_dev);
-               tp_assign(ino, dentry->d_inode->i_ino);
-               tp_assign(datasync, datasync);
-               tp_assign(parent, dentry->d_parent->d_inode->i_ino);
+               tp_assign(dev, dentry->d_inode->i_sb->s_dev)
+               tp_assign(ino, dentry->d_inode->i_ino)
+               tp_assign(datasync, datasync)
+               tp_assign(parent, dentry->d_parent->d_inode->i_ino)
        ),
 
        TP_printk("dev %d,%d ino %lu parent %ld datasync %d ",
@@ -467,9 +467,9 @@ TRACE_EVENT(ext3_sync_file_exit,
        ),
 
        TP_fast_assign(
-               tp_assign(ret, ret);
-               tp_assign(ino, inode->i_ino);
-               tp_assign(dev, inode->i_sb->s_dev);
+               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",
@@ -490,8 +490,8 @@ TRACE_EVENT(ext3_sync_fs,
        ),
 
        TP_fast_assign(
-               tp_assign(dev, sb->s_dev);
-               tp_assign(wait, wait);
+               tp_assign(dev, sb->s_dev)
+               tp_assign(wait, wait)
        ),
 
        TP_printk("dev %d,%d wait %d",
@@ -512,9 +512,9 @@ TRACE_EVENT(ext3_rsv_window_add,
        ),
 
        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_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",
@@ -536,10 +536,10 @@ TRACE_EVENT(ext3_discard_reservation,
        ),
 
        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_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",
@@ -559,8 +559,8 @@ TRACE_EVENT(ext3_alloc_new_reservation,
        ),
 
        TP_fast_assign(
-               tp_assign(dev, sb->s_dev);
-               tp_assign(goal, goal);
+               tp_assign(dev, sb->s_dev)
+               tp_assign(goal, goal)
        ),
 
        TP_printk("dev %d,%d goal %lu",
@@ -582,10 +582,10 @@ TRACE_EVENT(ext3_reserved,
        ),
 
        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_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",
@@ -607,11 +607,11 @@ TRACE_EVENT(ext3_forget,
        ),
 
        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_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",
@@ -632,8 +632,8 @@ TRACE_EVENT(ext3_read_block_bitmap,
        ),
 
        TP_fast_assign(
-               tp_assign(dev, sb->s_dev);
-               tp_assign(group, group);
+               tp_assign(dev, sb->s_dev)
+               tp_assign(group, group)
        ),
 
        TP_printk("dev %d,%d group %u",
@@ -655,11 +655,11 @@ TRACE_EVENT(ext3_direct_IO_enter,
        ),
 
        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(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",
@@ -685,12 +685,12 @@ TRACE_EVENT(ext3_direct_IO_exit,
        ),
 
        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_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",
@@ -713,10 +713,10 @@ TRACE_EVENT(ext3_unlink_enter,
        ),
 
        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_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",
@@ -738,9 +738,9 @@ TRACE_EVENT(ext3_unlink_exit,
        ),
 
        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_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",
@@ -761,9 +761,9 @@ DECLARE_EVENT_CLASS(ext3__truncate,
        ),
 
        TP_fast_assign(
-               tp_assign(ino, inode->i_ino);
-               tp_assign(dev, inode->i_sb->s_dev);
-               tp_assign(blocks, inode->i_blocks);
+               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",
@@ -800,11 +800,11 @@ TRACE_EVENT(ext3_get_blocks_enter,
        ),
 
        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_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",
@@ -829,12 +829,12 @@ TRACE_EVENT(ext3_get_blocks_exit,
        ),
 
        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_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",
@@ -855,8 +855,8 @@ TRACE_EVENT(ext3_load_inode,
        ),
 
        TP_fast_assign(
-               tp_assign(ino, inode->i_ino);
-               tp_assign(dev, inode->i_sb->s_dev);
+               tp_assign(ino, inode->i_ino)
+               tp_assign(dev, inode->i_sb->s_dev)
        ),
 
        TP_printk("dev %d,%d ino %lu",

diff --git a/instrumentation/events/lttng-module/gpio.h b/instrumentation/events/lttng-module/gpio.h
index e6002c497687037fd178d178473c5a448244208a..a0c587653ee102728e4163554940bdacf6b40aee 100644 (file)
--- a/instrumentation/events/lttng-module/gpio.h
+++ b/instrumentation/events/lttng-module/gpio.h
@@ -19,9 +19,9 @@ TRACE_EVENT(gpio_direction,
        ),
 
        TP_fast_assign(
-               tp_assign(gpio, gpio);
-               tp_assign(in, in);
-               tp_assign(err, err);
+               tp_assign(gpio, gpio)
+               tp_assign(in, in)
+               tp_assign(err, err)
        ),
 
        TP_printk("%u %3s (%d)", __entry->gpio,
@@ -41,9 +41,9 @@ TRACE_EVENT(gpio_value,
        ),
 
        TP_fast_assign(
-               tp_assign(gpio, gpio);
-               tp_assign(get, get);
-               tp_assign(value, value);
+               tp_assign(gpio, gpio)
+               tp_assign(get, get)
+               tp_assign(value, value)
        ),
 
        TP_printk("%u %3s %d", __entry->gpio,

diff --git a/instrumentation/events/lttng-module/jbd.h b/instrumentation/events/lttng-module/jbd.h
index 97ba1e59ff5ba9d97027769e850a1be861530b4a..b6bd64ac14395a3f7cfbe1633e538abea281dfd3 100644 (file)
--- a/instrumentation/events/lttng-module/jbd.h
+++ b/instrumentation/events/lttng-module/jbd.h
@@ -19,8 +19,8 @@ TRACE_EVENT(jbd_checkpoint,
        ),
 
        TP_fast_assign(
-               tp_assign(dev, journal->j_fs_dev->bd_dev);
-               tp_assign(result, result);
+               tp_assign(dev, journal->j_fs_dev->bd_dev)
+               tp_assign(result, result)
        ),
 
        TP_printk("dev %d,%d result %d",
@@ -43,11 +43,11 @@ DECLARE_EVENT_CLASS(jbd_commit,
        ),
 
        TP_fast_assign(
-               tp_assign(dev, journal->j_fs_dev->bd_dev);
+               tp_assign(dev, journal->j_fs_dev->bd_dev)
 #if (LINUX_VERSION_CODE < KERNEL_VERSION(3,5,0))
-               tp_assign(sync_commit, commit_transaction->t_synchronous_commit);
+               tp_assign(sync_commit, commit_transaction->t_synchronous_commit)
 #endif
-               tp_assign(transaction, commit_transaction->t_tid);
+               tp_assign(transaction, commit_transaction->t_tid)
        ),
 
 #if (LINUX_VERSION_CODE < KERNEL_VERSION(3,5,0))
@@ -104,11 +104,11 @@ TRACE_EVENT(jbd_drop_transaction,
        ),
 
        TP_fast_assign(
-               tp_assign(dev, journal->j_fs_dev->bd_dev);
+               tp_assign(dev, journal->j_fs_dev->bd_dev)
 #if (LINUX_VERSION_CODE < KERNEL_VERSION(3,5,0))
-               tp_assign(sync_commit, commit_transaction->t_synchronous_commit);
+               tp_assign(sync_commit, commit_transaction->t_synchronous_commit)
 #endif
-               tp_assign(transaction, commit_transaction->t_tid);
+               tp_assign(transaction, commit_transaction->t_tid)
        ),
 
 #if (LINUX_VERSION_CODE < KERNEL_VERSION(3,5,0))
@@ -137,12 +137,12 @@ TRACE_EVENT(jbd_end_commit,
        ),
 
        TP_fast_assign(
-               tp_assign(dev, journal->j_fs_dev->bd_dev);
+               tp_assign(dev, journal->j_fs_dev->bd_dev)
 #if (LINUX_VERSION_CODE < KERNEL_VERSION(3,5,0))
-               tp_assign(sync_commit, commit_transaction->t_synchronous_commit);
+               tp_assign(sync_commit, commit_transaction->t_synchronous_commit)
 #endif
-               tp_assign(transaction, commit_transaction->t_tid);
-               tp_assign(head, journal->j_tail_sequence);
+               tp_assign(transaction, commit_transaction->t_tid)
+               tp_assign(head, journal->j_tail_sequence)
        ),
 
 #if (LINUX_VERSION_CODE < KERNEL_VERSION(3,5,0))
@@ -170,11 +170,11 @@ TRACE_EVENT(jbd_do_submit_data,
        ),
 
        TP_fast_assign(
-               tp_assign(dev, journal->j_fs_dev->bd_dev);
+               tp_assign(dev, journal->j_fs_dev->bd_dev)
 #if (LINUX_VERSION_CODE < KERNEL_VERSION(3,5,0))
-               tp_assign(sync_commit, commit_transaction->t_synchronous_commit);
+               tp_assign(sync_commit, commit_transaction->t_synchronous_commit)
 #endif
-               tp_assign(transaction, commit_transaction->t_tid);
+               tp_assign(transaction, commit_transaction->t_tid)
        ),
 
 #if (LINUX_VERSION_CODE < KERNEL_VERSION(3,5,0))
@@ -204,11 +204,11 @@ TRACE_EVENT(jbd_cleanup_journal_tail,
        ),
 
        TP_fast_assign(
-               tp_assign(dev, journal->j_fs_dev->bd_dev);
-               tp_assign(tail_sequence, journal->j_tail_sequence);
-               tp_assign(first_tid, first_tid);
-               tp_assign(block_nr, block_nr);
-               tp_assign(freed, freed);
+               tp_assign(dev, journal->j_fs_dev->bd_dev)
+               tp_assign(tail_sequence, journal->j_tail_sequence)
+               tp_assign(first_tid, first_tid)
+               tp_assign(block_nr, block_nr)
+               tp_assign(freed, freed)
        ),
 
        TP_printk("dev %d,%d from %u to %u offset %lu freed %lu",
@@ -228,8 +228,8 @@ TRACE_EVENT(jbd_update_superblock_end,
        ),
 
        TP_fast_assign(
-               tp_assign(dev, journal->j_fs_dev->bd_dev);
-               tp_assign(wait, wait);
+               tp_assign(dev, journal->j_fs_dev->bd_dev)
+               tp_assign(wait, wait)
        ),
 
        TP_printk("dev %d,%d wait %d",

diff --git a/instrumentation/events/lttng-module/jbd2.h b/instrumentation/events/lttng-module/jbd2.h
index 2e8083219cd6cfa52442ec450bbf7f3f5f1340ef..91e2e6c0d06dbf36ab9ac8e988ec8edf3ff97a1e 100644 (file)
--- a/instrumentation/events/lttng-module/jbd2.h
+++ b/instrumentation/events/lttng-module/jbd2.h
@@ -148,16 +148,16 @@ TRACE_EVENT(jbd2_run_stats,
        ),
 
        TP_fast_assign(
-               tp_assign(dev, dev);
-               tp_assign(tid, tid);
-               tp_assign(wait, stats->rs_wait);
-               tp_assign(running, stats->rs_running);
-               tp_assign(locked, stats->rs_locked);
-               tp_assign(flushing, stats->rs_flushing);
-               tp_assign(logging, stats->rs_logging);
-               tp_assign(handle_count, stats->rs_handle_count);
-               tp_assign(blocks, stats->rs_blocks);
-               tp_assign(blocks_logged, stats->rs_blocks_logged);
+               tp_assign(dev, dev)
+               tp_assign(tid, tid)
+               tp_assign(wait, stats->rs_wait)
+               tp_assign(running, stats->rs_running)
+               tp_assign(locked, stats->rs_locked)
+               tp_assign(flushing, stats->rs_flushing)
+               tp_assign(logging, stats->rs_logging)
+               tp_assign(handle_count, stats->rs_handle_count)
+               tp_assign(blocks, stats->rs_blocks)
+               tp_assign(blocks_logged, stats->rs_blocks_logged)
        ),
 
        TP_printk("dev %d,%d tid %lu wait %u running %u locked %u flushing %u "
@@ -188,12 +188,12 @@ TRACE_EVENT(jbd2_checkpoint_stats,
        ),
 
        TP_fast_assign(
-               tp_assign(dev, dev);
-               tp_assign(tid, tid);
-               tp_assign(chp_time, stats->cs_chp_time);
-               tp_assign(forced_to_close, stats->cs_forced_to_close);
-               tp_assign(written, stats->cs_written);
-               tp_assign(dropped, stats->cs_dropped);
+               tp_assign(dev, dev)
+               tp_assign(tid, tid)
+               tp_assign(chp_time, stats->cs_chp_time)
+               tp_assign(forced_to_close, stats->cs_forced_to_close)
+               tp_assign(written, stats->cs_written)
+               tp_assign(dropped, stats->cs_dropped)
        ),
 
        TP_printk("dev %d,%d tid %lu chp_time %u forced_to_close %u "
@@ -219,11 +219,11 @@ TRACE_EVENT(jbd2_cleanup_journal_tail,
        ),
 
        TP_fast_assign(
-               tp_assign(dev, journal->j_fs_dev->bd_dev);
-               tp_assign(tail_sequence, journal->j_tail_sequence);
-               tp_assign(first_tid, first_tid);
-               tp_assign(block_nr, block_nr);
-               tp_assign(freed, freed);
+               tp_assign(dev, journal->j_fs_dev->bd_dev)
+               tp_assign(tail_sequence, journal->j_tail_sequence)
+               tp_assign(first_tid, first_tid)
+               tp_assign(block_nr, block_nr)
+               tp_assign(freed, freed)
        ),
 
        TP_printk("dev %d,%d from %u to %u offset %lu freed %lu",

diff --git a/instrumentation/events/lttng-module/kmem.h b/instrumentation/events/lttng-module/kmem.h
index 04f668b0ac75e7db7d8180a3d010c9808e529a26..dab8989c0ea8327462ea2377991b873fc98680c8 100644 (file)
--- a/instrumentation/events/lttng-module/kmem.h
+++ b/instrumentation/events/lttng-module/kmem.h
@@ -23,11 +23,11 @@ DECLARE_EVENT_CLASS(kmem_alloc,
        ),
 
        TP_fast_assign(
-               tp_assign(call_site, call_site);
-               tp_assign(ptr, ptr);
-               tp_assign(bytes_req, bytes_req);
-               tp_assign(bytes_alloc, bytes_alloc);
-               tp_assign(gfp_flags, gfp_flags);
+               tp_assign(call_site, call_site)
+               tp_assign(ptr, ptr)
+               tp_assign(bytes_req, bytes_req)
+               tp_assign(bytes_alloc, bytes_alloc)
+               tp_assign(gfp_flags, gfp_flags)
        ),
 
        TP_printk("call_site=%lx ptr=%p bytes_req=%zu bytes_alloc=%zu gfp_flags=%s",
@@ -75,12 +75,12 @@ DECLARE_EVENT_CLASS(kmem_alloc_node,
        ),
 
        TP_fast_assign(
-               tp_assign(call_site, call_site);
-               tp_assign(ptr, ptr);
-               tp_assign(bytes_req, bytes_req);
-               tp_assign(bytes_alloc, bytes_alloc);
-               tp_assign(gfp_flags, gfp_flags);
-               tp_assign(node, node);
+               tp_assign(call_site, call_site)
+               tp_assign(ptr, ptr)
+               tp_assign(bytes_req, bytes_req)
+               tp_assign(bytes_alloc, bytes_alloc)
+               tp_assign(gfp_flags, gfp_flags)
+               tp_assign(node, node)
        ),
 
        TP_printk("call_site=%lx ptr=%p bytes_req=%zu bytes_alloc=%zu gfp_flags=%s node=%d",
@@ -122,8 +122,8 @@ DECLARE_EVENT_CLASS(kmem_free,
        ),
 
        TP_fast_assign(
-               tp_assign(call_site, call_site);
-               tp_assign(ptr, ptr);
+               tp_assign(call_site, call_site)
+               tp_assign(ptr, ptr)
        ),
 
        TP_printk("call_site=%lx ptr=%p", __entry->call_site, __entry->ptr)
@@ -155,8 +155,8 @@ TRACE_EVENT(mm_page_free_direct,
        ),
 
        TP_fast_assign(
-               tp_assign(page, page);
-               tp_assign(order, order);
+               tp_assign(page, page)
+               tp_assign(order, order)
        ),
 
        TP_printk("page=%p pfn=%lu order=%d",
@@ -177,8 +177,8 @@ TRACE_EVENT(mm_pagevec_free,
        ),
 
        TP_fast_assign(
-               tp_assign(page, page);
-               tp_assign(cold, cold);
+               tp_assign(page, page)
+               tp_assign(cold, cold)
        ),
 
        TP_printk("page=%p pfn=%lu order=0 cold=%d",
@@ -202,10 +202,10 @@ TRACE_EVENT(mm_page_alloc,
        ),
 
        TP_fast_assign(
-               tp_assign(page, page);
-               tp_assign(order, order);
-               tp_assign(gfp_flags, gfp_flags);
-               tp_assign(migratetype, migratetype);
+               tp_assign(page, page)
+               tp_assign(order, order)
+               tp_assign(gfp_flags, gfp_flags)
+               tp_assign(migratetype, migratetype)
        ),
 
        TP_printk("page=%p pfn=%lu order=%d migratetype=%d gfp_flags=%s",
@@ -229,9 +229,9 @@ DECLARE_EVENT_CLASS(mm_page,
        ),
 
        TP_fast_assign(
-               tp_assign(page, page);
-               tp_assign(order, order);
-               tp_assign(migratetype, migratetype);
+               tp_assign(page, page)
+               tp_assign(order, order)
+               tp_assign(migratetype, migratetype)
        ),
 
        TP_printk("page=%p pfn=%lu order=%u migratetype=%d percpu_refill=%d",
@@ -279,11 +279,11 @@ TRACE_EVENT(mm_page_alloc_extfrag,
        ),
 
        TP_fast_assign(
-               tp_assign(page, page);
-               tp_assign(alloc_order, alloc_order);
-               tp_assign(fallback_order, fallback_order);
-               tp_assign(alloc_migratetype, alloc_migratetype);
-               tp_assign(fallback_migratetype, fallback_migratetype);
+               tp_assign(page, page)
+               tp_assign(alloc_order, alloc_order)
+               tp_assign(fallback_order, fallback_order)
+               tp_assign(alloc_migratetype, alloc_migratetype)
+               tp_assign(fallback_migratetype, fallback_migratetype)
        ),
 
        TP_printk("page=%p pfn=%lu alloc_order=%d fallback_order=%d pageblock_order=%d alloc_migratetype=%d fallback_migratetype=%d fragmenting=%d change_ownership=%d",

diff --git a/instrumentation/events/lttng-module/lock.h b/instrumentation/events/lttng-module/lock.h
index 75101f69e22972404ea5cbe23af6c7d7ea6a7391..e2c1c7a4a310792f5f687784a6da06b2a6e7e571 100644 (file)
--- a/instrumentation/events/lttng-module/lock.h
+++ b/instrumentation/events/lttng-module/lock.h
@@ -24,9 +24,9 @@ TRACE_EVENT(lock_acquire,
        ),
 
        TP_fast_assign(
-               tp_assign(flags, (trylock ? 1 : 0) | (read ? 2 : 0));
-               tp_strcpy(name, lock->name);
-               tp_assign(lockdep_addr, lock);
+               tp_assign(flags, (trylock ? 1 : 0) | (read ? 2 : 0))
+               tp_strcpy(name, lock->name)
+               tp_assign(lockdep_addr, lock)
        ),
 
        TP_printk("%p %s%s%s", __entry->lockdep_addr,
@@ -47,8 +47,8 @@ DECLARE_EVENT_CLASS(lock,
        ),
 
        TP_fast_assign(
-               tp_strcpy(name, lock->name);
-               tp_assign(lockdep_addr, lock);
+               tp_strcpy(name, lock->name)
+               tp_assign(lockdep_addr, lock)
        ),
 
        TP_printk("%p %s",  __entry->lockdep_addr, __get_str(name))

diff --git a/instrumentation/events/lttng-module/module.h b/instrumentation/events/lttng-module/module.h
index 2e83431a87e3589e350c859116936bfa84cb812f..65a8135e26917f670d4655cef8808a40c95ac302 100644 (file)
--- a/instrumentation/events/lttng-module/module.h
+++ b/instrumentation/events/lttng-module/module.h
@@ -40,8 +40,8 @@ TRACE_EVENT(module_load,
        ),
 
        TP_fast_assign(
-               tp_assign(taints, mod->taints);
-               tp_strcpy(name, mod->name);
+               tp_assign(taints, mod->taints)
+               tp_strcpy(name, mod->name)
        ),
 
        TP_printk("%s %s", __get_str(name), show_module_flags(__entry->taints))
@@ -58,7 +58,7 @@ TRACE_EVENT(module_free,
        ),
 
        TP_fast_assign(
-               tp_strcpy(name, mod->name);
+               tp_strcpy(name, mod->name)
        ),
 
        TP_printk("%s", __get_str(name))
@@ -80,9 +80,9 @@ DECLARE_EVENT_CLASS(module_refcnt,
        ),
 
        TP_fast_assign(
-               tp_assign(ip, ip);
-               tp_assign(refcnt, __this_cpu_read(mod->refptr->incs) + __this_cpu_read(mod->refptr->decs));
-               tp_strcpy(name, mod->name);
+               tp_assign(ip, ip)
+               tp_assign(refcnt, __this_cpu_read(mod->refptr->incs) + __this_cpu_read(mod->refptr->decs))
+               tp_strcpy(name, mod->name)
        ),
 
        TP_printk("%s call_site=%pf refcnt=%d",
@@ -117,9 +117,9 @@ TRACE_EVENT(module_request,
        ),
 
        TP_fast_assign(
-               tp_assign(ip, ip);
-               tp_assign(wait, wait);
-               tp_strcpy(name, name);
+               tp_assign(ip, ip)
+               tp_assign(wait, wait)
+               tp_strcpy(name, name)
        ),
 
        TP_printk("%s wait=%d call_site=%pf",

diff --git a/instrumentation/events/lttng-module/napi.h b/instrumentation/events/lttng-module/napi.h
index 58b83362e838a0f8dd70e33c68e3287bfb31d522..26b10ba1b99db10f22623cd0c3a028a7c02c4d0d 100644 (file)
--- a/instrumentation/events/lttng-module/napi.h
+++ b/instrumentation/events/lttng-module/napi.h
@@ -22,8 +22,8 @@ TRACE_EVENT(napi_poll,
        ),
 
        TP_fast_assign(
-               tp_assign(napi, napi);
-               tp_strcpy(dev_name, napi->dev ? napi->dev->name : NO_DEV);
+               tp_assign(napi, napi)
+               tp_strcpy(dev_name, napi->dev ? napi->dev->name : NO_DEV)
        ),
 
        TP_printk("napi poll on napi struct %p for device %s",

diff --git a/instrumentation/events/lttng-module/net.h b/instrumentation/events/lttng-module/net.h
index 589011c07b8e3139e217c78ba284112ab57e2d82..a444b07a201059058a1da9c8c81f5804463871f2 100644 (file)
--- a/instrumentation/events/lttng-module/net.h
+++ b/instrumentation/events/lttng-module/net.h
@@ -39,17 +39,17 @@ TRACE_EVENT(net_dev_xmit,
 
 #if (LINUX_VERSION_CODE >= KERNEL_VERSION(3,0,0))
        TP_fast_assign(
-               tp_assign(skbaddr, skb);
-               tp_assign(len, skb_len);
-               tp_assign(rc, rc);
-               tp_strcpy(name, dev->name);
+               tp_assign(skbaddr, skb)
+               tp_assign(len, skb_len)
+               tp_assign(rc, rc)
+               tp_strcpy(name, dev->name)
        ),
 #else
        TP_fast_assign(
-               tp_assign(skbaddr, skb);
-               tp_assign(len, skb->len);
-               tp_assign(rc, rc);
-               tp_strcpy(name, skb->dev->name);
+               tp_assign(skbaddr, skb)
+               tp_assign(len, skb->len)
+               tp_assign(rc, rc)
+               tp_strcpy(name, skb->dev->name)
        ),
 #endif
 
@@ -70,9 +70,9 @@ DECLARE_EVENT_CLASS(net_dev_template,
        ),
 
        TP_fast_assign(
-               tp_assign(skbaddr, skb);
-               tp_assign(len, skb->len);
-               tp_strcpy(name, skb->dev->name);
+               tp_assign(skbaddr, skb)
+               tp_assign(len, skb->len)
+               tp_strcpy(name, skb->dev->name)
        ),
 
        TP_printk("dev=%s skbaddr=%p len=%u",

diff --git a/instrumentation/events/lttng-module/power.h b/instrumentation/events/lttng-module/power.h
index 05aced7414cc6c01da5d3f4d1401ecf148a42055..f2e3f54746c62c5349ba40205713a7b8ee0fc3ad 100644 (file)
--- a/instrumentation/events/lttng-module/power.h
+++ b/instrumentation/events/lttng-module/power.h
@@ -19,8 +19,8 @@ DECLARE_EVENT_CLASS(cpu,
        ),
 
        TP_fast_assign(
-               tp_assign(state, state);
-               tp_assign(cpu_id, cpu_id);
+               tp_assign(state, state)
+               tp_assign(cpu_id, cpu_id)
        ),
 
        TP_printk("state=%lu cpu_id=%lu", (unsigned long)__entry->state,
@@ -59,7 +59,7 @@ TRACE_EVENT(machine_suspend,
        ),
 
        TP_fast_assign(
-               tp_assign(state, state);
+               tp_assign(state, state)
        ),
 
        TP_printk("state=%lu", (unsigned long)__entry->state)
@@ -85,9 +85,9 @@ DECLARE_EVENT_CLASS(power,
        ),
 
        TP_fast_assign(
-               tp_assign(type, type);
-               tp_assign(state, state);
-               tp_assign(cpu_id, cpu_id);
+               tp_assign(type, type)
+               tp_assign(state, state)
+               tp_assign(cpu_id, cpu_id)
        ),
 
        TP_printk("type=%lu state=%lu cpu_id=%lu", (unsigned long)__entry->type,
@@ -119,7 +119,7 @@ TRACE_EVENT(power_end,
        ),
 
        TP_fast_assign(
-               tp_assign(cpu_id, cpu_id);
+               tp_assign(cpu_id, cpu_id)
        ),
 
        TP_printk("cpu_id=%lu", (unsigned long)__entry->cpu_id)
@@ -173,9 +173,9 @@ DECLARE_EVENT_CLASS(clock,
        ),
 
        TP_fast_assign(
-               tp_strcpy(name, name);
-               tp_assign(state, state);
-               tp_assign(cpu_id, cpu_id);
+               tp_strcpy(name, name)
+               tp_assign(state, state)
+               tp_assign(cpu_id, cpu_id)
        ),
 
        TP_printk("%s state=%lu cpu_id=%lu", __get_str(name),
@@ -219,9 +219,9 @@ DECLARE_EVENT_CLASS(power_domain,
        ),
 
        TP_fast_assign(
-               tp_strcpy(name, name);
-               tp_assign(state, state);
-               tp_assign(cpu_id, cpu_id);
+               tp_strcpy(name, name)
+               tp_assign(state, state)
+               tp_assign(cpu_id, cpu_id)
 ),
 
        TP_printk("%s state=%lu cpu_id=%lu", __get_str(name),

diff --git a/instrumentation/events/lttng-module/regulator.h b/instrumentation/events/lttng-module/regulator.h
index e94da7cd7f9374e9cd6ac4bb1ef72591b2b19dad..bb84c47ccd956adf292ab411f81c75fdc0d14b77 100644 (file)
--- a/instrumentation/events/lttng-module/regulator.h
+++ b/instrumentation/events/lttng-module/regulator.h
@@ -22,7 +22,7 @@ DECLARE_EVENT_CLASS(regulator_basic,
        ),
 
        TP_fast_assign(
-               tp_strcpy(name, name);
+               tp_strcpy(name, name)
        ),
 
        TP_printk("name=%s", __get_str(name))
@@ -86,9 +86,9 @@ DECLARE_EVENT_CLASS(regulator_range,
        ),
 
        TP_fast_assign(
-               tp_strcpy(name, name);
-               tp_assign(min, min);
-               tp_assign(max, max);
+               tp_strcpy(name, name)
+               tp_assign(min, min)
+               tp_assign(max, max)
        ),
 
        TP_printk("name=%s (%d-%d)", __get_str(name),
@@ -119,8 +119,8 @@ DECLARE_EVENT_CLASS(regulator_value,
        ),
 
        TP_fast_assign(
-               tp_strcpy(name, name);
-               tp_assign(val, val);
+               tp_strcpy(name, name)
+               tp_assign(val, val)
        ),
 
        TP_printk("name=%s, val=%u", __get_str(name),

diff --git a/instrumentation/events/lttng-module/scsi.h b/instrumentation/events/lttng-module/scsi.h
index 27362f8dff785325b9ec799cfb5a39f1ac8ca2f3..18d2b0229951adb13a1714922070cc3cdf1aeddb 100644 (file)
--- a/instrumentation/events/lttng-module/scsi.h
+++ b/instrumentation/events/lttng-module/scsi.h
@@ -222,16 +222,16 @@ TRACE_EVENT(scsi_dispatch_cmd_start,
        ),
 
        TP_fast_assign(
-               tp_assign(host_no, cmd->device->host->host_no);
-               tp_assign(channel, cmd->device->channel);
-               tp_assign(id, cmd->device->id);
-               tp_assign(lun, cmd->device->lun);
-               tp_assign(opcode, cmd->cmnd[0]);
-               tp_assign(cmd_len, cmd->cmd_len);
-               tp_assign(data_sglen, scsi_sg_count(cmd));
-               tp_assign(prot_sglen, scsi_prot_sg_count(cmd));
-               tp_assign(prot_op, scsi_get_prot_op(cmd));
-               tp_memcpy_dyn(cmnd, cmd->cmnd);
+               tp_assign(host_no, cmd->device->host->host_no)
+               tp_assign(channel, cmd->device->channel)
+               tp_assign(id, cmd->device->id)
+               tp_assign(lun, cmd->device->lun)
+               tp_assign(opcode, cmd->cmnd[0])
+               tp_assign(cmd_len, cmd->cmd_len)
+               tp_assign(data_sglen, scsi_sg_count(cmd))
+               tp_assign(prot_sglen, scsi_prot_sg_count(cmd))
+               tp_assign(prot_op, scsi_get_prot_op(cmd))
+               tp_memcpy_dyn(cmnd, cmd->cmnd)
        ),
 
        TP_printk("host_no=%u channel=%u id=%u lun=%u data_sgl=%u prot_sgl=%u" \
@@ -265,17 +265,17 @@ TRACE_EVENT(scsi_dispatch_cmd_error,
        ),
 
        TP_fast_assign(
-               tp_assign(host_no, cmd->device->host->host_no);
-               tp_assign(channel, cmd->device->channel);
-               tp_assign(id, cmd->device->id);
-               tp_assign(lun, cmd->device->lun);
-               tp_assign(rtn, rtn);
-               tp_assign(opcode, cmd->cmnd[0]);
-               tp_assign(cmd_len, cmd->cmd_len);
-               tp_assign(data_sglen, scsi_sg_count(cmd));
-               tp_assign(prot_sglen, scsi_prot_sg_count(cmd));
-               tp_assign(prot_op, scsi_get_prot_op(cmd));
-               tp_memcpy_dyn(cmnd, cmd->cmnd);
+               tp_assign(host_no, cmd->device->host->host_no)
+               tp_assign(channel, cmd->device->channel)
+               tp_assign(id, cmd->device->id)
+               tp_assign(lun, cmd->device->lun)
+               tp_assign(rtn, rtn)
+               tp_assign(opcode, cmd->cmnd[0])
+               tp_assign(cmd_len, cmd->cmd_len)
+               tp_assign(data_sglen, scsi_sg_count(cmd))
+               tp_assign(prot_sglen, scsi_prot_sg_count(cmd))
+               tp_assign(prot_op, scsi_get_prot_op(cmd))
+               tp_memcpy_dyn(cmnd, cmd->cmnd)
        ),
 
        TP_printk("host_no=%u channel=%u id=%u lun=%u data_sgl=%u prot_sgl=%u" \
@@ -310,17 +310,17 @@ DECLARE_EVENT_CLASS(scsi_cmd_done_timeout_template,
        ),
 
        TP_fast_assign(
-               tp_assign(host_no, cmd->device->host->host_no);
-               tp_assign(channel, cmd->device->channel);
-               tp_assign(id, cmd->device->id);
-               tp_assign(lun, cmd->device->lun);
-               tp_assign(result, cmd->result);
-               tp_assign(opcode, cmd->cmnd[0]);
-               tp_assign(cmd_len, cmd->cmd_len);
-               tp_assign(data_sglen, scsi_sg_count(cmd));
-               tp_assign(prot_sglen, scsi_prot_sg_count(cmd));
-               tp_assign(prot_op, scsi_get_prot_op(cmd));
-               tp_memcpy_dyn(cmnd, cmd->cmnd);
+               tp_assign(host_no, cmd->device->host->host_no)
+               tp_assign(channel, cmd->device->channel)
+               tp_assign(id, cmd->device->id)
+               tp_assign(lun, cmd->device->lun)
+               tp_assign(result, cmd->result)
+               tp_assign(opcode, cmd->cmnd[0])
+               tp_assign(cmd_len, cmd->cmd_len)
+               tp_assign(data_sglen, scsi_sg_count(cmd))
+               tp_assign(prot_sglen, scsi_prot_sg_count(cmd))
+               tp_assign(prot_op, scsi_get_prot_op(cmd))
+               tp_memcpy_dyn(cmnd, cmd->cmnd)
        ),
 
        TP_printk("host_no=%u channel=%u id=%u lun=%u data_sgl=%u " \
@@ -357,7 +357,7 @@ TRACE_EVENT(scsi_eh_wakeup,
        ),
 
        TP_fast_assign(
-               tp_assign(host_no, shost->host_no);
+               tp_assign(host_no, shost->host_no)
        ),
 
        TP_printk("host_no=%u", __entry->host_no)

diff --git a/instrumentation/events/lttng-module/skb.h b/instrumentation/events/lttng-module/skb.h
index 9a794499c667936a7b67377fbebda94e75da122a..3163356c5b7cc2899cbfaf5978f10a4b7ebd4636 100644 (file)
--- a/instrumentation/events/lttng-module/skb.h
+++ b/instrumentation/events/lttng-module/skb.h
@@ -24,9 +24,9 @@ TRACE_EVENT(kfree_skb,
        ),
 
        TP_fast_assign(
-               tp_assign(skbaddr, skb);
-               tp_assign(location, location);
-               tp_assign(protocol, ntohs(skb->protocol));
+               tp_assign(skbaddr, skb)
+               tp_assign(location, location)
+               tp_assign(protocol, ntohs(skb->protocol))
        ),
 
        TP_printk("skbaddr=%p protocol=%u location=%p",
@@ -44,7 +44,7 @@ TRACE_EVENT(consume_skb,
        ),
 
        TP_fast_assign(
-               tp_assign(skbaddr, skb);
+               tp_assign(skbaddr, skb)
        ),
 
        TP_printk("skbaddr=%p", __entry->skbaddr)
@@ -62,8 +62,8 @@ TRACE_EVENT(skb_copy_datagram_iovec,
        ),
 
        TP_fast_assign(
-               tp_assign(skbaddr, skb);
-               tp_assign(len, len);
+               tp_assign(skbaddr, skb)
+               tp_assign(len, len)
        ),
 
        TP_printk("skbaddr=%p len=%d", __entry->skbaddr, __entry->len)

diff --git a/instrumentation/events/lttng-module/sock.h b/instrumentation/events/lttng-module/sock.h
index 246ea58ca3fdcebe9e00315988a3283d796ffc35..c4e689ade85eeafec214a429b3f1dd93a8f49ea4 100644 (file)
--- a/instrumentation/events/lttng-module/sock.h
+++ b/instrumentation/events/lttng-module/sock.h
@@ -20,9 +20,9 @@ TRACE_EVENT(sock_rcvqueue_full,
        ),
 
        TP_fast_assign(
-               tp_assign(rmem_alloc, atomic_read(&sk->sk_rmem_alloc));
-               tp_assign(truesize, skb->truesize);
-               tp_assign(sk_rcvbuf, sk->sk_rcvbuf);
+               tp_assign(rmem_alloc, atomic_read(&sk->sk_rmem_alloc))
+               tp_assign(truesize, skb->truesize)
+               tp_assign(sk_rcvbuf, sk->sk_rcvbuf)
        ),
 
        TP_printk("rmem_alloc=%d truesize=%u sk_rcvbuf=%d",
@@ -44,10 +44,10 @@ TRACE_EVENT(sock_exceed_buf_limit,
        ),
 
        TP_fast_assign(
-               tp_strcpy(name, prot->name);
-               tp_assign(sysctl_mem, prot->sysctl_mem);
-               tp_assign(allocated, allocated);
-               tp_assign(sysctl_rmem, prot->sysctl_rmem[0]);
+               tp_strcpy(name, prot->name)
+               tp_assign(sysctl_mem, prot->sysctl_mem)
+               tp_assign(allocated, allocated)
+               tp_assign(sysctl_rmem, prot->sysctl_rmem[0])
                tp_assign(rmem_alloc, atomic_read(&sk->sk_rmem_alloc));
        ),
 

diff --git a/instrumentation/events/lttng-module/udp.h b/instrumentation/events/lttng-module/udp.h
index 304ea955ebce1d385601aee33569846a349b57cf..a246e84ba5f6778505facda31be7462d36481d51 100644 (file)
--- a/instrumentation/events/lttng-module/udp.h
+++ b/instrumentation/events/lttng-module/udp.h
@@ -19,8 +19,8 @@ TRACE_EVENT(udp_fail_queue_rcv_skb,
        ),
 
        TP_fast_assign(
-               tp_assign(rc, rc);
-               tp_assign(lport, inet_sk(sk)->inet_num);
+               tp_assign(rc, rc)
+               tp_assign(lport, inet_sk(sk)->inet_num)
        ),
 
        TP_printk("rc=%d port=%hu", __entry->rc, __entry->lport)

diff --git a/instrumentation/events/lttng-module/vmscan.h b/instrumentation/events/lttng-module/vmscan.h
index aa022e2f137a21b8a243fe6e51b33e1a4ebb865d..d6ab952c4f7dc30701602e0df15c1e820d73ebb4 100644 (file)
--- a/instrumentation/events/lttng-module/vmscan.h
+++ b/instrumentation/events/lttng-module/vmscan.h
@@ -15,7 +15,7 @@ TRACE_EVENT(mm_vmscan_kswapd_sleep,
        ),
 
        TP_fast_assign(
-               tp_assign(nid, nid);
+               tp_assign(nid, nid)
        ),
 
        TP_printk("nid=%d", __entry->nid)
@@ -33,8 +33,8 @@ TRACE_EVENT(mm_vmscan_kswapd_wake,
        ),
 
        TP_fast_assign(
-               tp_assign(nid, nid);
-               tp_assign(order, order);
+               tp_assign(nid, nid)
+               tp_assign(order, order)
        ),
 
        TP_printk("nid=%d order=%d", __entry->nid, __entry->order)
@@ -53,9 +53,9 @@ TRACE_EVENT(mm_vmscan_wakeup_kswapd,
        ),
 
        TP_fast_assign(
-               tp_assign(nid, nid);
-               tp_assign(zid, zid);
-               tp_assign(order, order);
+               tp_assign(nid, nid)
+               tp_assign(zid, zid)
+               tp_assign(order, order)
        ),
 
        TP_printk("nid=%d zid=%d order=%d",
@@ -77,9 +77,9 @@ DECLARE_EVENT_CLASS(mm_vmscan_direct_reclaim_begin_template,
        ),
 
        TP_fast_assign(
-               tp_assign(order, order);
-               tp_assign(may_writepage, may_writepage);
-               tp_assign(gfp_flags, gfp_flags);
+               tp_assign(order, order)
+               tp_assign(may_writepage, may_writepage)
+               tp_assign(gfp_flags, gfp_flags)
        ),
 
        TP_printk("order=%d may_writepage=%d gfp_flags=%s",
@@ -120,7 +120,7 @@ DECLARE_EVENT_CLASS(mm_vmscan_direct_reclaim_end_template,
        ),
 
        TP_fast_assign(
-               tp_assign(nr_reclaimed, nr_reclaimed);
+               tp_assign(nr_reclaimed, nr_reclaimed)
        ),
 
        TP_printk("nr_reclaimed=%lu", __entry->nr_reclaimed)
@@ -169,15 +169,15 @@ TRACE_EVENT(mm_shrink_slab_start,
        ),
 
        TP_fast_assign(
-               tp_assign(shr,shr);
-               tp_assign(shrink, shr->shrink);
-               tp_assign(nr_objects_to_shrink, nr_objects_to_shrink);
-               tp_assign(gfp_flags, sc->gfp_mask);
-               tp_assign(pgs_scanned, pgs_scanned);
-               tp_assign(lru_pgs, lru_pgs);
-               tp_assign(cache_items, cache_items);
-               tp_assign(delta, delta);
-               tp_assign(total_scan, total_scan);
+               tp_assign(shr,shr)
+               tp_assign(shrink, shr->shrink)
+               tp_assign(nr_objects_to_shrink, nr_objects_to_shrink)
+               tp_assign(gfp_flags, sc->gfp_mask)
+               tp_assign(pgs_scanned, pgs_scanned)
+               tp_assign(lru_pgs, lru_pgs)
+               tp_assign(cache_items, cache_items)
+               tp_assign(delta, delta)
+               tp_assign(total_scan, total_scan)
        ),
 
        TP_printk("%pF %p: objects to shrink %ld gfp_flags %s pgs_scanned %ld lru_pgs %ld cache items %ld delta %lld total_scan %ld",
@@ -208,12 +208,12 @@ TRACE_EVENT(mm_shrink_slab_end,
        ),
 
        TP_fast_assign(
-               tp_assign(shr, shr);
-               tp_assign(shrink, shr->shrink);
-               tp_assign(unused_scan, unused_scan_cnt);
-               tp_assign(new_scan, new_scan_cnt);
-               tp_assign(retval, shrinker_retval);
-               tp_assign(total_scan, new_scan_cnt - unused_scan_cnt);
+               tp_assign(shr, shr)
+               tp_assign(shrink, shr->shrink)
+               tp_assign(unused_scan, unused_scan_cnt)
+               tp_assign(new_scan, new_scan_cnt)
+               tp_assign(retval, shrinker_retval)
+               tp_assign(total_scan, new_scan_cnt - unused_scan_cnt)
        ),
 
        TP_printk("%pF %p: unused scan count %ld new scan count %ld total_scan %ld last shrinker return val %d",
@@ -262,16 +262,16 @@ DECLARE_EVENT_CLASS(mm_vmscan_lru_isolate_template,
        ),
 
        TP_fast_assign(
-               tp_assign(order, order);
-               tp_assign(nr_requested, nr_requested);
-               tp_assign(nr_scanned, nr_scanned);
-               tp_assign(nr_taken, nr_taken);
-               tp_assign(nr_lumpy_taken, nr_lumpy_taken);
-               tp_assign(nr_lumpy_dirty, nr_lumpy_dirty);
-               tp_assign(nr_lumpy_failed, nr_lumpy_failed);
-               tp_assign(isolate_mode, isolate_mode);
+               tp_assign(order, order)
+               tp_assign(nr_requested, nr_requested)
+               tp_assign(nr_scanned, nr_scanned)
+               tp_assign(nr_taken, nr_taken)
+               tp_assign(nr_lumpy_taken, nr_lumpy_taken)
+               tp_assign(nr_lumpy_dirty, nr_lumpy_dirty)
+               tp_assign(nr_lumpy_failed, nr_lumpy_failed)
+               tp_assign(isolate_mode, isolate_mode)
 #if (LINUX_VERSION_CODE >= KERNEL_VERSION(3,3,0))
-               tp_assign(file, file);
+               tp_assign(file, file)
 #endif
        ),
 
@@ -364,8 +364,8 @@ TRACE_EVENT(mm_vmscan_writepage,
        ),
 
        TP_fast_assign(
-               tp_assign(page, page);
-               tp_assign(reclaim_flags, reclaim_flags);
+               tp_assign(page, page)
+               tp_assign(reclaim_flags, reclaim_flags)
        ),
 
        TP_printk("page=%p pfn=%lu flags=%s",
@@ -392,12 +392,12 @@ TRACE_EVENT(mm_vmscan_lru_shrink_inactive,
        ),
 
        TP_fast_assign(
-               tp_assign(nid, nid);
-               tp_assign(zid, zid);
-               tp_assign(nr_scanned, nr_scanned);
-               tp_assign(nr_reclaimed, nr_reclaimed);
-               tp_assign(priority, priority);
-               tp_assign(reclaim_flags, reclaim_flags);
+               tp_assign(nid, nid)
+               tp_assign(zid, zid)
+               tp_assign(nr_scanned, nr_scanned)
+               tp_assign(nr_reclaimed, nr_reclaimed)
+               tp_assign(priority, priority)
+               tp_assign(reclaim_flags, reclaim_flags)
        ),
 
        TP_printk("nid=%d zid=%d nr_scanned=%ld nr_reclaimed=%ld priority=%d flags=%s",
@@ -423,10 +423,10 @@ TRACE_EVENT(replace_swap_token,
        ),
 
        TP_fast_assign(
-               tp_assign(old_mm, old_mm);
-               tp_assign(old_prio, old_mm ? old_mm->token_priority : 0);
-               tp_assign(new_mm, new_mm);
-               tp_assign(new_prio, new_mm->token_priority);
+               tp_assign(old_mm, old_mm)
+               tp_assign(old_prio, old_mm ? old_mm->token_priority : 0)
+               tp_assign(new_mm, new_mm)
+               tp_assign(new_prio, new_mm->token_priority)
        ),
 
        TP_printk("old_token_mm=%p old_prio=%u new_token_mm=%p new_prio=%u",
@@ -444,7 +444,7 @@ DECLARE_EVENT_CLASS(put_swap_token_template,
        ),
 
        TP_fast_assign(
-               tp_assign(swap_token_mm, swap_token_mm);
+               tp_assign(swap_token_mm, swap_token_mm)
        ),
 
        TP_printk("token_mm=%p", __entry->swap_token_mm)
@@ -479,11 +479,11 @@ TRACE_EVENT_CONDITION(update_swap_token_priority,
        ),
 
        TP_fast_assign(
-               tp_assign(mm, mm);
-               tp_assign(old_prio, old_prio);
-               tp_assign(new_prio, mm->token_priority);
-               tp_assign(swap_token_mm, swap_token_mm);
-               tp_assign(swap_token_prio, swap_token_mm ? swap_token_mm->token_priority : 0);
+               tp_assign(mm, mm)
+               tp_assign(old_prio, old_prio)
+               tp_assign(new_prio, mm->token_priority)
+               tp_assign(swap_token_mm, swap_token_mm)
+               tp_assign(swap_token_prio, swap_token_mm ? swap_token_mm->token_priority : 0)
        ),
 
        TP_printk("mm=%p old_prio=%u new_prio=%u swap_token_mm=%p token_prio=%u",