Removal of trace event semicolons
Subsystems (18)
Mathieu Desnoyers
reviewercover Removal of trace event semicolons
Hi,
I am hereby proposing the removal of trailing semicolons within the trace event headers.
Please refer to "patch 01: TRACE_EVENT: gradual semicolon removal" for explanation of this change. This patchset is based on the 2.6.37 kernel.
Feedback is welcome,
Thanks,
Mathieu
Signature · 4 lines
Mathieu Desnoyers Operating System Efficiency R&D Consultant EfficiOS Inc. http://www.efficios.com
Mathieu Desnoyers
reviewerRFC PATCH 2/28 trace event sample remove semicolons, specify need for ifdef around declarations
Part of the gradual TRACE_EVENT() semicolon removal. Enables creation of array of events, thus saving space for trace event probes.
Protecting declarations with ifndef _TRACE_SAMPLE_DEF_ is required if we want to ensure that, e.g., structure forward declarations do not generate extra semicolons. It's already needed for enumerations and static inline functions declarations, but not documented, so document it here.
Signed-off-by Mathieu Desnoyers <[email protected]>
CC Steven Rostedt <[email protected]>
CC Frederic Weisbecker <[email protected]>
CC Ingo Molnar <[email protected]>
CC Thomas Gleixner <[email protected]>
CC Li Zefan <[email protected]>
--- samples/trace_events/trace-events-sample.h | 14 +++++++++++++- 1 file changed, 13 insertions(+), 1 deletion(-)
samples/trace_events/trace-events-sample.h +13 -1
@@ -41,6 +41,18 @@*/ #include <linux/tracepoint.h> +#ifndef _TRACE_SAMPLE_DEF_ +#define _TRACE_SAMPLE_DEF_ + +/* +* All static inline functions, enumerations, types and structures declarations, +* as well as structure forward declarations, should be surrounded by +* _TRACE_SAMPLE_DEF_ preprocessor idefs (where SAMPLE is the name of the trace +* system). +*/ + +#endif /* _TRACE_SAMPLE_DEF_ */ +/* * The TRACE_EVENT macro is broken up into 5 parts. *
@@ -91,7 +103,7 @@ TRACE_EVENT(foo_bar, ), TP_printk("foo %s %d", __entry->foo, __entry->bar) -); +)#endif /***** NOTICE! The #if protection ends here. *****/
Mathieu Desnoyers
reviewerRFC PATCH 3/28 trace event bkl remove semicolons
In reply to Mathieu DesnoyersPart of the gradual TRACE_EVENT() semicolon removal. Enables creation of array of events, thus saving space for trace event probes.
Signed-off-by Mathieu Desnoyers <[email protected]>
CC Steven Rostedt <[email protected]>
CC Frederic Weisbecker <[email protected]>
CC Ingo Molnar <[email protected]>
CC Thomas Gleixner <[email protected]>
--- include/trace/events/bkl.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
include/trace/events/bkl.h +2 -2
@@ -29,7 +29,7 @@ TRACE_EVENT(lock_kernel, TP_printk("depth=%d file:line=%s:%d func=%s()", __entry->depth, __entry->file, __entry->line, __entry->func) -); +) TRACE_EVENT(unlock_kernel,
@@ -53,7 +53,7 @@ TRACE_EVENT(unlock_kernel, TP_printk("depth=%d file:line=%s:%d func=%s()", __entry->depth, __entry->file, __entry->line, __entry->func) -); +)#endif /* _TRACE_BKL_H */
Re: [RFC patch 03/28] trace event bkl remove semicolons
Quoted 4 lines · Mathieu Desnoyers
Part of the gradual
TRACE_EVENT()semicolon removal. Enables creation of array of events, thus saving space for trace event probes.Signed-off-by Mathieu Desnoyers <[email protected]>
Mathieu Desnoyers
reviewerRFC PATCH 4/28 trace event block remove semicolumns
In reply to Mathieu DesnoyersPart of the gradual TRACE_EVENT() semicolon removal. Enables creation of array of events, thus saving space for trace event probes.
Signed-off-by Mathieu Desnoyers <[email protected]>
CC Jeff Moyer <[email protected]>
CC Jens Axboe <[email protected]>
CC Steven Rostedt <[email protected]>
CC Frederic Weisbecker <[email protected]>
CC Ingo Molnar <[email protected]>
CC Thomas Gleixner <[email protected]>
CC Li Zefan <[email protected]>
--- include/trace/events/block.h | 46 +++++++++++++++++++++---------------------- 1 file changed, 23 insertions(+), 23 deletions(-)
include/trace/events/block.h +23 -23
@@ -40,7 +40,7 @@ DECLARE_EVENT_CLASS(block_rq_with_error, __entry->rwbs,__get_str (cmd), (unsigned long long )__entry->sector, __entry->nr_sector, __entry->errors) -); +)/** * block_rq_abort - abort block operation request
@@ -57,7 +57,7 @@ DEFINE_EVENT(block_rq_with_error, block_ TP_PROTO(struct request_queue *q, struct request *rq),TP_ARGS (q, rq) -); +)/** * block_rq_requeue - place block IO request back on a queue
@@ -73,7 +73,7 @@ DEFINE_EVENT(block_rq_with_error, block_ TP_PROTO(struct request_queue *q, struct request *rq),TP_ARGS (q, rq) -); +)/** * block_rq_complete - block IO operation completed by device driver
@@ -91,7 +91,7 @@ DEFINE_EVENT(block_rq_with_error, block_ TP_PROTO(struct request_queue *q, struct request *rq), TP_ARGS(q, rq) -); +) DECLARE_EVENT_CLASS(block_rq,
@@ -128,7 +128,7 @@ DECLARE_EVENT_CLASS(block_rq, __entry->rwbs, __entry->bytes,__get_str (cmd), (unsigned long long )__entry->sector, __entry->nr_sector, __entry->comm) -); +)/** * block_rq_insert - insert block operation request into queue
@@ -145,7 +145,7 @@ DEFINE_EVENT(block_rq, block_rq_insert, TP_PROTO(struct request_queue *q, struct request *rq),TP_ARGS (q, rq) -); +)/** * block_rq_issue - issue pending block IO request operation to device driver
@@ -160,7 +160,7 @@ DEFINE_EVENT(block_rq, block_rq_issue, TP_PROTO(struct request_queue *q, struct request *rq),TP_ARGS (q, rq) -); +)/** * block_bio_bounce - used bounce buffer when processing block operation
@@ -200,7 +200,7 @@ TRACE_EVENT(block_bio_bounce,MAJOR (__entry->dev),MINOR (__entry->dev), __entry->rwbs, (unsigned long long )__entry->sector, __entry->nr_sector, __entry->comm) -); +)/** * block_bio_complete - completed all work on the block operation
@@ -237,7 +237,7 @@ TRACE_EVENT(block_bio_complete, MAJOR(__entry->dev), MINOR(__entry->dev), __entry->rwbs, (unsigned long long)__entry->sector, __entry->nr_sector, __entry->error) -); +) DECLARE_EVENT_CLASS(block_bio,
@@ -265,7 +265,7 @@ DECLARE_EVENT_CLASS(block_bio,MAJOR (__entry->dev),MINOR (__entry->dev), __entry->rwbs, (unsigned long long )__entry->sector, __entry->nr_sector, __entry->comm) -); +)/** * block_bio_backmerge - merging block operation to the end of an existing operation
@@ -280,7 +280,7 @@ DEFINE_EVENT(block_bio, block_bio_backme TP_PROTO(struct request_queue *q, struct bio *bio),TP_ARGS (q, bio) -); +)/** * block_bio_frontmerge - merging block operation to the beginning of an existing operation
@@ -295,7 +295,7 @@ DEFINE_EVENT(block_bio, block_bio_frontm TP_PROTO(struct request_queue *q, struct bio *bio),TP_ARGS (q, bio) -); +)/** * block_bio_queue - putting new block IO operation in queue
@@ -309,7 +309,7 @@ DEFINE_EVENT(block_bio, block_bio_queue, TP_PROTO(struct request_queue *q, struct bio *bio), TP_ARGS(q, bio) -); +) DECLARE_EVENT_CLASS(block_get_rq,
@@ -338,7 +338,7 @@ DECLARE_EVENT_CLASS(block_get_rq,MAJOR (__entry->dev),MINOR (__entry->dev), __entry->rwbs, (unsigned long long )__entry->sector, __entry->nr_sector, __entry->comm) -); +)/** * block_getrq - get a free request entry in queue for block IO operations
@@ -354,7 +354,7 @@ DEFINE_EVENT(block_get_rq, block_getrq, TP_PROTO(struct request_queue *q, struct bio *bio, int rw),TP_ARGS (q, bio, rw) -); +)/** * block_sleeprq - waiting to get a free request entry in queue for block IO operation
@@ -372,7 +372,7 @@ DEFINE_EVENT(block_get_rq, block_sleeprq TP_PROTO(struct request_queue *q, struct bio *bio, int rw),TP_ARGS (q, bio, rw) -); +)/** * block_plug - keep operations requests in request queue
@@ -397,7 +397,7 @@ TRACE_EVENT(block_plug, ), TP_printk("[%s]", __entry->comm) -); +) DECLARE_EVENT_CLASS(block_unplug,
@@ -416,7 +416,7 @@ DECLARE_EVENT_CLASS(block_unplug, ),TP_printk ("[%s] %d" , __entry->comm, __entry->nr_rq) -); +)/** * block_unplug_timer - timed release of operations requests in queue to device driver
@@ -430,7 +430,7 @@ DEFINE_EVENT(block_unplug, block_unplug_ TP_PROTO(struct request_queue *q), TP_ARGS(q) -); +)/** * block_unplug_io - release of operations requests in request queue
@@ -444,7 +444,7 @@ DEFINE_EVENT(block_unplug, block_unplug_ TP_PROTO(struct request_queue *q), TP_ARGS(q) -); +)/** * block_split - split a single bio struct into two bio structs
@@ -485,7 +485,7 @@ TRACE_EVENT(block_split, (unsigned long long )__entry->sector, (unsigned long long )__entry->new_sector, __entry->comm) -); +)/** * block_remap - map request for a partition to the raw device
@@ -528,7 +528,7 @@ TRACE_EVENT(block_remap, __entry->nr_sector,MAJOR (__entry->old_dev),MINOR (__entry->old_dev), (unsigned long long)__entry->old_sector) -); +)/** * block_rq_remap - map request for a block operation request
@@ -572,7 +572,7 @@ TRACE_EVENT(block_rq_remap, __entry->nr_sector, MAJOR(__entry->old_dev), MINOR(__entry->old_dev), (unsigned long long)__entry->old_sector) -); +)#endif /* _TRACE_BLOCK_H */
Mathieu Desnoyers
reviewerRFC PATCH 5/28 trace event ext4 remove semicolons
In reply to Mathieu DesnoyersPart of the gradual TRACE_EVENT() semicolon removal. Enables creation of array of events, thus saving space for trace event probes.
Signed-off-by Mathieu Desnoyers <[email protected]>
CC Steven Rostedt <[email protected]>
CC Frederic Weisbecker <[email protected]>
CC Ingo Molnar <[email protected]>
CC Thomas Gleixner <[email protected]>
CC Li Zefan <[email protected]>
CC Theodore Ts'o <[email protected]>
--- include/trace/events/ext4.h | 95 +++++++++++++++++++++++--------------------- 1 file changed, 50 insertions(+), 45 deletions(-)
include/trace/events/ext4.h +50 -45
@@ -7,6 +7,9 @@#include <linux/writeback.h> #include <linux/tracepoint.h> +#ifndef _TRACE_EXT4_DEF_ +#define _TRACE_EXT4_DEF_ +struct ext4_allocation_context ;struct ext4_allocation_request ;struct ext4_prealloc_space ;
@@ -15,6 +18,8 @@ struct mpage_da_data;#define EXT4_I (inode) (container_of(inode, struct ext4_inode_info, vfs_inode)) +#endif /* _TRACE_EXT4_DEF_ */ + TRACE_EVENT(ext4_free_inode, TP_PROTO(struct inode *inode),
@@ -45,7 +50,7 @@ TRACE_EVENT(ext4_free_inode, (unsigned long) __entry->ino, __entry->mode, __entry->uid, __entry->gid, (unsigned long long) __entry->blocks) -); +) TRACE_EVENT(ext4_request_inode, TP_PROTO(struct inode *dir, int mode),
@@ -69,7 +74,7 @@ TRACE_EVENT(ext4_request_inode, TP_printk("dev %d,%d dir %lu mode 0%o", __entry->dev_major, __entry->dev_minor, (unsigned long) __entry->dir, __entry->mode) -); +) TRACE_EVENT(ext4_allocate_inode, TP_PROTO(struct inode *inode, struct inode *dir, int mode),
@@ -96,7 +101,7 @@ TRACE_EVENT(ext4_allocate_inode, __entry->dev_major, __entry->dev_minor, (unsigned long) __entry->ino, (unsigned long) __entry->dir, __entry->mode) -); +) TRACE_EVENT(ext4_evict_inode, TP_PROTO(struct inode *inode),
@@ -120,7 +125,7 @@ TRACE_EVENT(ext4_evict_inode, TP_printk("dev %d,%d ino %lu nlink %d", __entry->dev_major, __entry->dev_minor, (unsigned long) __entry->ino, __entry->nlink) -); +) TRACE_EVENT(ext4_drop_inode, TP_PROTO(struct inode *inode, int drop),
@@ -144,7 +149,7 @@ TRACE_EVENT(ext4_drop_inode, TP_printk("dev %d,%d ino %lu drop %d", __entry->dev_major, __entry->dev_minor, (unsigned long) __entry->ino, __entry->drop) -); +) TRACE_EVENT(ext4_mark_inode_dirty, TP_PROTO(struct inode *inode, unsigned long IP),
@@ -168,7 +173,7 @@ TRACE_EVENT(ext4_mark_inode_dirty, TP_printk("dev %d,%d ino %lu caller %pF", __entry->dev_major, __entry->dev_minor, (unsigned long) __entry->ino, (void *)__entry->ip) -); +) TRACE_EVENT(ext4_begin_ordered_truncate, TP_PROTO(struct inode *inode, loff_t new_size),
@@ -193,7 +198,7 @@ TRACE_EVENT(ext4_begin_ordered_truncate, __entry->dev_major, __entry->dev_minor, (unsigned long) __entry->ino, (long long) __entry->new_size) -); +) DECLARE_EVENT_CLASS(ext4__write_begin,
@@ -224,7 +229,7 @@ DECLARE_EVENT_CLASS(ext4__write_begin, __entry->dev_major, __entry->dev_minor, (unsigned long) __entry->ino, __entry->pos, __entry->len, __entry->flags) -); +) DEFINE_EVENT(ext4__write_begin, ext4_write_begin,
@@ -232,7 +237,7 @@ DEFINE_EVENT(ext4__write_begin, ext4_wri unsigned int flags), TP_ARGS(inode, pos, len, flags) -); +) DEFINE_EVENT(ext4__write_begin, ext4_da_write_begin,
@@ -240,7 +245,7 @@ DEFINE_EVENT(ext4__write_begin, ext4_da_ unsigned int flags), TP_ARGS(inode, pos, len, flags) -); +) DECLARE_EVENT_CLASS(ext4__write_end, TP_PROTO(struct inode *inode, loff_t pos, unsigned int len,
@@ -270,7 +275,7 @@ DECLARE_EVENT_CLASS(ext4__write_end, __entry->dev_major, __entry->dev_minor, (unsigned long) __entry->ino, __entry->pos, __entry->len, __entry->copied) -); +) DEFINE_EVENT(ext4__write_end, ext4_ordered_write_end,
@@ -278,7 +283,7 @@ DEFINE_EVENT(ext4__write_end, ext4_order unsigned int copied), TP_ARGS(inode, pos, len, copied) -); +) DEFINE_EVENT(ext4__write_end, ext4_writeback_write_end,
@@ -286,7 +291,7 @@ DEFINE_EVENT(ext4__write_end, ext4_write unsigned int copied), TP_ARGS(inode, pos, len, copied) -); +) DEFINE_EVENT(ext4__write_end, ext4_journalled_write_end,
@@ -294,7 +299,7 @@ DEFINE_EVENT(ext4__write_end, ext4_journ unsigned int copied), TP_ARGS(inode, pos, len, copied) -); +) DEFINE_EVENT(ext4__write_end, ext4_da_write_end,
@@ -302,7 +307,7 @@ DEFINE_EVENT(ext4__write_end, ext4_da_wr unsigned int copied), TP_ARGS(inode, pos, len, copied) -); +) TRACE_EVENT(ext4_writepage, TP_PROTO(struct inode *inode, struct page *page),
@@ -327,7 +332,7 @@ TRACE_EVENT(ext4_writepage, TP_printk("dev %d,%d ino %lu page_index %lu", __entry->dev_major, __entry->dev_minor, (unsigned long) __entry->ino, __entry->index) -); +) TRACE_EVENT(ext4_da_writepages, TP_PROTO(struct inode *inode, struct writeback_control *wbc),
@@ -373,7 +378,7 @@ TRACE_EVENT(ext4_da_writepages, __entry->for_kupdate, __entry->for_reclaim, __entry->range_cyclic, (unsigned long) __entry->writeback_index) -); +) TRACE_EVENT(ext4_da_write_pages, TP_PROTO(struct inode *inode, struct mpage_da_data *mpd),
@@ -410,7 +415,7 @@ TRACE_EVENT(ext4_da_write_pages, __entry->b_blocknr, __entry->b_size, __entry->b_state, __entry->first_page, __entry->io_done, __entry->pages_written) -); +) TRACE_EVENT(ext4_da_writepages_result, TP_PROTO(struct inode *inode, struct writeback_control *wbc,
@@ -446,7 +451,7 @@ TRACE_EVENT(ext4_da_writepages_result, __entry->pages_written, __entry->pages_skipped, __entry->more_io, (unsigned long) __entry->writeback_index) -); +) TRACE_EVENT(ext4_discard_blocks, TP_PROTO(struct super_block *sb, unsigned long long blk,
@@ -472,7 +477,7 @@ TRACE_EVENT(ext4_discard_blocks, TP_printk("dev %d,%d blk %llu count %llu", __entry->dev_major, __entry->dev_minor, __entry->blk, __entry->count) -); +) DECLARE_EVENT_CLASS(ext4__mb_new_pa, TP_PROTO(struct ext4_allocation_context *ac,
@@ -503,7 +508,7 @@ DECLARE_EVENT_CLASS(ext4__mb_new_pa, __entry->dev_major, __entry->dev_minor, (unsigned long) __entry->ino, __entry->pa_pstart, __entry->pa_len, __entry->pa_lstart) -); +) DEFINE_EVENT(ext4__mb_new_pa, ext4_mb_new_inode_pa,
@@ -511,7 +516,7 @@ DEFINE_EVENT(ext4__mb_new_pa, ext4_mb_ne struct ext4_prealloc_space *pa), TP_ARGS(ac, pa) -); +) DEFINE_EVENT(ext4__mb_new_pa, ext4_mb_new_group_pa,
@@ -519,7 +524,7 @@ DEFINE_EVENT(ext4__mb_new_pa, ext4_mb_ne struct ext4_prealloc_space *pa), TP_ARGS(ac, pa) -); +) TRACE_EVENT(ext4_mb_release_inode_pa, TP_PROTO(struct super_block *sb,
@@ -549,7 +554,7 @@ TRACE_EVENT(ext4_mb_release_inode_pa, TP_printk("dev %d,%d ino %lu block %llu count %u", __entry->dev_major, __entry->dev_minor, (unsigned long) __entry->ino, __entry->block, __entry->count) -); +) TRACE_EVENT(ext4_mb_release_group_pa, TP_PROTO(struct super_block *sb,
@@ -575,7 +580,7 @@ TRACE_EVENT(ext4_mb_release_group_pa, TP_printk("dev %d,%d pstart %llu len %u", __entry->dev_major, __entry->dev_minor, __entry->pa_pstart, __entry->pa_len) -); +) TRACE_EVENT(ext4_discard_preallocations, TP_PROTO(struct inode *inode),
@@ -598,7 +603,7 @@ TRACE_EVENT(ext4_discard_preallocations, TP_printk("dev %d,%d ino %lu", __entry->dev_major, __entry->dev_minor, (unsigned long) __entry->ino) -); +) TRACE_EVENT(ext4_mb_discard_preallocations, TP_PROTO(struct super_block *sb, int needed),
@@ -620,7 +625,7 @@ TRACE_EVENT(ext4_mb_discard_preallocatio TP_printk("dev %d,%d needed %d", __entry->dev_major, __entry->dev_minor, __entry->needed) -); +) TRACE_EVENT(ext4_request_blocks, TP_PROTO(struct ext4_allocation_request *ar),
@@ -665,7 +670,7 @@ TRACE_EVENT(ext4_request_blocks, (unsigned long long) __entry->lright, (unsigned long long) __entry->pleft, (unsigned long long) __entry->pright) -); +) TRACE_EVENT(ext4_allocate_blocks, TP_PROTO(struct ext4_allocation_request *ar, unsigned long long block),
@@ -712,7 +717,7 @@ TRACE_EVENT(ext4_allocate_blocks, (unsigned long long) __entry->lright, (unsigned long long) __entry->pleft, (unsigned long long) __entry->pright) -); +) TRACE_EVENT(ext4_free_blocks, TP_PROTO(struct inode *inode, __u64 block, unsigned long count,
@@ -745,7 +750,7 @@ TRACE_EVENT(ext4_free_blocks, (unsigned long) __entry->ino, __entry->mode, __entry->block, __entry->count, __entry->flags) -); +) TRACE_EVENT(ext4_sync_file, TP_PROTO(struct file *file, int datasync),
@@ -774,7 +779,7 @@ TRACE_EVENT(ext4_sync_file, __entry->dev_major, __entry->dev_minor, (unsigned long) __entry->ino, (unsigned long) __entry->parent, __entry->datasync) -); +) TRACE_EVENT(ext4_sync_fs, TP_PROTO(struct super_block *sb, int wait),
@@ -796,7 +801,7 @@ TRACE_EVENT(ext4_sync_fs, TP_printk("dev %d,%d wait %d", __entry->dev_major, __entry->dev_minor, __entry->wait) -); +) TRACE_EVENT(ext4_alloc_da_blocks, TP_PROTO(struct inode *inode),
@@ -823,7 +828,7 @@ TRACE_EVENT(ext4_alloc_da_blocks, __entry->dev_major, __entry->dev_minor, (unsigned long) __entry->ino, __entry->data_blocks, __entry->meta_blocks) -); +) TRACE_EVENT(ext4_mballoc_alloc, TP_PROTO(struct ext4_allocation_context *ac),
@@ -892,7 +897,7 @@ TRACE_EVENT(ext4_mballoc_alloc, __entry->found, __entry->groups, __entry->cr, __entry->flags, __entry->tail, __entry->buddy ? 1 << __entry->buddy : 0) -); +) TRACE_EVENT(ext4_mballoc_prealloc, TP_PROTO(struct ext4_allocation_context *ac),
@@ -934,7 +939,7 @@ TRACE_EVENT(ext4_mballoc_prealloc, __entry->orig_len, __entry->orig_logical, __entry->result_group, __entry->result_start, __entry->result_len, __entry->result_logical) -); +) DECLARE_EVENT_CLASS(ext4__mballoc, TP_PROTO(struct super_block *sb,
@@ -968,7 +973,7 @@ DECLARE_EVENT_CLASS(ext4__mballoc, (unsigned long) __entry->ino, __entry->result_group, __entry->result_start, __entry->result_len) -); +) DEFINE_EVENT(ext4__mballoc, ext4_mballoc_discard,
@@ -979,7 +984,7 @@ DEFINE_EVENT(ext4__mballoc, ext4_mballoc ext4_grpblk_t len), TP_ARGS(sb, inode, group, start, len) -); +) DEFINE_EVENT(ext4__mballoc, ext4_mballoc_free,
@@ -990,7 +995,7 @@ DEFINE_EVENT(ext4__mballoc, ext4_mballoc ext4_grpblk_t len), TP_ARGS(sb, inode, group, start, len) -); +) TRACE_EVENT(ext4_forget, TP_PROTO(struct inode *inode, int is_metadata, __u64 block),
@@ -1019,7 +1024,7 @@ TRACE_EVENT(ext4_forget, __entry->dev_major, __entry->dev_minor, (unsigned long) __entry->ino, __entry->mode, __entry->is_metadata, __entry->block) -); +) TRACE_EVENT(ext4_da_update_reserve_space, TP_PROTO(struct inode *inode, int used_blocks),
@@ -1056,7 +1061,7 @@ TRACE_EVENT(ext4_da_update_reserve_space (unsigned long long) __entry->i_blocks, __entry->used_blocks, __entry->reserved_data_blocks, __entry->reserved_meta_blocks, __entry->allocated_meta_blocks) -); +) TRACE_EVENT(ext4_da_reserve_space, TP_PROTO(struct inode *inode, int md_needed),
@@ -1091,7 +1096,7 @@ TRACE_EVENT(ext4_da_reserve_space, __entry->mode, (unsigned long long) __entry->i_blocks, __entry->md_needed, __entry->reserved_data_blocks, __entry->reserved_meta_blocks) -); +) TRACE_EVENT(ext4_da_release_space, TP_PROTO(struct inode *inode, int freed_blocks),
@@ -1128,7 +1133,7 @@ TRACE_EVENT(ext4_da_release_space, __entry->mode, (unsigned long long) __entry->i_blocks, __entry->freed_blocks, __entry->reserved_data_blocks, __entry->reserved_meta_blocks, __entry->allocated_meta_blocks) -); +) DECLARE_EVENT_CLASS(ext4__bitmap_load, TP_PROTO(struct super_block *sb, unsigned long group),
@@ -1150,21 +1155,21 @@ DECLARE_EVENT_CLASS(ext4__bitmap_load, TP_printk("dev %d,%d group %u", __entry->dev_major, __entry->dev_minor, __entry->group) -); +) DEFINE_EVENT(ext4__bitmap_load, ext4_mb_bitmap_load, TP_PROTO(struct super_block *sb, unsigned long group), TP_ARGS(sb, group) -); +) DEFINE_EVENT(ext4__bitmap_load, ext4_mb_buddy_bitmap_load, TP_PROTO(struct super_block *sb, unsigned long group), TP_ARGS(sb, group) -); +)#endif /* _TRACE_EXT4_H */
Mathieu Desnoyers
reviewerRFC PATCH 6/28 trace event irq remove semicolons
In reply to Mathieu DesnoyersPart of the gradual TRACE_EVENT() semicolon removal. Enables creation of array of events, thus saving space for trace event probes.
Signed-off-by Mathieu Desnoyers <[email protected]>
CC Steven Rostedt <[email protected]>
CC Frederic Weisbecker <[email protected]>
CC Ingo Molnar <[email protected]>
CC Thomas Gleixner <[email protected]>
--- include/trace/events/irq.h | 17 +++++++++++------ 1 file changed, 11 insertions(+), 6 deletions(-)
include/trace/events/irq.h +11 -6
@@ -6,6 +6,9 @@#include <linux/tracepoint.h> +#ifndef _TRACE_IRQ_DEF_ +#define _TRACE_IRQ_DEF_ +struct irqaction ;struct softirq_action ;
@@ -23,6 +26,8 @@ struct softirq_action; softirq_name(HRTIMER), \ softirq_name(RCU)) +#endif /* _TRACE_IRQ_DEF_ */ +/** * irq_handler_entry - called immediately before the irq action handler * @irq: irq number
@@ -51,7 +56,7 @@ TRACE_EVENT(irq_handler_entry, ),TP_printk ("irq=%d name=%s" , __entry->irq,__get_str (name)) -); +)/** * irq_handler_exit - called immediately after the irq action handler returns
@@ -82,7 +87,7 @@ TRACE_EVENT(irq_handler_exit, TP_printk("irq=%d ret=%s", __entry->irq, __entry->ret ? "handled" : "unhandled") -); +) DECLARE_EVENT_CLASS(softirq,
@@ -100,7 +105,7 @@ DECLARE_EVENT_CLASS(softirq,TP_printk ("vec=%u [action=%s]" , __entry->vec,show_softirq_name (__entry->vec)) -); +)/** * softirq_entry - called immediately before the softirq handler
@@ -114,7 +119,7 @@ DEFINE_EVENT(softirq, softirq_entry, TP_PROTO(unsigned int vec_nr), TP_ARGS(vec_nr) -); +)/** * softirq_exit - called immediately after the softirq handler returns
@@ -128,7 +133,7 @@ DEFINE_EVENT(softirq, softirq_exit, TP_PROTO(unsigned int vec_nr), TP_ARGS(vec_nr) -); +)/** * softirq_raise - called immediately when a softirq is raised
@@ -142,7 +147,7 @@ DEFINE_EVENT(softirq, softirq_raise, TP_PROTO(unsigned int vec_nr), TP_ARGS(vec_nr) -); +)#endif /* _TRACE_IRQ_H */
Mathieu Desnoyers
reviewerRFC PATCH 7/28 trace event jbd2 remove semicolons
In reply to Mathieu DesnoyersPart of the gradual TRACE_EVENT() semicolon removal. Enables creation of array of events, thus saving space for trace event probes.
Signed-off-by Mathieu Desnoyers <[email protected]>
CC Steven Rostedt <[email protected]>
CC Frederic Weisbecker <[email protected]>
CC Ingo Molnar <[email protected]>
CC Thomas Gleixner <[email protected]>
CC Li Zefan <[email protected]>
CC Theodore Ts'o <[email protected]>
--- include/trace/events/jbd2.h | 27 ++++++++++++++++----------- 1 file changed, 16 insertions(+), 11 deletions(-)
include/trace/events/jbd2.h +16 -11
@@ -7,9 +7,14 @@#include <linux/jbd2.h> #include <linux/tracepoint.h> +#ifndef _TRACE_JBD2_DEF_ +#define _TRACE_JBD2_DEF_ +struct transaction_chp_stats_s ;struct transaction_run_stats_s ; +#endif /* _TRACE_JBD2_DEF_ */ + TRACE_EVENT(jbd2_checkpoint, TP_PROTO(journal_t *journal, int result),
@@ -30,7 +35,7 @@ TRACE_EVENT(jbd2_checkpoint, TP_printk("dev %d,%d result %d", __entry->dev_major, __entry->dev_minor, __entry->result) -); +) DECLARE_EVENT_CLASS(jbd2_commit,
@@ -55,35 +60,35 @@ DECLARE_EVENT_CLASS(jbd2_commit, TP_printk("dev %d,%d transaction %d sync %d", __entry->dev_major, __entry->dev_minor, __entry->transaction, __entry->sync_commit) -); +) DEFINE_EVENT(jbd2_commit, jbd2_start_commit, TP_PROTO(journal_t *journal, transaction_t *commit_transaction), TP_ARGS(journal, commit_transaction) -); +) DEFINE_EVENT(jbd2_commit, jbd2_commit_locking, TP_PROTO(journal_t *journal, transaction_t *commit_transaction), TP_ARGS(journal, commit_transaction) -); +) DEFINE_EVENT(jbd2_commit, jbd2_commit_flushing, TP_PROTO(journal_t *journal, transaction_t *commit_transaction), TP_ARGS(journal, commit_transaction) -); +) DEFINE_EVENT(jbd2_commit, jbd2_commit_logging, TP_PROTO(journal_t *journal, transaction_t *commit_transaction), TP_ARGS(journal, commit_transaction) -); +) TRACE_EVENT(jbd2_end_commit, TP_PROTO(journal_t *journal, transaction_t *commit_transaction),
@@ -109,7 +114,7 @@ TRACE_EVENT(jbd2_end_commit, TP_printk("dev %d,%d transaction %d sync %d head %d", __entry->dev_major, __entry->dev_minor, __entry->transaction, __entry->sync_commit, __entry->head) -); +) TRACE_EVENT(jbd2_submit_inode_data, TP_PROTO(struct inode *inode),
@@ -131,7 +136,7 @@ TRACE_EVENT(jbd2_submit_inode_data, TP_printk("dev %d,%d ino %lu", __entry->dev_major, __entry->dev_minor, (unsigned long) __entry->ino) -); +) TRACE_EVENT(jbd2_run_stats, TP_PROTO(dev_t dev, unsigned long tid,
@@ -177,7 +182,7 @@ TRACE_EVENT(jbd2_run_stats, jiffies_to_msecs(__entry->logging), __entry->handle_count, __entry->blocks, __entry->blocks_logged) -); +) TRACE_EVENT(jbd2_checkpoint_stats, TP_PROTO(dev_t dev, unsigned long tid,
@@ -210,7 +215,7 @@ TRACE_EVENT(jbd2_checkpoint_stats, __entry->dev_major, __entry->dev_minor, __entry->tid, jiffies_to_msecs(__entry->chp_time), __entry->forced_to_close, __entry->written, __entry->dropped) -); +) TRACE_EVENT(jbd2_cleanup_journal_tail,
@@ -241,7 +246,7 @@ TRACE_EVENT(jbd2_cleanup_journal_tail, __entry->dev_major, __entry->dev_minor, __entry->tail_sequence, __entry->first_tid, __entry->block_nr, __entry->freed) -); +)#endif /* _TRACE_JBD2_H */
Mathieu Desnoyers
reviewerRFC PATCH 8/28 trace event kmem remove semicolons
In reply to Mathieu DesnoyersPart of the gradual TRACE_EVENT() semicolon removal. Enables creation of array of events, thus saving space for trace event probes.
Signed-off-by Mathieu Desnoyers <[email protected]>
CC Steven Rostedt <[email protected]>
CC Frederic Weisbecker <[email protected]>
CC Ingo Molnar <[email protected]>
CC Thomas Gleixner <[email protected]>
CC Li Zefan <[email protected]>
CC Mel Gorman <[email protected]>
CC Rik van Riel <[email protected]>
CC Larry Woodman <[email protected]>
CC KOSAKI Motohiro <[email protected]>
--- include/trace/events/kmem.h | 32 ++++++++++++++++---------------- 1 file changed, 16 insertions(+), 16 deletions(-)
include/trace/events/kmem.h +16 -16
@@ -40,7 +40,7 @@ DECLARE_EVENT_CLASS(kmem_alloc, __entry->bytes_req, __entry->bytes_alloc, show_gfp_flags(__entry->gfp_flags)) -); +) DEFINE_EVENT(kmem_alloc, kmalloc,
@@ -48,7 +48,7 @@ DEFINE_EVENT(kmem_alloc, kmalloc, size_t bytes_req, size_t bytes_alloc, gfp_t gfp_flags), TP_ARGS(call_site, ptr, bytes_req, bytes_alloc, gfp_flags) -); +) DEFINE_EVENT(kmem_alloc, kmem_cache_alloc,
@@ -56,7 +56,7 @@ DEFINE_EVENT(kmem_alloc, kmem_cache_allo size_t bytes_req, size_t bytes_alloc, gfp_t gfp_flags), TP_ARGS(call_site, ptr, bytes_req, bytes_alloc, gfp_flags) -); +) DECLARE_EVENT_CLASS(kmem_alloc_node,
@@ -94,7 +94,7 @@ DECLARE_EVENT_CLASS(kmem_alloc_node, __entry->bytes_alloc, show_gfp_flags(__entry->gfp_flags), __entry->node) -); +) DEFINE_EVENT(kmem_alloc_node, kmalloc_node,
@@ -103,7 +103,7 @@ DEFINE_EVENT(kmem_alloc_node, kmalloc_no gfp_t gfp_flags, int node), TP_ARGS(call_site, ptr, bytes_req, bytes_alloc, gfp_flags, node) -); +) DEFINE_EVENT(kmem_alloc_node, kmem_cache_alloc_node,
@@ -112,7 +112,7 @@ DEFINE_EVENT(kmem_alloc_node, kmem_cache gfp_t gfp_flags, int node), TP_ARGS(call_site, ptr, bytes_req, bytes_alloc, gfp_flags, node) -); +) DECLARE_EVENT_CLASS(kmem_free,
@@ -131,21 +131,21 @@ DECLARE_EVENT_CLASS(kmem_free, ), TP_printk("call_site=%lx ptr=%p", __entry->call_site, __entry->ptr) -); +) DEFINE_EVENT(kmem_free, kfree, TP_PROTO(unsigned long call_site, const void *ptr), TP_ARGS(call_site, ptr) -); +) DEFINE_EVENT(kmem_free, kmem_cache_free, TP_PROTO(unsigned long call_site, const void *ptr), TP_ARGS(call_site, ptr) -); +) TRACE_EVENT(mm_page_free_direct,
@@ -167,7 +167,7 @@ TRACE_EVENT(mm_page_free_direct, __entry->page, page_to_pfn(__entry->page), __entry->order) -); +) TRACE_EVENT(mm_pagevec_free,
@@ -189,7 +189,7 @@ TRACE_EVENT(mm_pagevec_free, __entry->page, page_to_pfn(__entry->page), __entry->cold) -); +) TRACE_EVENT(mm_page_alloc,
@@ -218,7 +218,7 @@ TRACE_EVENT(mm_page_alloc, __entry->order, __entry->migratetype, show_gfp_flags(__entry->gfp_flags)) -); +) DECLARE_EVENT_CLASS(mm_page,
@@ -244,14 +244,14 @@ DECLARE_EVENT_CLASS(mm_page, __entry->order, __entry->migratetype, __entry->order == 0) -); +) DEFINE_EVENT(mm_page, mm_page_alloc_zone_locked, TP_PROTO(struct page *page, unsigned int order, int migratetype), TP_ARGS(page, order, migratetype) -); +) DEFINE_EVENT_PRINT(mm_page, mm_page_pcpu_drain,
@@ -262,7 +262,7 @@ DEFINE_EVENT_PRINT(mm_page, mm_page_pcpu TP_printk("page=%p pfn=%lu order=%d migratetype=%d", __entry->page, page_to_pfn(__entry->page), __entry->order, __entry->migratetype) -); +) TRACE_EVENT(mm_page_alloc_extfrag,
@@ -300,7 +300,7 @@ TRACE_EVENT(mm_page_alloc_extfrag, __entry->fallback_migratetype, __entry->fallback_order < pageblock_order, __entry->alloc_migratetype == __entry->fallback_migratetype) -); +)#endif /* _TRACE_KMEM_H */
Mathieu Desnoyers
reviewerRFC PATCH 9/28 trace event kvm remove semicolons
In reply to Mathieu DesnoyersPart of the gradual TRACE_EVENT() semicolon removal. Enables creation of array of events, thus saving space for trace event probes.
Signed-off-by Mathieu Desnoyers <[email protected]>
CC Steven Rostedt <[email protected]>
CC Frederic Weisbecker <[email protected]>
CC Ingo Molnar <[email protected]>
CC Thomas Gleixner <[email protected]>
CC Gleb Natapov <[email protected]>
CC Avi Kivity <[email protected]>
CC Marcelo Tosatti <[email protected]>
CC Alexander Graf <[email protected]>
CC Joerg Roedel <[email protected]>
CC Vadim Rozenfeld <[email protected]>
--- arch/powerpc/kvm/trace.h | 28 ++++++++++++++-------------- arch/x86/kvm/mmutrace.h | 24 ++++++++++++------------ arch/x86/kvm/trace.h | 44 ++++++++++++++++++++++---------------------- include/trace/events/kvm.h | 14 +++++++------- 4 files changed, 55 insertions(+), 55 deletions(-)
include/trace/events/kvm.h +7 -7
@@ -25,7 +25,7 @@ TRACE_EVENT(kvm_set_irq, TP_printk("gsi %u level %d source %d", __entry->gsi, __entry->level, __entry->irq_source_id) -); +)#define kvm_deliver_mode \ {0x0, "Fixed"}, \
@@ -60,7 +60,7 @@ TRACE_EVENT(kvm_ioapic_set_irq, (__entry->e & (1<<15)) ? "level" : "edge", (__entry->e & (1<<16)) ? "|masked" : "", __entry->coalesced ? " (coalesced)" : "") -); +) TRACE_EVENT(kvm_msi_set_irq, TP_PROTO(__u64 address, __u64 data),
@@ -82,7 +82,7 @@ TRACE_EVENT(kvm_msi_set_irq, (__entry->address & (1<<2)) ? "logical" : "physical", (__entry->data & (1<<15)) ? "level" : "edge", (__entry->address & (1<<3)) ? "|rh" : "") -); +)#define kvm_irqchips \ {KVM_IRQCHIP_PIC_MASTER, "PIC master"}, \
@@ -106,7 +106,7 @@ TRACE_EVENT(kvm_ack_irq,TP_printk ("irqchip %s pin %u" ,__print_symbolic (__entry->irqchip, kvm_irqchips), __entry->pin) -); +)
@@ -142,7 +142,7 @@ TRACE_EVENT(kvm_mmio, TP_printk("mmio %s len %u gpa 0x%llx val 0x%llx", __print_symbolic(__entry->type, kvm_trace_symbol_mmio), __entry->len, __entry->gpa, __entry->val) -); +)#define kvm_fpu_load_symbol \ {0, "unload"}, \
@@ -161,7 +161,7 @@ TRACE_EVENT(kvm_fpu, ), TP_printk("%s", __print_symbolic(__entry->load, kvm_fpu_load_symbol)) -); +) TRACE_EVENT(kvm_age_page, TP_PROTO(ulong hva, struct kvm_memory_slot *slot, int ref),
@@ -183,7 +183,7 @@ TRACE_EVENT(kvm_age_page, TP_printk("hva %llx gfn %llx %s", __entry->hva, __entry->gfn, __entry->referenced ? "YOUNG" : "OLD") -); +)#endif /* _TRACE_KVM_MAIN_H */
arch/powerpc/kvm/trace.h +14 -14
@@ -29,7 +29,7 @@ TRACE_EVENT(kvm_ppc_instr, TP_printk("inst %u pc 0x%lx emulate %u\n", __entry->inst, __entry->pc, __entry->emulate) -); +) TRACE_EVENT(kvm_stlb_inval, TP_PROTO(unsigned int stlb_index),
@@ -44,7 +44,7 @@ TRACE_EVENT(kvm_stlb_inval, ), TP_printk("stlb_index %u", __entry->stlb_index) -); +) TRACE_EVENT(kvm_stlb_write, TP_PROTO(unsigned int victim, unsigned int tid, unsigned int word0,
@@ -70,7 +70,7 @@ TRACE_EVENT(kvm_stlb_write, TP_printk("victim %u tid %u w0 %u w1 %u w2 %u", __entry->victim, __entry->tid, __entry->word0, __entry->word1, __entry->word2) -); +) TRACE_EVENT(kvm_gtlb_write, TP_PROTO(unsigned int gtlb_index, unsigned int tid, unsigned int word0,
@@ -96,7 +96,7 @@ TRACE_EVENT(kvm_gtlb_write,TP_printk ("gtlb_index %u tid %u w0 %u w1 %u w2 %u" , __entry->gtlb_index, __entry->tid, __entry->word0, __entry->word1, __entry->word2) -); +)/*************************************************************************
@@ -128,7 +128,7 @@ TRACE_EVENT(kvm_book3s_exit, TP_printk("exit=0x%x | pc=0x%lx | msr=0x%lx | dar=0x%lx | srr1=0x%lx", __entry->exit_nr, __entry->pc, __entry->msr, __entry->dar, __entry->srr1) -); +) TRACE_EVENT(kvm_book3s_reenter, TP_PROTO(int r, struct kvm_vcpu *vcpu),
@@ -145,7 +145,7 @@ TRACE_EVENT(kvm_book3s_reenter, ), TP_printk("reentry r=%d | pc=0x%lx", __entry->r, __entry->pc) -); +)#ifdef CONFIG_PPC_BOOK3S_64
@@ -177,7 +177,7 @@ TRACE_EVENT(kvm_book3s_64_mmu_map, TP_printk("KVM: %c%c Map 0x%lx: [%lx] 0x%lx (0x%llx) -> %lx", __entry->flag_w, __entry->flag_x, __entry->eaddr, __entry->hpteg, __entry->va, __entry->vpage, __entry->hpaddr) -); +)#endif /* CONFIG_PPC_BOOK3S_64 */
@@ -208,7 +208,7 @@ TRACE_EVENT(kvm_book3s_mmu_map, TP_printk("Map: hva=%llx pfn=%llx ea=%lx vp=%llx ra=%lx [%x]", __entry->host_va, __entry->pfn, __entry->eaddr, __entry->vpage, __entry->raddr, __entry->flags) -); +) TRACE_EVENT(kvm_book3s_mmu_invalidate, TP_PROTO(struct hpte_cache *pte),
@@ -237,7 +237,7 @@ TRACE_EVENT(kvm_book3s_mmu_invalidate, TP_printk("Flush: hva=%llx pfn=%llx ea=%lx vp=%llx ra=%lx [%x]", __entry->host_va, __entry->pfn, __entry->eaddr, __entry->vpage, __entry->raddr, __entry->flags) -); +) TRACE_EVENT(kvm_book3s_mmu_flush, TP_PROTO(const char *type, struct kvm_vcpu *vcpu, unsigned long long p1,
@@ -260,7 +260,7 @@ TRACE_EVENT(kvm_book3s_mmu_flush, TP_printk("Flush %d %sPTEs: %llx - %llx", __entry->count, __entry->type, __entry->p1, __entry->p2) -); +) TRACE_EVENT(kvm_book3s_slb_found, TP_PROTO(unsigned long long gvsid, unsigned long long hvsid),
@@ -277,7 +277,7 @@ TRACE_EVENT(kvm_book3s_slb_found, ), TP_printk("%llx -> %llx", __entry->gvsid, __entry->hvsid) -); +) TRACE_EVENT(kvm_book3s_slb_fail, TP_PROTO(u16 sid_map_mask, unsigned long long gvsid),
@@ -295,7 +295,7 @@ TRACE_EVENT(kvm_book3s_slb_fail, TP_printk("%x/%x: %llx", __entry->sid_map_mask, SID_MAP_MASK - __entry->sid_map_mask, __entry->gvsid) -); +) TRACE_EVENT(kvm_book3s_slb_map, TP_PROTO(u16 sid_map_mask, unsigned long long gvsid,
@@ -316,7 +316,7 @@ TRACE_EVENT(kvm_book3s_slb_map, TP_printk("%x: %llx -> %llx", __entry->sid_map_mask, __entry->guest_vsid, __entry->host_vsid) -); +) TRACE_EVENT(kvm_book3s_slbmte, TP_PROTO(u64 slb_vsid, u64 slb_esid),
@@ -333,7 +333,7 @@ TRACE_EVENT(kvm_book3s_slbmte, ), TP_printk("%llx, %llx", __entry->slb_vsid, __entry->slb_esid) -); +)#endif /* CONFIG_PPC_BOOK3S */
arch/x86/kvm/trace.h +22 -22
176 lines not on this page · raw message
arch/x86/kvm/mmutrace.h +12 -12
@@ -70,7 +70,7 @@ TRACE_EVENT(TP_printk ("addr %llx pferr %x %s" , __entry->addr, __entry->pferr,__print_flags (__entry->pferr,"|" , kvm_mmu_trace_pferr_flags)) -); +)/* We just walked a paging element */
@@ -90,7 +90,7 @@ TRACE_EVENT( ), TP_printk("pte %llx level %u", __entry->pte, __entry->level) -); +) DECLARE_EVENT_CLASS(kvm_mmu_set_bit_class,
@@ -108,7 +108,7 @@ DECLARE_EVENT_CLASS(kvm_mmu_set_bit_clas ), TP_printk("gpa %llx", __entry->gpa) -); +)/* We set a pte accessed bit */ DEFINE_EVENT(kvm_mmu_set_bit_class, kvm_mmu_set_accessed_bit,
@@ -116,7 +116,7 @@ DEFINE_EVENT(kvm_mmu_set_bit_class, kvm_ TP_PROTO(unsigned long table_gfn, unsigned index, unsigned size), TP_ARGS(table_gfn, index, size) -); +) /* We set a pte dirty bit */ DEFINE_EVENT(kvm_mmu_set_bit_class, kvm_mmu_set_dirty_bit,
@@ -124,7 +124,7 @@ DEFINE_EVENT(kvm_mmu_set_bit_class, kvm_ TP_PROTO(unsigned long table_gfn, unsigned index, unsigned size), TP_ARGS(table_gfn, index, size) -); +) TRACE_EVENT( kvm_mmu_walker_error,
@@ -141,7 +141,7 @@ TRACE_EVENT( TP_printk("pferr %x %s", __entry->pferr, __print_flags(__entry->pferr, "|", kvm_mmu_trace_pferr_flags)) -); +) TRACE_EVENT( kvm_mmu_get_page,
@@ -160,7 +160,7 @@ TRACE_EVENT( TP_printk("%s %s", KVM_MMU_PAGE_PRINTK(), __entry->created ? "new" : "existing") -); +) DECLARE_EVENT_CLASS(kvm_mmu_page_class,
@@ -176,25 +176,25 @@ DECLARE_EVENT_CLASS(kvm_mmu_page_class, ), TP_printk("%s", KVM_MMU_PAGE_PRINTK()) -); +) DEFINE_EVENT(kvm_mmu_page_class, kvm_mmu_sync_page, TP_PROTO(struct kvm_mmu_page *sp), TP_ARGS(sp) -); +) DEFINE_EVENT(kvm_mmu_page_class, kvm_mmu_unsync_page, TP_PROTO(struct kvm_mmu_page *sp), TP_ARGS(sp) -); +) DEFINE_EVENT(kvm_mmu_page_class, kvm_mmu_prepare_zap_page, TP_PROTO(struct kvm_mmu_page *sp), TP_ARGS(sp) -); +) TRACE_EVENT( kvm_mmu_audit,
@@ -213,7 +213,7 @@ TRACE_EVENT( TP_printk("vcpu:%d %s", __entry->vcpu->cpu, audit_point_name[__entry->audit_point]) -); +)#endif /* _TRACE_KVMMMU_H */ #undef TRACE_INCLUDE_PATH
Mathieu Desnoyers
reviewerRFC PATCH 10/28 trace event lock remove semicolons
In reply to Mathieu DesnoyersPart of the gradual TRACE_EVENT() semicolon removal. Enables creation of array of events, thus saving space for trace event probes.
Signed-off-by Mathieu Desnoyers <[email protected]>
CC Steven Rostedt <[email protected]>
CC Frederic Weisbecker <[email protected]>
CC Ingo Molnar <[email protected]>
CC Thomas Gleixner <[email protected]>
CC Peter Zijlstra <[email protected]>
--- include/trace/events/lock.h | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-)
include/trace/events/lock.h +5 -5
@@ -33,7 +33,7 @@ TRACE_EVENT(lock_acquire, (__entry->flags & 1) ? "try " : "", (__entry->flags & 2) ? "read " : "", __get_str(name)) -); +) DECLARE_EVENT_CLASS(lock,
@@ -52,14 +52,14 @@ DECLARE_EVENT_CLASS(lock, ), TP_printk("%p %s", __entry->lockdep_addr, __get_str(name)) -); +) DEFINE_EVENT(lock, lock_release, TP_PROTO(struct lockdep_map *lock, unsigned long ip), TP_ARGS(lock, ip) -); +) #ifdef CONFIG_LOCK_STAT
@@ -68,14 +68,14 @@ DEFINE_EVENT(lock, lock_contended, TP_PROTO(struct lockdep_map *lock, unsigned long ip), TP_ARGS(lock, ip) -); +) DEFINE_EVENT(lock, lock_acquired, TP_PROTO(struct lockdep_map *lock, unsigned long ip), TP_ARGS(lock, ip) -); +)#endif #endif
Mathieu Desnoyers
reviewerRFC PATCH 11/28 trace event mce remove semicolons
In reply to Mathieu DesnoyersPart of the gradual TRACE_EVENT() semicolon removal. Enables creation of array of events, thus saving space for trace event probes.
Signed-off-by Mathieu Desnoyers <[email protected]>
CC Steven Rostedt <[email protected]>
CC Frederic Weisbecker <[email protected]>
CC Ingo Molnar <[email protected]>
CC Thomas Gleixner <[email protected]>
CC Hidetoshi Seto <[email protected]>
--- include/trace/events/mce.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
include/trace/events/mce.h +1 -1
@@ -61,7 +61,7 @@ TRACE_EVENT(mce_record, __entry->walltime, __entry->socketid, __entry->apicid) -); +)#endif /* _TRACE_MCE_H */
Mathieu Desnoyers
reviewerRFC PATCH 12/28 trace event module remove semicolons
In reply to Mathieu DesnoyersPart of the gradual TRACE_EVENT() semicolon removal. Enables creation of array of events, thus saving space for trace event probes.
Signed-off-by Mathieu Desnoyers <[email protected]>
CC Steven Rostedt <[email protected]>
CC Frederic Weisbecker <[email protected]>
CC Ingo Molnar <[email protected]>
CC Thomas Gleixner <[email protected]>
CC Li Zefan <[email protected]>
CC Rusty Russell <[email protected]>
--- include/trace/events/module.h | 17 +++++++++++------ 1 file changed, 11 insertions(+), 6 deletions(-)
include/trace/events/module.h +11 -6
@@ -8,6 +8,9 @@#ifdef CONFIG_MODULES +#ifndef _TRACE_MODULE_DEF_ +#define _TRACE_MODULE_DEF_ +struct module ;#define show_module_flags (flags) __print_flags(flags, "", \
@@ -15,6 +18,8 @@ struct module; { (1UL << TAINT_FORCED_MODULE), "F" }, \ { (1UL << TAINT_CRAP), "C" }) +#endif /* _TRACE_MODULE_DEF_ */ + TRACE_EVENT(module_load, TP_PROTO(struct module *mod),
@@ -32,7 +37,7 @@ TRACE_EVENT(module_load, ), TP_printk("%s %s", __get_str(name), show_module_flags(__entry->taints)) -); +) TRACE_EVENT(module_free,
@@ -49,7 +54,7 @@ TRACE_EVENT(module_free, ), TP_printk("%s", __get_str(name)) -); +)#ifdef CONFIG_MODULE_UNLOAD /* trace_module_get/put are only used if CONFIG_MODULE_UNLOAD is defined */
@@ -74,21 +79,21 @@ DECLARE_EVENT_CLASS(module_refcnt, TP_printk("%s call_site=%pf refcnt=%d", __get_str(name), (void *)__entry->ip, __entry->refcnt) -); +) DEFINE_EVENT(module_refcnt, module_get, TP_PROTO(struct module *mod, unsigned long ip), TP_ARGS(mod, ip) -); +) DEFINE_EVENT(module_refcnt, module_put, TP_PROTO(struct module *mod, unsigned long ip), TP_ARGS(mod, ip) -); +)#endif /* CONFIG_MODULE_UNLOAD */ TRACE_EVENT(module_request,
@@ -111,7 +116,7 @@ TRACE_EVENT(module_request, TP_printk("%s wait=%d call_site=%pf", __get_str(name), (int)__entry->wait, (void *)__entry->ip) -); +)#endif /* CONFIG_MODULES */
Mathieu Desnoyers
reviewerRFC PATCH 13/28 trace event napi remove semicolons
In reply to Mathieu DesnoyersPart of the gradual TRACE_EVENT() semicolon removal. Enables creation of array of events, thus saving space for trace event probes.
Signed-off-by Mathieu Desnoyers <[email protected]>
CC Steven Rostedt <[email protected]>
CC Frederic Weisbecker <[email protected]>
CC Ingo Molnar <[email protected]>
CC Thomas Gleixner <[email protected]>
CC Neil Horman <[email protected]>
CC David S. Miller <[email protected]>
CC Koki Sanagi <[email protected]>
--- include/trace/events/napi.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
include/trace/events/napi.h +1 -1
@@ -28,7 +28,7 @@ TRACE_EVENT(napi_poll, TP_printk("napi poll on napi struct %p for device %s", __entry->napi, __get_str(dev_name)) -); +)#undef NO_DEV
Mathieu Desnoyers
reviewerRFC PATCH 14/28 trace event net remove semicolons
In reply to Mathieu DesnoyersPart of the gradual TRACE_EVENT() semicolon removal. Enables creation of array of events, thus saving space for trace event probes.
Signed-off-by Mathieu Desnoyers <[email protected]>
CC Steven Rostedt <[email protected]>
CC Frederic Weisbecker <[email protected]>
CC Ingo Molnar <[email protected]>
CC Thomas Gleixner <[email protected]>
CC Neil Horman <[email protected]>
CC David S. Miller <[email protected]>
CC Koki Sanagi <[email protected]>
--- include/trace/events/net.h | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-)
include/trace/events/net.h +4 -4
@@ -32,7 +32,7 @@ TRACE_EVENT(net_dev_xmit, TP_printk("dev=%s skbaddr=%p len=%u rc=%d", __get_str(name), __entry->skbaddr, __entry->len, __entry->rc) -); +) DECLARE_EVENT_CLASS(net_dev_template,
@@ -61,21 +61,21 @@ DEFINE_EVENT(net_dev_template, net_dev_q TP_PROTO(struct sk_buff *skb), TP_ARGS(skb) -); +) DEFINE_EVENT(net_dev_template, netif_receive_skb, TP_PROTO(struct sk_buff *skb), TP_ARGS(skb) -); +) DEFINE_EVENT(net_dev_template, netif_rx, TP_PROTO(struct sk_buff *skb), TP_ARGS(skb) -); +) #endif /* _TRACE_NET_H */ /* This part must be outside protection */
Mathieu Desnoyers
reviewerRFC PATCH 15/28 trace event power remove semicolons
In reply to Mathieu DesnoyersPart of the gradual TRACE_EVENT() semicolon removal. Enables creation of array of events, thus saving space for trace event probes.
Signed-off-by Mathieu Desnoyers <[email protected]>
CC Steven Rostedt <[email protected]>
CC Frederic Weisbecker <[email protected]>
CC Ingo Molnar <[email protected]>
CC Thomas Gleixner <[email protected]>
CC Jean Pihet <[email protected]>
CC Arjan van de Ven <[email protected]>
CC Thomas Renninger <[email protected]>
CC Len Brown <[email protected]>
--- include/trace/events/power.h | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-)
include/trace/events/power.h +10 -10
@@ -41,21 +41,21 @@ DECLARE_EVENT_CLASS(power, TP_printk("type=%lu state=%lu cpu_id=%lu", (unsigned long)__entry->type, (unsigned long)__entry->state, (unsigned long)__entry->cpu_id) -); +) DEFINE_EVENT(power, power_start, TP_PROTO(unsigned int type, unsigned int state, unsigned int cpu_id), TP_ARGS(type, state, cpu_id) -); +) DEFINE_EVENT(power, power_frequency, TP_PROTO(unsigned int type, unsigned int state, unsigned int cpu_id), TP_ARGS(type, state, cpu_id) -); +) TRACE_EVENT(power_end,
@@ -73,7 +73,7 @@ TRACE_EVENT(power_end,TP_printk ("cpu_id=%lu" , (unsigned long )__entry->cpu_id) -); +)/* * The clock events are used for clock enable/disable and for
@@ -99,28 +99,28 @@ DECLARE_EVENT_CLASS(clock, TP_printk("%s state=%lu cpu_id=%lu", __get_str(name), (unsigned long)__entry->state, (unsigned long)__entry->cpu_id) -); +) DEFINE_EVENT(clock, clock_enable, TP_PROTO(const char *name, unsigned int state, unsigned int cpu_id), TP_ARGS(name, state, cpu_id) -); +) DEFINE_EVENT(clock, clock_disable, TP_PROTO(const char *name, unsigned int state, unsigned int cpu_id), TP_ARGS(name, state, cpu_id) -); +)DEFINE_EVENT (clock, clock_set_rate, TP_PROTO(const char *name, unsigned int state, unsigned int cpu_id),TP_ARGS (name, state, cpu_id) -); +)/* * The power domain events are used for power domains transitions
@@ -145,14 +145,14 @@ DECLARE_EVENT_CLASS(power_domain, TP_printk("%s state=%lu cpu_id=%lu", __get_str(name), (unsigned long)__entry->state, (unsigned long)__entry->cpu_id) -); +) DEFINE_EVENT(power_domain, power_domain_target, TP_PROTO(const char *name, unsigned int state, unsigned int cpu_id), TP_ARGS(name, state, cpu_id) -); +)#endif /* _TRACE_POWER_H */
Mathieu Desnoyers
reviewerRFC PATCH 16/28 trace event sched remove trailing semicolon
In reply to Mathieu DesnoyersPart of the gradual TRACE_EVENT() semicolon removal. Enables creation of array of events, thus saving space for trace event probes. Remove the trailing semicolons at the end of TRACE_EVENT() and DEFINE_EVENT() in scheduler instrumentation. Put __trace_sched_switch_state() static inline declaration within ifdef protection so the preprocessor output is not polluted when creating an array of events.
Signed-off-by Mathieu Desnoyers <[email protected]>
CC Steven Rostedt <[email protected]>
CC Frederic Weisbecker <[email protected]>
CC Ingo Molnar <[email protected]>
CC Thomas Gleixner <[email protected]>
CC Peter Zijlstra <[email protected]>
--- include/trace/events/sched.h | 77 ++++++++++++++++++++++--------------------- 1 file changed, 41 insertions(+), 36 deletions(-)
include/trace/events/sched.h +41 -36
@@ -7,6 +7,28 @@#include <linux/sched.h> #include <linux/tracepoint.h> +#ifndef _TRACE_SCHED_DEF_ +#define _TRACE_SCHED_DEF_ + +#ifdef CREATE_TRACE_POINTS +static inline long __trace_sched_switch_state (struct task_struct *p) +{ +long state = p->state; + +#ifdef CONFIG_PREEMPT +/* +* For all intents and purposes a preempted task is a running task. +*/ +if (task_thread_info (p)->preempt_count &PREEMPT_ACTIVE ) + state =TASK_RUNNING ; +#endif + +return state; +} +#endif + +#endif /* _TRACE_SCHED_DEF_ */ +/* * Tracepoint for calling kthread_stop, performed to end a kthread: */
@@ -27,7 +49,7 @@ TRACE_EVENT(sched_kthread_stop, ),TP_printk ("comm=%s pid=%d" , __entry->comm, __entry->pid) -); +)/* * Tracepoint for the return value of the kthread stopping:
@@ -47,7 +69,7 @@ TRACE_EVENT(sched_kthread_stop_ret, ),TP_printk ("ret=%d" , __entry->ret) -); +)/* * Tracepoint for waking up a task:
@@ -77,35 +99,18 @@ DECLARE_EVENT_CLASS(sched_wakeup_templat TP_printk("comm=%s pid=%d prio=%d success=%d target_cpu=%03d", __entry->comm, __entry->pid, __entry->prio, __entry->success, __entry->target_cpu) -); +) DEFINE_EVENT(sched_wakeup_template, sched_wakeup, TP_PROTO(struct task_struct *p, int success), -TP_ARGS (p, success)); + TP_ARGS(p, success))/* * Tracepoint for waking up a new task: */ DEFINE_EVENT (sched_wakeup_template, sched_wakeup_new, TP_PROTO(struct task_struct *p, int success), -TP_ARGS (p, success)); - -#ifdef CREATE_TRACE_POINTS -static inline long __trace_sched_switch_state (struct task_struct *p) -{ -long state = p->state; - -#ifdef CONFIG_PREEMPT -/* -* For all intents and purposes a preempted task is a running task. -*/ -if (task_thread_info (p)->preempt_count &PREEMPT_ACTIVE ) - state =TASK_RUNNING ; -#endif - -return state; -} -#endif +TP_ARGS (p, success))/* * Tracepoint for task switches, performed by the scheduler:
@@ -145,7 +150,7 @@ TRACE_EVENT(sched_switch, { 16, "Z" }, { 32, "X" }, { 64, "x" }, { 128, "W" }) : "R", __entry->next_comm, __entry->next_pid, __entry->next_prio) -); +)/* * Tracepoint for a task being migrated:
@@ -175,7 +180,7 @@ TRACE_EVENT(sched_migrate_task, TP_printk("comm=%s pid=%d prio=%d orig_cpu=%d dest_cpu=%d", __entry->comm, __entry->pid, __entry->prio, __entry->orig_cpu, __entry->dest_cpu) -); +) DECLARE_EVENT_CLASS(sched_process_template,
@@ -197,14 +202,14 @@ DECLARE_EVENT_CLASS(sched_process_templa TP_printk("comm=%s pid=%d prio=%d", __entry->comm, __entry->pid, __entry->prio) -); +)/* * Tracepoint for freeing a task: */ DEFINE_EVENT (sched_process_template, sched_process_free, TP_PROTO(struct task_struct *p), -TP_ARGS (p)); +TP_ARGS (p))/*
@@ -212,14 +217,14 @@ DEFINE_EVENT(sched_process_template, sch*/ DEFINE_EVENT (sched_process_template, sched_process_exit, TP_PROTO(struct task_struct *p), -TP_ARGS (p)); +TP_ARGS (p))/* * Tracepoint for waiting on task to unschedule: */DEFINE_EVENT (sched_process_template, sched_wait_task, TP_PROTO(struct task_struct *p), -TP_ARGS (p)); +TP_ARGS (p))/* * Tracepoint for a waiting task:
@@ -244,7 +249,7 @@ TRACE_EVENT(sched_process_wait,TP_printk ("comm=%s pid=%d prio=%d" , __entry->comm, __entry->pid, __entry->prio) -); +)/* * Tracepoint for do_fork:
@@ -272,7 +277,7 @@ TRACE_EVENT(sched_process_fork,TP_printk ("comm=%s pid=%d child_comm=%s child_pid=%d" , __entry->parent_comm, __entry->parent_pid, __entry->child_comm, __entry->child_pid) -); +)/* * XXX the below sched_stat tracepoints only apply to SCHED_OTHER/BATCH/IDLE
@@ -302,7 +307,7 @@ DECLARE_EVENT_CLASS(sched_stat_template,TP_printk ("comm=%s pid=%d delay=%Lu [ns]" , __entry->comm, __entry->pid, (unsigned long long )__entry->delay) -); +)/*
@@ -311,7 +316,7 @@ DECLARE_EVENT_CLASS(sched_stat_template,*/ DEFINE_EVENT (sched_stat_template, sched_stat_wait, TP_PROTO(struct task_struct *tsk, u64 delay), -TP_ARGS (tsk, delay)); +TP_ARGS (tsk, delay))/* * Tracepoint for accounting sleep time (time the task is not runnable,
@@ -319,7 +324,7 @@ DEFINE_EVENT(sched_stat_template, sched_*/ DEFINE_EVENT (sched_stat_template, sched_stat_sleep, TP_PROTO(struct task_struct *tsk, u64 delay), -TP_ARGS (tsk, delay)); +TP_ARGS (tsk, delay))/* * Tracepoint for accounting iowait time (time the task is not runnable
@@ -327,7 +332,7 @@ DEFINE_EVENT(sched_stat_template, sched_*/ DEFINE_EVENT (sched_stat_template, sched_stat_iowait, TP_PROTO(struct task_struct *tsk, u64 delay), -TP_ARGS (tsk, delay)); +TP_ARGS (tsk, delay))/* * Tracepoint for accounting runtime (time the task is executing
@@ -360,7 +365,7 @@ TRACE_EVENT(sched_stat_runtime, __entry->comm, __entry->pid, (unsigned long long )__entry->runtime, (unsigned long long)__entry->vruntime) -); +)/* * Tracepoint for showing priority inheritance modifying a tasks
@@ -389,7 +394,7 @@ TRACE_EVENT(sched_pi_setprio, TP_printk("comm=%s pid=%d oldprio=%d newprio=%d", __entry->comm, __entry->pid, __entry->oldprio, __entry->newprio) -); +)#endif /* _TRACE_SCHED_H */
Mathieu Desnoyers
reviewerRFC PATCH 17/28 trace event scsi remove semicolons
In reply to Mathieu DesnoyersPart of the gradual TRACE_EVENT() semicolon removal. Enables creation of array of events, thus saving space for trace event probes.
Signed-off-by Mathieu Desnoyers <[email protected]>
CC Steven Rostedt <[email protected]>
CC Frederic Weisbecker <[email protected]>
CC Ingo Molnar <[email protected]>
CC Thomas Gleixner <[email protected]>
CC Xiao Guangrong <[email protected]>
CC Tomohiro Kusumi <[email protected]>
CC Kei Tokunaga <[email protected]>
CC James Bottomley <[email protected]>
CC Martin K. Petersen <[email protected]>
--- include/trace/events/scsi.h | 17 +++++++++++------ 1 file changed, 11 insertions(+), 6 deletions(-)
include/trace/events/scsi.h +11 -6
@@ -9,6 +9,9 @@#include <linux/tracepoint.h> #include <linux/trace_seq.h> +#ifndef _TRACE_SCSI_DEF_ +#define _TRACE_SCSI_DEF_ +#define scsi_opcode_name (opcode) { opcode, #opcode }#define show_opcode_name (val) \ __print_symbolic(val, \
@@ -187,6 +190,8 @@const char *scsi_trace_parse_cdb (struct trace_seq *,unsigned char *,int );#define __parse_cdb (cdb, len) scsi_trace_parse_cdb(p, cdb, len) +#endif /* _TRACE_SCSI_DEF_ */ + TRACE_EVENT(scsi_dispatch_cmd_start, TP_PROTO(struct scsi_cmnd *cmd),
@@ -224,7 +229,7 @@ TRACE_EVENT(scsi_dispatch_cmd_start, show_opcode_name(__entry->opcode), __parse_cdb(__get_dynamic_array(cmnd), __entry->cmd_len), __print_hex(__get_dynamic_array(cmnd), __entry->cmd_len)) -); +) TRACE_EVENT(scsi_dispatch_cmd_error,
@@ -266,7 +271,7 @@ TRACE_EVENT(scsi_dispatch_cmd_error, __parse_cdb(__get_dynamic_array(cmnd), __entry->cmd_len), __print_hex(__get_dynamic_array(cmnd), __entry->cmd_len), __entry->rtn) -); +) DECLARE_EVENT_CLASS(scsi_cmd_done_timeout_template,
@@ -312,15 +317,15 @@ DECLARE_EVENT_CLASS(scsi_cmd_done_timeou show_hostbyte_name(((__entry->result) >> 16) & 0xff), show_msgbyte_name(((__entry->result) >> 8) & 0xff), show_statusbyte_name(__entry->result & 0xff)) -); +) DEFINE_EVENT(scsi_cmd_done_timeout_template, scsi_dispatch_cmd_done, TP_PROTO(struct scsi_cmnd *cmd), -TP_ARGS (cmd)); + TP_ARGS(cmd)) DEFINE_EVENT(scsi_cmd_done_timeout_template, scsi_dispatch_cmd_timeout, TP_PROTO(struct scsi_cmnd *cmd), -TP_ARGS (cmd)); + TP_ARGS(cmd)) TRACE_EVENT(scsi_eh_wakeup,
@@ -337,7 +342,7 @@ TRACE_EVENT(scsi_eh_wakeup, ), TP_printk("host_no=%u", __entry->host_no) -); +)#endif /* _TRACE_SCSI_H */
Mathieu Desnoyers
reviewerRFC PATCH 18/28 trace event signal remove semicolons
In reply to Mathieu DesnoyersPart of the gradual TRACE_EVENT() semicolon removal. Enables creation of array of events, thus saving space for trace event probes.
Signed-off-by Mathieu Desnoyers <[email protected]>
CC Steven Rostedt <[email protected]>
CC Frederic Weisbecker <[email protected]>
CC Ingo Molnar <[email protected]>
CC Thomas Gleixner <[email protected]>
CC Li Zefan <[email protected]>
CC Masami Hiramatsu <[email protected]>
CC Roland McGrath <[email protected]>
CC Oleg Nesterov <[email protected]>
--- include/trace/events/signal.h | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-)
include/trace/events/signal.h +5 -5
@@ -59,7 +59,7 @@ TRACE_EVENT(signal_generate,TP_printk ("sig=%d errno=%d code=%d comm=%s pid=%d" , __entry->sig, __entry->errno, __entry->code, __entry->comm, __entry->pid) -); +)/** * signal_deliver - called when a signal is delivered
@@ -99,7 +99,7 @@ TRACE_EVENT(signal_deliver, TP_printk("sig=%d errno=%d code=%d sa_handler=%lx sa_flags=%lx", __entry->sig, __entry->errno, __entry->code, __entry->sa_handler, __entry->sa_flags) -); +) DECLARE_EVENT_CLASS(signal_queue_overflow,
@@ -122,7 +122,7 @@ DECLARE_EVENT_CLASS(signal_queue_overfloTP_printk ("sig=%d group=%d errno=%d code=%d" , __entry->sig, __entry->group, __entry->errno, __entry->code) -); +)/** * signal_overflow_fail - called when signal queue is overflow
@@ -140,7 +140,7 @@ DEFINE_EVENT(signal_queue_overflow, sign TP_PROTO(int sig, int group, struct siginfo *info),TP_ARGS (sig, group, info) -); +)/** * signal_lose_info - called when siginfo is lost
@@ -158,7 +158,7 @@ DEFINE_EVENT(signal_queue_overflow, sign TP_PROTO(int sig, int group, struct siginfo *info),TP_ARGS (sig, group, info) -); +) #endif /* _TRACE_SIGNAL_H */
Mathieu Desnoyers
reviewerRFC PATCH 19/28 trace event skb remove semicolons
In reply to Mathieu DesnoyersPart of the gradual TRACE_EVENT() semicolon removal. Enables creation of array of events, thus saving space for trace event probes.
Signed-off-by Mathieu Desnoyers <[email protected]>
CC Steven Rostedt <[email protected]>
CC Frederic Weisbecker <[email protected]>
CC Ingo Molnar <[email protected]>
CC Thomas Gleixner <[email protected]>
CC Koki Sanagi <[email protected]>
CC Neil Horman <[email protected]>
CC David S. Miller <[email protected]>
--- include/trace/events/skb.h | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-)
include/trace/events/skb.h +3 -3
@@ -31,7 +31,7 @@ TRACE_EVENT(kfree_skb, TP_printk("skbaddr=%p protocol=%u location=%p", __entry->skbaddr, __entry->protocol, __entry->location) -); +) TRACE_EVENT(consume_skb,
@@ -48,7 +48,7 @@ TRACE_EVENT(consume_skb, ), TP_printk("skbaddr=%p", __entry->skbaddr) -); +) TRACE_EVENT(skb_copy_datagram_iovec,
@@ -67,7 +67,7 @@ TRACE_EVENT(skb_copy_datagram_iovec, ), TP_printk("skbaddr=%p len=%d", __entry->skbaddr, __entry->len) -); +)#endif /* _TRACE_SKB_H */
Mathieu Desnoyers
reviewerRFC PATCH 20/28 trace event syscalls remove semicolons
In reply to Mathieu DesnoyersPart of the gradual TRACE_EVENT() semicolon removal. Enables creation of array of events, thus saving space for trace event probes.
Signed-off-by Mathieu Desnoyers <[email protected]>
CC Steven Rostedt <[email protected]>
CC Frederic Weisbecker <[email protected]>
CC Ingo Molnar <[email protected]>
CC Thomas Gleixner <[email protected]>
CC Josh Stone <[email protected]>
--- include/trace/events/syscalls.h | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-)
include/trace/events/syscalls.h +7 -2
@@ -13,9 +13,14 @@#ifdef CONFIG_HAVE_SYSCALL_TRACEPOINTS +#ifndef _TRACE_SYSCALLS_DEF_ +#define _TRACE_SYSCALLS_DEF_ +extern void syscall_regfunc (void );extern void syscall_unregfunc (void ); +#endif /* _TRACE_SYSCALLS_DEF_ */ + TRACE_EVENT_FN(sys_enter, TP_PROTO(struct pt_regs *regs, long id),
@@ -38,7 +43,7 @@ TRACE_EVENT_FN(sys_enter, __entry->args[3], __entry->args[4], __entry->args[5]), syscall_regfunc, syscall_unregfunc -); +) TRACE_EVENT_FN(sys_exit,
@@ -60,7 +65,7 @@ TRACE_EVENT_FN(sys_exit, __entry->id, __entry->ret), syscall_regfunc, syscall_unregfunc -); +)#endif /* CONFIG_HAVE_SYSCALL_TRACEPOINTS */
Mathieu Desnoyers
reviewerRFC PATCH 21/28 trace event timer remove semicolons
In reply to Mathieu DesnoyersPart of the gradual TRACE_EVENT() semicolon removal. Enables creation of array of events, thus saving space for trace event probes.
Signed-off-by Mathieu Desnoyers <[email protected]>
CC Steven Rostedt <[email protected]>
CC Frederic Weisbecker <[email protected]>
CC Ingo Molnar <[email protected]>
CC Thomas Gleixner <[email protected]>
CC Xiao Guangrong <[email protected]>
CC Li Zefan <[email protected]>
CC Arjan van de Ven <[email protected]>
--- include/trace/events/timer.h | 28 ++++++++++++++-------------- 1 file changed, 14 insertions(+), 14 deletions(-)
include/trace/events/timer.h +14 -14
@@ -23,7 +23,7 @@ DECLARE_EVENT_CLASS(timer_class, ),TP_printk ("timer=%p" , __entry->timer) -); +)/** * timer_init - called when the timer is initialized
@@ -34,7 +34,7 @@ DEFINE_EVENT(timer_class, timer_init, TP_PROTO(struct timer_list *timer), TP_ARGS(timer) -); +)/** * timer_start - called when the timer is started
@@ -64,7 +64,7 @@ TRACE_EVENT(timer_start,TP_printk ("timer=%p function=%pf expires=%lu [timeout=%ld]" , __entry->timer, __entry->function, __entry->expires, (long )__entry->expires - __entry->now) -); +)/** * timer_expire_entry - called immediately before the timer callback
@@ -91,7 +91,7 @@ TRACE_EVENT(timer_expire_entry, ),TP_printk ("timer=%p function=%pf now=%lu" , __entry->timer, __entry->function,__entry->now) -); +)/** * timer_expire_exit - called immediately after the timer callback returns
@@ -108,7 +108,7 @@ DEFINE_EVENT(timer_class, timer_expire_e TP_PROTO(struct timer_list *timer), TP_ARGS(timer) -); +)/** * timer_cancel - called when the timer is canceled
@@ -119,7 +119,7 @@ DEFINE_EVENT(timer_class, timer_cancel, TP_PROTO(struct timer_list *timer), TP_ARGS(timer) -); +)/** * hrtimer_init - called when the hrtimer is initialized
@@ -151,7 +151,7 @@ TRACE_EVENT(hrtimer_init, "CLOCK_REALTIME" : "CLOCK_MONOTONIC", __entry->mode ==HRTIMER_MODE_ABS ? "HRTIMER_MODE_ABS" : "HRTIMER_MODE_REL") -); +)/** * hrtimer_start - called when the hrtimer is started
@@ -183,7 +183,7 @@ TRACE_EVENT(hrtimer_start, .tv64 = __entry->expires }), (unsigned long long )ktime_to_ns ((ktime_t ) { .tv64 = __entry->softexpires })) -); +)/** * htimmer_expire_entry - called immediately before the hrtimer callback
@@ -213,7 +213,7 @@ TRACE_EVENT(hrtimer_expire_entry, TP_printk("hrtimer=%p function=%pf now=%llu", __entry->hrtimer, __entry->function, (unsigned long long)ktime_to_ns((ktime_t) { .tv64 = __entry->now })) - ); +) DECLARE_EVENT_CLASS(hrtimer_class,
@@ -230,7 +230,7 @@ DECLARE_EVENT_CLASS(hrtimer_class, ),TP_printk ("hrtimer=%p" , __entry->hrtimer) -); +)/** * hrtimer_expire_exit - called immediately after the hrtimer callback returns
@@ -244,7 +244,7 @@ DEFINE_EVENT(hrtimer_class, hrtimer_expi TP_PROTO(struct hrtimer *hrtimer), TP_ARGS(hrtimer) -); +)/** * hrtimer_cancel - called when the hrtimer is canceled
@@ -255,7 +255,7 @@ DEFINE_EVENT(hrtimer_class, hrtimer_canc TP_PROTO(struct hrtimer *hrtimer), TP_ARGS(hrtimer) -); +)/** * itimer_state - called when itimer is started or canceled
@@ -293,7 +293,7 @@ TRACE_EVENT(itimer_state, __entry->which, (unsigned long long )__entry->expires, __entry->value_sec, __entry->value_usec, __entry->interval_sec, __entry->interval_usec) -); +)/** * itimer_expire - called when itimer expires
@@ -321,7 +321,7 @@ TRACE_EVENT(itimer_expire, TP_printk("which=%d pid=%d now=%llu", __entry->which, (int) __entry->pid, (unsigned long long)__entry->now) -); +)#endif /* _TRACE_TIMER_H */
Mathieu Desnoyers
reviewerRFC PATCH 22/28 trace event vmscan remove semicolons
In reply to Mathieu DesnoyersPart of the gradual TRACE_EVENT() semicolon removal. Enables creation of array of events, thus saving space for trace event probes.
Signed-off-by Mathieu Desnoyers <[email protected]>
CC Steven Rostedt <[email protected]>
CC Frederic Weisbecker <[email protected]>
CC Ingo Molnar <[email protected]>
CC Thomas Gleixner <[email protected]>
CC Mel Gorman <[email protected]>
CC Rik van Riel <[email protected]>
CC Larry Woodman <[email protected]>
CC KOSAKI Motohiro <[email protected]>
--- include/trace/events/vmscan.h | 32 ++++++++++++++++---------------- 1 file changed, 16 insertions(+), 16 deletions(-)
include/trace/events/vmscan.h +16 -16
@@ -49,7 +49,7 @@ TRACE_EVENT(mm_vmscan_kswapd_sleep, ), TP_printk("nid=%d", __entry->nid) -); +) TRACE_EVENT(mm_vmscan_kswapd_wake,
@@ -68,7 +68,7 @@ TRACE_EVENT(mm_vmscan_kswapd_wake, ), TP_printk("nid=%d order=%d", __entry->nid, __entry->order) -); +) TRACE_EVENT(mm_vmscan_wakeup_kswapd,
@@ -92,7 +92,7 @@ TRACE_EVENT(mm_vmscan_wakeup_kswapd, __entry->nid, __entry->zid, __entry->order) -); +) DECLARE_EVENT_CLASS(mm_vmscan_direct_reclaim_begin_template,
@@ -116,28 +116,28 @@ DECLARE_EVENT_CLASS(mm_vmscan_direct_rec __entry->order, __entry->may_writepage, show_gfp_flags(__entry->gfp_flags)) -); +) DEFINE_EVENT(mm_vmscan_direct_reclaim_begin_template, mm_vmscan_direct_reclaim_begin, TP_PROTO(int order, int may_writepage, gfp_t gfp_flags), TP_ARGS(order, may_writepage, gfp_flags) -); +) DEFINE_EVENT(mm_vmscan_direct_reclaim_begin_template, mm_vmscan_memcg_reclaim_begin, TP_PROTO(int order, int may_writepage, gfp_t gfp_flags), TP_ARGS(order, may_writepage, gfp_flags) -); +) DEFINE_EVENT(mm_vmscan_direct_reclaim_begin_template, mm_vmscan_memcg_softlimit_reclaim_begin, TP_PROTO(int order, int may_writepage, gfp_t gfp_flags), TP_ARGS(order, may_writepage, gfp_flags) -); +) DECLARE_EVENT_CLASS(mm_vmscan_direct_reclaim_end_template,
@@ -154,28 +154,28 @@ DECLARE_EVENT_CLASS(mm_vmscan_direct_rec ), TP_printk("nr_reclaimed=%lu", __entry->nr_reclaimed) -); +) DEFINE_EVENT(mm_vmscan_direct_reclaim_end_template, mm_vmscan_direct_reclaim_end, TP_PROTO(unsigned long nr_reclaimed), TP_ARGS(nr_reclaimed) -); +) DEFINE_EVENT(mm_vmscan_direct_reclaim_end_template, mm_vmscan_memcg_reclaim_end, TP_PROTO(unsigned long nr_reclaimed), TP_ARGS(nr_reclaimed) -); +) DEFINE_EVENT(mm_vmscan_direct_reclaim_end_template, mm_vmscan_memcg_softlimit_reclaim_end, TP_PROTO(unsigned long nr_reclaimed), TP_ARGS(nr_reclaimed) -); +) DECLARE_EVENT_CLASS(mm_vmscan_lru_isolate_template,
@@ -222,7 +222,7 @@ DECLARE_EVENT_CLASS(mm_vmscan_lru_isolat __entry->nr_lumpy_taken, __entry->nr_lumpy_dirty, __entry->nr_lumpy_failed) -); +) DEFINE_EVENT(mm_vmscan_lru_isolate_template, mm_vmscan_lru_isolate,
@@ -237,7 +237,7 @@ DEFINE_EVENT(mm_vmscan_lru_isolate_templ TP_ARGS(order, nr_requested, nr_scanned, nr_taken, nr_lumpy_taken, nr_lumpy_dirty, nr_lumpy_failed, isolate_mode) -); +) DEFINE_EVENT(mm_vmscan_lru_isolate_template, mm_vmscan_memcg_isolate,
@@ -252,7 +252,7 @@ DEFINE_EVENT(mm_vmscan_lru_isolate_templ TP_ARGS(order, nr_requested, nr_scanned, nr_taken, nr_lumpy_taken, nr_lumpy_dirty, nr_lumpy_failed, isolate_mode) -); +) TRACE_EVENT(mm_vmscan_writepage,
@@ -275,7 +275,7 @@ TRACE_EVENT(mm_vmscan_writepage, __entry->page, page_to_pfn(__entry->page), show_reclaim_flags(__entry->reclaim_flags)) -); +) TRACE_EVENT(mm_vmscan_lru_shrink_inactive,
@@ -308,7 +308,7 @@ TRACE_EVENT(mm_vmscan_lru_shrink_inactiv __entry->nr_scanned, __entry->nr_reclaimed, __entry->priority, show_reclaim_flags(__entry->reclaim_flags)) -); +)#endif /* _TRACE_VMSCAN_H */
Mathieu Desnoyers
reviewerRFC PATCH 23/28 trace event workqueue remove semicolons
In reply to Mathieu DesnoyersPart of the gradual TRACE_EVENT() semicolon removal. Enables creation of array of events, thus saving space for trace event probes.
Signed-off-by Mathieu Desnoyers <[email protected]>
CC Steven Rostedt <[email protected]>
CC Frederic Weisbecker <[email protected]>
CC Ingo Molnar <[email protected]>
CC Thomas Gleixner <[email protected]>
CC Arjan van de Ven <[email protected]>
CC Tejun Heo <[email protected]>
--- include/trace/events/workqueue.h | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-)
include/trace/events/workqueue.h +5 -5
@@ -22,7 +22,7 @@ DECLARE_EVENT_CLASS(workqueue_work, ),TP_printk ("work struct %p" , __entry->work) -); +)/** * workqueue_queue_work - called when a work gets queued
@@ -60,7 +60,7 @@ TRACE_EVENT(workqueue_queue_work,TP_printk ("work struct=%p function=%pf workqueue=%p req_cpu=%u cpu=%u" , __entry->work, __entry->function, __entry->workqueue, __entry->req_cpu, __entry->cpu) -); +)/** * workqueue_activate_work - called when a work gets activated
@@ -75,7 +75,7 @@ DEFINE_EVENT(workqueue_work, workqueue_a TP_PROTO(struct work_struct *work), TP_ARGS(work) -); +)/** * workqueue_execute_start - called immediately before the workqueue callback
@@ -100,7 +100,7 @@ TRACE_EVENT(workqueue_execute_start, ),TP_printk ("work struct %p: function %pf" , __entry->work, __entry->function) -); +)/** * workqueue_execute_end - called immediately before the workqueue callback
@@ -113,7 +113,7 @@ DEFINE_EVENT(workqueue_work, workqueue_e TP_PROTO(struct work_struct *work), TP_ARGS(work) -); +)#endif /* _TRACE_WORKQUEUE_H */
Re: [RFC patch 23/28] trace event workqueue remove semicolons
Quoted 10 lines · Mathieu Desnoyers
Part of the gradual
TRACE_EVENT()semicolon removal. Enables creation of array of events, thus saving space for trace event probes.Signed-off-by Mathieu Desnoyers <[email protected]>CC Steven Rostedt <[email protected]>CC Frederic Weisbecker <[email protected]>CC Ingo Molnar <[email protected]>CC Thomas Gleixner <[email protected]>CC Arjan van de Ven <[email protected]>CC Tejun Heo <[email protected]>
Acked-by Tejun Heo <[email protected]>
Signature · 1 line
tejun
Mathieu Desnoyers
reviewerRFC PATCH 24/28 trace event writeback remove semicolons
In reply to Mathieu DesnoyersPart of the gradual TRACE_EVENT() semicolon removal. Enables creation of array of events, thus saving space for trace event probes.
Signed-off-by Mathieu Desnoyers <[email protected]>
CC Steven Rostedt <[email protected]>
CC Frederic Weisbecker <[email protected]>
CC Ingo Molnar <[email protected]>
CC Thomas Gleixner <[email protected]>
CC Mel Gorman <[email protected]>
CC Dave Chinner <[email protected]>
CC Jens Axboe <[email protected]>
CC Jeff Moyer <[email protected]>
--- include/trace/events/writeback.h | 51 +++++++++++++++++++++------------------ 1 file changed, 28 insertions(+), 23 deletions(-)
include/trace/events/writeback.h +28 -23
@@ -8,8 +8,13 @@#include <linux/device.h> #include <linux/writeback.h> +#ifndef _TRACE_WRITEBACK_DEF_ +#define _TRACE_WRITEBACK_DEF_ +struct wb_writeback_work ; +#endif /* _TRACE_WRITEBACK_DEF_ */ + DECLARE_EVENT_CLASS(writeback_work_class, TP_PROTO(struct backing_dev_info *bdi, struct wb_writeback_work *work), TP_ARGS(bdi, work),
@@ -41,14 +46,14 @@ DECLARE_EVENT_CLASS(writeback_work_class __entry->range_cyclic, __entry->for_background ) -); +)#define DEFINE_WRITEBACK_WORK_EVENT (name) \ DEFINE_EVENT(writeback_work_class, name, \ TP_PROTO(struct backing_dev_info *bdi, struct wb_writeback_work *work), \ TP_ARGS(bdi, work)) -DEFINE_WRITEBACK_WORK_EVENT (writeback_nothread); -DEFINE_WRITEBACK_WORK_EVENT (writeback_queue); -DEFINE_WRITEBACK_WORK_EVENT (writeback_exec); +DEFINE_WRITEBACK_WORK_EVENT(writeback_nothread) +DEFINE_WRITEBACK_WORK_EVENT(writeback_queue) +DEFINE_WRITEBACK_WORK_EVENT(writeback_exec) TRACE_EVENT(writeback_pages_written, TP_PROTO(long pages_written),
@@ -60,7 +65,7 @@ TRACE_EVENT(writeback_pages_written, __entry->pages = pages_written; ), TP_printk("%ld", __entry->pages) -); +) DECLARE_EVENT_CLASS(writeback_class, TP_PROTO(struct backing_dev_info *bdi),
@@ -74,19 +79,19 @@ DECLARE_EVENT_CLASS(writeback_class, TP_printk("bdi %s", __entry->name ) -); +)#define DEFINE_WRITEBACK_EVENT (name) \ DEFINE_EVENT(writeback_class, name, \ TP_PROTO(struct backing_dev_info *bdi), \ TP_ARGS(bdi)) -DEFINE_WRITEBACK_EVENT (writeback_nowork); -DEFINE_WRITEBACK_EVENT (writeback_wake_thread); -DEFINE_WRITEBACK_EVENT (writeback_wake_forker_thread); -DEFINE_WRITEBACK_EVENT (writeback_bdi_register); -DEFINE_WRITEBACK_EVENT (writeback_bdi_unregister); -DEFINE_WRITEBACK_EVENT (writeback_thread_start); -DEFINE_WRITEBACK_EVENT (writeback_thread_stop); +DEFINE_WRITEBACK_EVENT(writeback_nowork) +DEFINE_WRITEBACK_EVENT(writeback_wake_thread) +DEFINE_WRITEBACK_EVENT(writeback_wake_forker_thread) +DEFINE_WRITEBACK_EVENT(writeback_bdi_register) +DEFINE_WRITEBACK_EVENT(writeback_bdi_unregister) +DEFINE_WRITEBACK_EVENT(writeback_thread_start) +DEFINE_WRITEBACK_EVENT(writeback_thread_stop) DECLARE_EVENT_CLASS(wbc_class, TP_PROTO(struct writeback_control *wbc, struct backing_dev_info *bdi),
@@ -143,13 +148,13 @@ DECLARE_EVENT_CLASS(wbc_class,DEFINE_EVENT (wbc_class, name, \ TP_PROTO(struct writeback_control *wbc, struct backing_dev_info *bdi), \ TP_ARGS(wbc, bdi)) -DEFINE_WBC_EVENT (wbc_writeback_start); -DEFINE_WBC_EVENT (wbc_writeback_written); -DEFINE_WBC_EVENT (wbc_writeback_wait); -DEFINE_WBC_EVENT (wbc_balance_dirty_start); -DEFINE_WBC_EVENT (wbc_balance_dirty_written); -DEFINE_WBC_EVENT (wbc_balance_dirty_wait); -DEFINE_WBC_EVENT (wbc_writepage); +DEFINE_WBC_EVENT(wbc_writeback_start) +DEFINE_WBC_EVENT(wbc_writeback_written) +DEFINE_WBC_EVENT(wbc_writeback_wait) +DEFINE_WBC_EVENT(wbc_balance_dirty_start) +DEFINE_WBC_EVENT(wbc_balance_dirty_written) +DEFINE_WBC_EVENT(wbc_balance_dirty_wait) +DEFINE_WBC_EVENT(wbc_writepage) DECLARE_EVENT_CLASS(writeback_congest_waited_template,
@@ -170,21 +175,21 @@ DECLARE_EVENT_CLASS(writeback_congest_wa TP_printk("usec_timeout=%u usec_delayed=%u", __entry->usec_timeout, __entry->usec_delayed) -); +) DEFINE_EVENT(writeback_congest_waited_template, writeback_congestion_wait, TP_PROTO(unsigned int usec_timeout, unsigned int usec_delayed), TP_ARGS(usec_timeout, usec_delayed) -); +) DEFINE_EVENT(writeback_congest_waited_template, writeback_wait_iff_congested, TP_PROTO(unsigned int usec_timeout, unsigned int usec_delayed), TP_ARGS(usec_timeout, usec_delayed) -); +)#endif /* _TRACE_WRITEBACK_H */
Mathieu Desnoyers
reviewerRFC PATCH 25/28 trace event wireless remove semicolons
In reply to Mathieu DesnoyersPart of the gradual TRACE_EVENT() semicolon removal. Enables creation of array of events, thus saving space for trace event probes.
Signed-off-by Mathieu Desnoyers <[email protected]>
CC Steven Rostedt <[email protected]>
CC Frederic Weisbecker <[email protected]>
CC Ingo Molnar <[email protected]>
CC Thomas Gleixner <[email protected]>
CC Zhu Yi <[email protected]>
CC Johannes Berg <[email protected]>
CC Reinette Chatre <[email protected]>
CC John W. Linville <[email protected]>
--- drivers/net/wireless/iwlwifi/iwl-devtrace.h | 20 ++--- drivers/net/wireless/iwmc3200wifi/trace.h | 14 ++-- net/mac80211/driver-trace.h | 94 ++++++++++++++-------------- 3 files changed, 64 insertions(+), 64 deletions(-)
drivers/net/wireless/iwlwifi/iwl-devtrace.h +10 -10
@@ -55,7 +55,7 @@ TRACE_EVENT(iwlwifi_dev_ioread32, __entry->val = val; ), TP_printk("[%p] read io[%#x] = %#x", __entry->priv, __entry->offs, __entry->val) -); +) TRACE_EVENT(iwlwifi_dev_iowrite8, TP_PROTO(struct iwl_priv *priv, u32 offs, u8 val),
@@ -71,7 +71,7 @@ TRACE_EVENT(iwlwifi_dev_iowrite8, __entry->val = val; ), TP_printk("[%p] write io[%#x] = %#x)", __entry->priv, __entry->offs, __entry->val) -); +) TRACE_EVENT(iwlwifi_dev_iowrite32, TP_PROTO(struct iwl_priv *priv, u32 offs, u32 val),
@@ -87,7 +87,7 @@ TRACE_EVENT(iwlwifi_dev_iowrite32, __entry->val = val; ), TP_printk("[%p] write io[%#x] = %#x)", __entry->priv, __entry->offs, __entry->val) -); +)#undef TRACE_SYSTEM#define TRACE_SYSTEM iwlwifi_ucode
@@ -110,7 +110,7 @@ TRACE_EVENT(iwlwifi_dev_ucode_cont_event ), TP_printk("[%p] EVT_LOGT:%010u:0x%08x:%04u", __entry->priv, __entry->time, __entry->data, __entry->ev) -); +) TRACE_EVENT(iwlwifi_dev_ucode_wrap_event, TP_PROTO(struct iwl_priv *priv, u32 wraps, u32 n_entry, u32 p_entry),
@@ -131,7 +131,7 @@ TRACE_EVENT(iwlwifi_dev_ucode_wrap_event TP_printk("[%p] wraps=#%02d n=0x%X p=0x%X", __entry->priv, __entry->wraps, __entry->n_entry, __entry->p_entry) -); +)#undef TRACE_SYSTEM#define TRACE_SYSTEM iwlwifi
@@ -152,7 +152,7 @@ TRACE_EVENT(iwlwifi_dev_hcmd, TP_printk("[%p] hcmd %#.2x (%ssync)", __entry->priv, ((u8 *)__get_dynamic_array(hcmd))[0], __entry->flags & CMD_ASYNC ? "a" : "") -); +) TRACE_EVENT(iwlwifi_dev_rx, TP_PROTO(struct iwl_priv *priv, void *rxbuf, size_t len),
@@ -167,7 +167,7 @@ TRACE_EVENT(iwlwifi_dev_rx, ), TP_printk("[%p] RX cmd %#.2x", __entry->priv, ((u8 *)__get_dynamic_array(rxbuf))[4]) -); +) TRACE_EVENT(iwlwifi_dev_tx, TP_PROTO(struct iwl_priv *priv, void *tfd, size_t tfdlen,
@@ -199,7 +199,7 @@ TRACE_EVENT(iwlwifi_dev_tx, __entry->priv, ((u8 *)__get_dynamic_array(buf0))[0], __entry->framelen) -); +) TRACE_EVENT(iwlwifi_dev_ucode_error, TP_PROTO(struct iwl_priv *priv, u32 desc, u32 time,
@@ -236,7 +236,7 @@ TRACE_EVENT(iwlwifi_dev_ucode_error, __entry->priv, __entry->desc, __entry->time, __entry->data1, __entry->data2, __entry->line, __entry->blink1, __entry->blink2, __entry->ilink1, __entry->ilink2) -); +) TRACE_EVENT(iwlwifi_dev_ucode_event, TP_PROTO(struct iwl_priv *priv, u32 time, u32 data, u32 ev),
@@ -256,7 +256,7 @@ TRACE_EVENT(iwlwifi_dev_ucode_event, ), TP_printk("[%p] EVT_LOGT:%010u:0x%08x:%04u", __entry->priv, __entry->time, __entry->data, __entry->ev) -); +)#endif /* __IWLWIFI_DEVICE_TRACE */ #undef TRACE_INCLUDE_PATH
drivers/net/wireless/iwmc3200wifi/trace.h +7 -7
@@ -53,7 +53,7 @@ TRACE_EVENT(iwm_tx_nonwifi_cmd, __entry->hw, __entry->seq, __entry->addr, __entry->op1, __entry->op2 ) -); +) TRACE_EVENT(iwm_tx_wifi_cmd, TP_PROTO(struct iwm_priv *iwm, struct iwm_umac_wifi_out_hdr *hdr),
@@ -96,7 +96,7 @@ TRACE_EVENT(iwm_tx_wifi_cmd, __entry->resp, __entry->eot, __entry->seq, __entry->color, __entry->ra_tid, __entry->credit_group ) -); +) TRACE_EVENT(iwm_tx_packets, TP_PROTO(struct iwm_priv *iwm, u8 *buf, int len),
@@ -149,7 +149,7 @@ TRACE_EVENT(iwm_tx_packets, __entry->eot, __entry->seq, __entry->color, __entry->ra_tid, __entry->credit_group, __entry->npkt, __entry->bytes ) -); +) TRACE_EVENT(iwm_rx_nonwifi_cmd, TP_PROTO(struct iwm_priv *iwm, void *buf, int len),
@@ -176,7 +176,7 @@ TRACE_EVENT(iwm_rx_nonwifi_cmd, IWM_PR_FMT " Rx TARGET RESP: opcode 0x%x, seq 0x%x, len 0x%x", IWM_PR_ARG, __entry->opcode, __entry->seq, __entry->len ) -); +) TRACE_EVENT(iwm_rx_wifi_cmd, TP_PROTO(struct iwm_priv *iwm, struct iwm_umac_wifi_in_hdr *hdr),
@@ -205,7 +205,7 @@ TRACE_EVENT(iwm_rx_wifi_cmd, __entry->source == UMAC_HDI_IN_SOURCE_FW ? "UMAC" : "UDMA", __entry->cmd, __entry->seq, __entry->count ) -); +)#define iwm_ticket_action_symbol \ { IWM_RX_TICKET_DROP, "DROP" }, \
@@ -245,7 +245,7 @@ TRACE_EVENT(iwm_rx_ticket, __entry->reason ? __entry->reason : __entry->flags, __entry->flags & IWM_RX_TICKET_AMSDU_MSK ? ", AMSDU frame" : "" ) -); +) TRACE_EVENT(iwm_rx_packet, TP_PROTO(struct iwm_priv *iwm, void *buf, int len),
@@ -273,7 +273,7 @@ TRACE_EVENT(iwm_rx_packet, IWM_PR_ARG, __entry->source == UMAC_HDI_IN_SOURCE_FHRX ? "LMAC" : "UMAC", __entry->id, __entry->len ) -); +)#endif #undef TRACE_INCLUDE_PATH
net/mac80211/driver-trace.h +47 -47
376 lines not on this page · raw message
Mathieu Desnoyers
reviewerRFC PATCH 26/28 trace event video gpu remove semicolons
In reply to Mathieu DesnoyersPart of the gradual TRACE_EVENT() semicolon removal. Enables creation of array of events, thus saving space for trace event probes.
Signed-off-by Mathieu Desnoyers <[email protected]>
CC Steven Rostedt <[email protected]>
CC Frederic Weisbecker <[email protected]>
CC Ingo Molnar <[email protected]>
CC Thomas Gleixner <[email protected]>
CC Jesse Barnes <[email protected]>
CC Dave Airlie <[email protected]>
CC Chris Wilson <[email protected]>
CC Li Zefan <[email protected]>
--- drivers/gpu/drm/drm_trace.h | 6 ++--- drivers/gpu/drm/i915/i915_trace.h | 40 +++++++++++++++++++------------------- 2 files changed, 23 insertions(+), 23 deletions(-)
drivers/gpu/drm/drm_trace.h +3 -3
@@ -22,7 +22,7 @@ TRACE_EVENT(drm_vblank_event, __entry->seq = seq; ), TP_printk("crtc=%d, seq=%d", __entry->crtc, __entry->seq) -); +) TRACE_EVENT(drm_vblank_event_queued, TP_PROTO(pid_t pid, int crtc, unsigned int seq),
@@ -39,7 +39,7 @@ TRACE_EVENT(drm_vblank_event_queued, ), TP_printk("pid=%d, crtc=%d, seq=%d", __entry->pid, __entry->crtc, \ __entry->seq) -); +) TRACE_EVENT(drm_vblank_event_delivered, TP_PROTO(pid_t pid, int crtc, unsigned int seq),
@@ -56,7 +56,7 @@ TRACE_EVENT(drm_vblank_event_delivered, ), TP_printk("pid=%d, crtc=%d, seq=%d", __entry->pid, __entry->crtc, \ __entry->seq) -); +)#endif /* _DRM_TRACE_H_ */
drivers/gpu/drm/i915/i915_trace.h +20 -20
@@ -31,7 +31,7 @@ TRACE_EVENT(i915_gem_object_create, ), TP_printk("obj=%p, size=%u", __entry->obj, __entry->size) -); +) TRACE_EVENT(i915_gem_object_bind,
@@ -51,7 +51,7 @@ TRACE_EVENT(i915_gem_object_bind, TP_printk("obj=%p, gtt_offset=%08x", __entry->obj, __entry->gtt_offset) -); +) TRACE_EVENT(i915_gem_object_change_domain,
@@ -74,7 +74,7 @@ TRACE_EVENT(i915_gem_object_change_domai TP_printk("obj=%p, read=%04x, write=%04x", __entry->obj, __entry->read_domains, __entry->write_domain) -); +) TRACE_EVENT(i915_gem_object_get_fence,
@@ -96,7 +96,7 @@ TRACE_EVENT(i915_gem_object_get_fence, TP_printk("obj=%p, fence=%d, tiling=%d", __entry->obj, __entry->fence, __entry->tiling_mode) -); +) DECLARE_EVENT_CLASS(i915_gem_object,
@@ -113,28 +113,28 @@ DECLARE_EVENT_CLASS(i915_gem_object, ), TP_printk("obj=%p", __entry->obj) -); +) DEFINE_EVENT(i915_gem_object, i915_gem_object_clflush, TP_PROTO(struct drm_gem_object *obj), TP_ARGS(obj) -); +) DEFINE_EVENT(i915_gem_object, i915_gem_object_unbind, TP_PROTO(struct drm_gem_object *obj), TP_ARGS(obj) -); +)DEFINE_EVENT (i915_gem_object, i915_gem_object_destroy, TP_PROTO(struct drm_gem_object *obj),TP_ARGS (obj) -); +)/* batch tracing */
@@ -156,7 +156,7 @@ TRACE_EVENT(i915_gem_request_submit, ), TP_printk("dev=%u, seqno=%u", __entry->dev, __entry->seqno) -); +) TRACE_EVENT(i915_gem_request_flush,
@@ -182,7 +182,7 @@ TRACE_EVENT(i915_gem_request_flush, TP_printk("dev=%u, seqno=%u, flush=%04x, invalidate=%04x", __entry->dev, __entry->seqno, __entry->flush_domains, __entry->invalidate_domains) -); +) DECLARE_EVENT_CLASS(i915_gem_request,
@@ -201,35 +201,35 @@ DECLARE_EVENT_CLASS(i915_gem_request, ), TP_printk("dev=%u, seqno=%u", __entry->dev, __entry->seqno) -); +) DEFINE_EVENT(i915_gem_request, i915_gem_request_complete, TP_PROTO(struct drm_device *dev, u32 seqno), TP_ARGS(dev, seqno) -); +) DEFINE_EVENT(i915_gem_request, i915_gem_request_retire, TP_PROTO(struct drm_device *dev, u32 seqno), TP_ARGS(dev, seqno) -); +) DEFINE_EVENT(i915_gem_request, i915_gem_request_wait_begin, TP_PROTO(struct drm_device *dev, u32 seqno), TP_ARGS(dev, seqno) -); +) DEFINE_EVENT(i915_gem_request, i915_gem_request_wait_end, TP_PROTO(struct drm_device *dev, u32 seqno), TP_ARGS(dev, seqno) -); +) DECLARE_EVENT_CLASS(i915_ring,
@@ -246,21 +246,21 @@ DECLARE_EVENT_CLASS(i915_ring, ), TP_printk("dev=%u", __entry->dev) -); +) DEFINE_EVENT(i915_ring, i915_ring_wait_begin, TP_PROTO(struct drm_device *dev), TP_ARGS(dev) -); +) DEFINE_EVENT(i915_ring, i915_ring_wait_end, TP_PROTO(struct drm_device *dev), TP_ARGS(dev) -); +) TRACE_EVENT(i915_flip_request, TP_PROTO(int plane, struct drm_gem_object *obj),
@@ -278,7 +278,7 @@ TRACE_EVENT(i915_flip_request, ), TP_printk("plane=%d, obj=%p", __entry->plane, __entry->obj) -); +) TRACE_EVENT(i915_flip_complete, TP_PROTO(int plane, struct drm_gem_object *obj),
@@ -296,7 +296,7 @@ TRACE_EVENT(i915_flip_complete, ), TP_printk("plane=%d, obj=%p", __entry->plane, __entry->obj) -); +)#endif /* _I915_TRACE_H_ */
Mathieu Desnoyers
reviewerRFC PATCH 27/28 trace event fs remove semicolons
In reply to Mathieu DesnoyersPart of the gradual TRACE_EVENT() semicolon removal. Enables creation of array of events, thus saving space for trace event probes. Remove extra trailing semicolons at the end of XFS and GFS2 trace event declarations.
Signed-off-by Mathieu Desnoyers <[email protected]>
CC Steven Rostedt <[email protected]>
CC Frederic Weisbecker <[email protected]>
CC Ingo Molnar <[email protected]>
CC Thomas Gleixner <[email protected]>
CC Steven Whitehouse <[email protected]>
CC Dave Chinner <[email protected]>
CC Christoph Hellwig <[email protected]>
CC Alex Elder <[email protected]>
CC Li Zefan <[email protected]>
--- fs/gfs2/trace_gfs2.h | 26 +- fs/xfs/linux-2.6/xfs_trace.h | 513 +++++++++++++++++++++---------------------- 2 files changed, 272 insertions(+), 267 deletions(-)
fs/gfs2/trace_gfs2.h +13 -13
@@ -42,8 +42,8 @@ {(1UL << GLF_FROZEN), "F" }, \ {(1UL << GLF_QUEUED), "q" }) -#ifndef NUMPTY -#define NUMPTY +#ifndef _TRACE_GFS2_DEF_ +#define _TRACE_GFS2_DEF_ static inline u8 glock_trace_state(unsigned int state) { switch(state) {
@@ -56,7 +56,7 @@ static inline u8 glock_trace_state(unsig }return DLM_LOCK_NL ; } -#endif +#endif /* _TRACE_GFS2_DEF_ */ /* Section 1 - Locking *
@@ -105,7 +105,7 @@ TRACE_EVENT(gfs2_glock_state_change, glock_trace_name(__entry->tgt_state), glock_trace_name(__entry->dmt_state), show_glock_flags(__entry->flags)) -); +)/* State change -> unlocked, glock is being deallocated */ TRACE_EVENT(gfs2_glock_put,
@@ -137,7 +137,7 @@ TRACE_EVENT(gfs2_glock_put, glock_trace_name(DLM_LOCK_IV), show_glock_flags(__entry->flags)) -); +)/* Callback (local or remote) requesting lock demotion */ TRACE_EVENT(gfs2_demote_rq,
@@ -171,7 +171,7 @@ TRACE_EVENT(gfs2_demote_rq, glock_trace_name(__entry->dmt_state), show_glock_flags(__entry->flags)) -); +)/* Promotion/grant of a glock */ TRACE_EVENT(gfs2_promote,
@@ -201,7 +201,7 @@ TRACE_EVENT(gfs2_promote, (unsigned long long)__entry->glnum, __entry->first ? "first": "other", glock_trace_name(__entry->state)) -); +)/* Queue/dequeue a lock request */ TRACE_EVENT(gfs2_glock_queue,
@@ -231,7 +231,7 @@ TRACE_EVENT(gfs2_glock_queue, (unsigned long long )__entry->glnum, __entry->queue ?"" :"de" , glock_trace_name(__entry->state)) -); +)/* Section 2 - Log/journal *
@@ -270,7 +270,7 @@ TRACE_EVENT(gfs2_pin, (unsigned long long)__entry->block, (unsigned long)__entry->len, (unsigned long long)__entry->ino) -); +)/* Flushing the log */ TRACE_EVENT(gfs2_log_flush,
@@ -295,7 +295,7 @@ TRACE_EVENT(gfs2_log_flush, MAJOR(__entry->dev), MINOR(__entry->dev), __entry->start ? "start" : "end", (unsigned long long)__entry->log_seq) -); +)/* Reserving/releasing blocks in the log */ TRACE_EVENT(gfs2_log_blocks,
@@ -316,7 +316,7 @@ TRACE_EVENT(gfs2_log_blocks,TP_printk ("%u,%u log reserve %d" ,MAJOR (__entry->dev),MINOR (__entry->dev), __entry->blocks) -); +)/* Section 3 - bmap *
@@ -364,7 +364,7 @@ TRACE_EVENT(gfs2_bmap, (unsigned long long)__entry->pblock, __entry->state, __entry->create ? "create " : "nocreate", __entry->errno) -); +)/* Keep track of blocks as they are allocated/freed */ TRACE_EVENT(gfs2_block_alloc,
@@ -396,7 +396,7 @@ TRACE_EVENT(gfs2_block_alloc, (unsigned long long)__entry->start, (unsigned long)__entry->len, block_state_name(__entry->block_state)) -); +)#endif /* _TRACE_GFS2_H */
fs/xfs/linux-2.6/xfs_trace.h +259 -254
757 lines not on this page · raw message
Re: [RFC patch 27/28] trace event fs remove semicolons
Quoted 3 lines · Mathieu Desnoyers
Part of the gradual
TRACE_EVENT()semicolon removal. Enables creation of array of events, thus saving space for trace event probes. Remove extra trailing semicolons at the end of XFS and GFS2 trace event declarations.
Can you split the patch in to a separate XFs and GFS2 patches (similar to the ext4-only patch) so we can take it through the XFS tree as needed?
Cheers,
Dave.
Signature · 2 lines
Dave Chinner [email protected]
Mathieu Desnoyers
reviewerRe: [RFC patch 27/28] trace event fs remove semicolons
Quoted 8 lines · * Dave Chinner ([email protected]) wrote:
Quoted 3 lines · Mathieu Desnoyers
Part of the gradual
TRACE_EVENT()semicolon removal. Enables creation of array of events, thus saving space for trace event probes. Remove extra trailing semicolons at the end of XFS and GFS2 trace event declarations.Can you split the patch in to a separate XFs and GFS2 patches (similar to the ext4-only patch) so we can take it through the XFS tree as needed?
Sure, here we go!
First patch, for XFS:
trace event xfs remove semicolons
Part of the gradual TRACE_EVENT() semicolon removal. Enables creation of array of events, thus saving space for trace event probes. Remove extra trailing semicolons at the end of XFS and GFS2 trace event declarations.
Signed-off-by Mathieu Desnoyers <[email protected]>
CC Steven Rostedt <[email protected]>
CC Frederic Weisbecker <[email protected]>
CC Ingo Molnar <[email protected]>
CC Thomas Gleixner <[email protected]>
CC Dave Chinner <[email protected]>
CC Christoph Hellwig <[email protected]>
CC Alex Elder <[email protected]>
CC Li Zefan <[email protected]>
--- fs/gfs2/trace_gfs2.h | 26 +- fs/xfs/linux-2.6/xfs_trace.h | 513 +++++++++++++++++++++---------------------- 2 files changed, 272 insertions(+), 267 deletions(-)
fs/xfs/linux-2.6/xfs_trace.h +259 -254
@@ -23,6 +23,9 @@#include <linux/tracepoint.h> +#ifndef _TRACE_XFS_DEF_ +#define _TRACE_XFS_DEF_ +struct xfs_agf ;struct xfs_alloc_arg ;struct xfs_attr_list_context ;
@@ -37,6 +40,8 @@ struct xlog_recover_item;struct xfs_buf_log_format ;struct xfs_inode_log_format ; +#endif /* _TRACE_XFS_DEF_ */ + DECLARE_EVENT_CLASS(xfs_attr_list_class, TP_PROTO(struct xfs_attr_list_context *ctx), TP_ARGS(ctx),
@@ -86,14 +91,14 @@ DECLARE_EVENT_CLASS(xfs_attr_list_class,DEFINE_EVENT (xfs_attr_list_class, name, \ TP_PROTO(struct xfs_attr_list_context *ctx), \ TP_ARGS(ctx)) -DEFINE_ATTR_LIST_EVENT (xfs_attr_list_sf); -DEFINE_ATTR_LIST_EVENT (xfs_attr_list_sf_all); -DEFINE_ATTR_LIST_EVENT (xfs_attr_list_leaf); -DEFINE_ATTR_LIST_EVENT (xfs_attr_list_leaf_end); -DEFINE_ATTR_LIST_EVENT (xfs_attr_list_full); -DEFINE_ATTR_LIST_EVENT (xfs_attr_list_add); -DEFINE_ATTR_LIST_EVENT (xfs_attr_list_wrong_blk); -DEFINE_ATTR_LIST_EVENT (xfs_attr_list_notfound); +DEFINE_ATTR_LIST_EVENT(xfs_attr_list_sf) +DEFINE_ATTR_LIST_EVENT(xfs_attr_list_sf_all) +DEFINE_ATTR_LIST_EVENT(xfs_attr_list_leaf) +DEFINE_ATTR_LIST_EVENT(xfs_attr_list_leaf_end) +DEFINE_ATTR_LIST_EVENT(xfs_attr_list_full) +DEFINE_ATTR_LIST_EVENT(xfs_attr_list_add) +DEFINE_ATTR_LIST_EVENT(xfs_attr_list_wrong_blk) +DEFINE_ATTR_LIST_EVENT(xfs_attr_list_notfound) DECLARE_EVENT_CLASS(xfs_perag_class, TP_PROTO(struct xfs_mount *mp, xfs_agnumber_t agno, int refcount,
@@ -116,18 +121,18 @@ DECLARE_EVENT_CLASS(xfs_perag_class, __entry->agno, __entry->refcount, (char *)__entry->caller_ip) -); +)#define DEFINE_PERAG_REF_EVENT (name) \ DEFINE_EVENT(xfs_perag_class, name, \ TP_PROTO(struct xfs_mount *mp, xfs_agnumber_t agno, int refcount, \ unsigned long caller_ip), \ TP_ARGS(mp, agno, refcount, caller_ip)) -DEFINE_PERAG_REF_EVENT (xfs_perag_get); -DEFINE_PERAG_REF_EVENT (xfs_perag_get_tag); -DEFINE_PERAG_REF_EVENT (xfs_perag_put); -DEFINE_PERAG_REF_EVENT (xfs_perag_set_reclaim); -DEFINE_PERAG_REF_EVENT (xfs_perag_clear_reclaim); +DEFINE_PERAG_REF_EVENT(xfs_perag_get) +DEFINE_PERAG_REF_EVENT(xfs_perag_get_tag) +DEFINE_PERAG_REF_EVENT(xfs_perag_put) +DEFINE_PERAG_REF_EVENT(xfs_perag_set_reclaim) +DEFINE_PERAG_REF_EVENT(xfs_perag_clear_reclaim) TRACE_EVENT(xfs_attr_list_node_descend, TP_PROTO(struct xfs_attr_list_context *ctx,
@@ -179,7 +184,7 @@ TRACE_EVENT(xfs_attr_list_node_descend, __print_flags(__entry->flags, "|", XFS_ATTR_FLAGS), __entry->bt_hashval, __entry->bt_before) -); +) TRACE_EVENT(xfs_iext_insert, TP_PROTO(struct xfs_inode *ip, xfs_extnum_t idx,
@@ -218,7 +223,7 @@ TRACE_EVENT(xfs_iext_insert, __entry->blockcount, __entry->state, (char *)__entry->caller_ip) -); +) DECLARE_EVENT_CLASS(xfs_bmap_class, TP_PROTO(struct xfs_inode *ip, xfs_extnum_t idx, int state,
@@ -269,10 +274,10 @@ DEFINE_EVENT(xfs_bmap_class, name, \ TP_PROTO(struct xfs_inode *ip, xfs_extnum_t idx, int state, \ unsigned long caller_ip), \ TP_ARGS(ip, idx, state, caller_ip)) -DEFINE_BMAP_EVENT(xfs_iext_remove); -DEFINE_BMAP_EVENT (xfs_bmap_pre_update); -DEFINE_BMAP_EVENT (xfs_bmap_post_update); -DEFINE_BMAP_EVENT (xfs_extlist); +DEFINE_BMAP_EVENT(xfs_iext_remove) +DEFINE_BMAP_EVENT(xfs_bmap_pre_update) +DEFINE_BMAP_EVENT(xfs_bmap_post_update) +DEFINE_BMAP_EVENT(xfs_extlist) DECLARE_EVENT_CLASS(xfs_buf_class, TP_PROTO(struct xfs_buf *bp, unsigned long caller_ip),
@@ -313,37 +318,37 @@ DECLARE_EVENT_CLASS(xfs_buf_class,DEFINE_EVENT (xfs_buf_class, name, \ TP_PROTO(struct xfs_buf *bp, unsigned long caller_ip), \ TP_ARGS(bp, caller_ip)) -DEFINE_BUF_EVENT (xfs_buf_init); -DEFINE_BUF_EVENT (xfs_buf_free); -DEFINE_BUF_EVENT (xfs_buf_hold); -DEFINE_BUF_EVENT (xfs_buf_rele); -DEFINE_BUF_EVENT (xfs_buf_iodone); -DEFINE_BUF_EVENT (xfs_buf_iorequest); -DEFINE_BUF_EVENT (xfs_buf_bawrite); -DEFINE_BUF_EVENT (xfs_buf_bdwrite); -DEFINE_BUF_EVENT (xfs_buf_lock); -DEFINE_BUF_EVENT (xfs_buf_lock_done); -DEFINE_BUF_EVENT (xfs_buf_cond_lock); -DEFINE_BUF_EVENT (xfs_buf_unlock); -DEFINE_BUF_EVENT (xfs_buf_iowait); -DEFINE_BUF_EVENT (xfs_buf_iowait_done); -DEFINE_BUF_EVENT (xfs_buf_delwri_queue); -DEFINE_BUF_EVENT (xfs_buf_delwri_dequeue); -DEFINE_BUF_EVENT (xfs_buf_delwri_split); -DEFINE_BUF_EVENT (xfs_buf_get_uncached); -DEFINE_BUF_EVENT (xfs_bdstrat_shut); -DEFINE_BUF_EVENT (xfs_buf_item_relse); -DEFINE_BUF_EVENT (xfs_buf_item_iodone); -DEFINE_BUF_EVENT (xfs_buf_item_iodone_async); -DEFINE_BUF_EVENT (xfs_buf_error_relse); -DEFINE_BUF_EVENT (xfs_trans_read_buf_io); -DEFINE_BUF_EVENT (xfs_trans_read_buf_shut); +DEFINE_BUF_EVENT(xfs_buf_init) +DEFINE_BUF_EVENT(xfs_buf_free) +DEFINE_BUF_EVENT(xfs_buf_hold) +DEFINE_BUF_EVENT(xfs_buf_rele) +DEFINE_BUF_EVENT(xfs_buf_iodone) +DEFINE_BUF_EVENT(xfs_buf_iorequest) +DEFINE_BUF_EVENT(xfs_buf_bawrite) +DEFINE_BUF_EVENT(xfs_buf_bdwrite) +DEFINE_BUF_EVENT(xfs_buf_lock) +DEFINE_BUF_EVENT(xfs_buf_lock_done) +DEFINE_BUF_EVENT(xfs_buf_cond_lock) +DEFINE_BUF_EVENT(xfs_buf_unlock) +DEFINE_BUF_EVENT(xfs_buf_iowait) +DEFINE_BUF_EVENT(xfs_buf_iowait_done) +DEFINE_BUF_EVENT(xfs_buf_delwri_queue) +DEFINE_BUF_EVENT(xfs_buf_delwri_dequeue) +DEFINE_BUF_EVENT(xfs_buf_delwri_split) +DEFINE_BUF_EVENT(xfs_buf_get_uncached) +DEFINE_BUF_EVENT(xfs_bdstrat_shut) +DEFINE_BUF_EVENT(xfs_buf_item_relse) +DEFINE_BUF_EVENT(xfs_buf_item_iodone) +DEFINE_BUF_EVENT(xfs_buf_item_iodone_async) +DEFINE_BUF_EVENT(xfs_buf_error_relse) +DEFINE_BUF_EVENT(xfs_trans_read_buf_io) +DEFINE_BUF_EVENT(xfs_trans_read_buf_shut) /* not really buffer traces, but the buf provides useful information */ -DEFINE_BUF_EVENT (xfs_btree_corrupt); -DEFINE_BUF_EVENT (xfs_da_btree_corrupt); -DEFINE_BUF_EVENT (xfs_reset_dqcounts); -DEFINE_BUF_EVENT (xfs_inode_item_push); +DEFINE_BUF_EVENT(xfs_btree_corrupt) +DEFINE_BUF_EVENT(xfs_da_btree_corrupt) +DEFINE_BUF_EVENT(xfs_reset_dqcounts) +DEFINE_BUF_EVENT(xfs_inode_item_push) /* pass flags explicitly */ DECLARE_EVENT_CLASS(xfs_buf_flags_class,
@@ -385,9 +390,9 @@ DECLARE_EVENT_CLASS(xfs_buf_flags_class,DEFINE_EVENT (xfs_buf_flags_class, name, \ TP_PROTO(struct xfs_buf *bp, unsigned flags, unsigned long caller_ip), \ TP_ARGS(bp, flags, caller_ip)) -DEFINE_BUF_FLAGS_EVENT (xfs_buf_find); -DEFINE_BUF_FLAGS_EVENT (xfs_buf_get); -DEFINE_BUF_FLAGS_EVENT (xfs_buf_read); +DEFINE_BUF_FLAGS_EVENT(xfs_buf_find) +DEFINE_BUF_FLAGS_EVENT(xfs_buf_get) +DEFINE_BUF_FLAGS_EVENT(xfs_buf_read) TRACE_EVENT(xfs_buf_ioerror, TP_PROTO(struct xfs_buf *bp, int error, unsigned long caller_ip),
@@ -425,7 +430,7 @@ TRACE_EVENT(xfs_buf_ioerror, __entry->error, __print_flags(__entry->flags, "|", XFS_BUF_FLAGS), (void *)__entry->caller_ip) -); +) DECLARE_EVENT_CLASS(xfs_buf_item_class, TP_PROTO(struct xfs_buf_log_item *bip),
@@ -479,31 +484,31 @@ DECLARE_EVENT_CLASS(xfs_buf_item_class,DEFINE_EVENT (xfs_buf_item_class, name, \ TP_PROTO(struct xfs_buf_log_item *bip), \ TP_ARGS(bip)) -DEFINE_BUF_ITEM_EVENT (xfs_buf_item_size); -DEFINE_BUF_ITEM_EVENT (xfs_buf_item_size_stale); -DEFINE_BUF_ITEM_EVENT (xfs_buf_item_format); -DEFINE_BUF_ITEM_EVENT (xfs_buf_item_format_stale); -DEFINE_BUF_ITEM_EVENT (xfs_buf_item_pin); -DEFINE_BUF_ITEM_EVENT (xfs_buf_item_unpin); -DEFINE_BUF_ITEM_EVENT (xfs_buf_item_unpin_stale); -DEFINE_BUF_ITEM_EVENT (xfs_buf_item_trylock); -DEFINE_BUF_ITEM_EVENT (xfs_buf_item_unlock); -DEFINE_BUF_ITEM_EVENT (xfs_buf_item_unlock_stale); -DEFINE_BUF_ITEM_EVENT (xfs_buf_item_committed); -DEFINE_BUF_ITEM_EVENT (xfs_buf_item_push); -DEFINE_BUF_ITEM_EVENT (xfs_buf_item_pushbuf); -DEFINE_BUF_ITEM_EVENT (xfs_trans_get_buf); -DEFINE_BUF_ITEM_EVENT (xfs_trans_get_buf_recur); -DEFINE_BUF_ITEM_EVENT (xfs_trans_getsb); -DEFINE_BUF_ITEM_EVENT (xfs_trans_getsb_recur); -DEFINE_BUF_ITEM_EVENT (xfs_trans_read_buf); -DEFINE_BUF_ITEM_EVENT (xfs_trans_read_buf_recur); -DEFINE_BUF_ITEM_EVENT (xfs_trans_log_buf); -DEFINE_BUF_ITEM_EVENT (xfs_trans_brelse); -DEFINE_BUF_ITEM_EVENT (xfs_trans_bjoin); -DEFINE_BUF_ITEM_EVENT (xfs_trans_bhold); -DEFINE_BUF_ITEM_EVENT (xfs_trans_bhold_release); -DEFINE_BUF_ITEM_EVENT (xfs_trans_binval); +DEFINE_BUF_ITEM_EVENT(xfs_buf_item_size) +DEFINE_BUF_ITEM_EVENT(xfs_buf_item_size_stale) +DEFINE_BUF_ITEM_EVENT(xfs_buf_item_format) +DEFINE_BUF_ITEM_EVENT(xfs_buf_item_format_stale) +DEFINE_BUF_ITEM_EVENT(xfs_buf_item_pin) +DEFINE_BUF_ITEM_EVENT(xfs_buf_item_unpin) +DEFINE_BUF_ITEM_EVENT(xfs_buf_item_unpin_stale) +DEFINE_BUF_ITEM_EVENT(xfs_buf_item_trylock) +DEFINE_BUF_ITEM_EVENT(xfs_buf_item_unlock) +DEFINE_BUF_ITEM_EVENT(xfs_buf_item_unlock_stale) +DEFINE_BUF_ITEM_EVENT(xfs_buf_item_committed) +DEFINE_BUF_ITEM_EVENT(xfs_buf_item_push) +DEFINE_BUF_ITEM_EVENT(xfs_buf_item_pushbuf) +DEFINE_BUF_ITEM_EVENT(xfs_trans_get_buf) +DEFINE_BUF_ITEM_EVENT(xfs_trans_get_buf_recur) +DEFINE_BUF_ITEM_EVENT(xfs_trans_getsb) +DEFINE_BUF_ITEM_EVENT(xfs_trans_getsb_recur) +DEFINE_BUF_ITEM_EVENT(xfs_trans_read_buf) +DEFINE_BUF_ITEM_EVENT(xfs_trans_read_buf_recur) +DEFINE_BUF_ITEM_EVENT(xfs_trans_log_buf) +DEFINE_BUF_ITEM_EVENT(xfs_trans_brelse) +DEFINE_BUF_ITEM_EVENT(xfs_trans_bjoin) +DEFINE_BUF_ITEM_EVENT(xfs_trans_bhold) +DEFINE_BUF_ITEM_EVENT(xfs_trans_bhold_release) +DEFINE_BUF_ITEM_EVENT(xfs_trans_binval) DECLARE_EVENT_CLASS(xfs_lock_class, TP_PROTO(struct xfs_inode *ip, unsigned lock_flags,
@@ -558,32 +563,32 @@ DECLARE_EVENT_CLASS(xfs_inode_class,DEFINE_EVENT (xfs_inode_class, name, \ TP_PROTO(struct xfs_inode *ip), \ TP_ARGS(ip)) -DEFINE_INODE_EVENT (xfs_iget_skip); -DEFINE_INODE_EVENT (xfs_iget_reclaim); -DEFINE_INODE_EVENT (xfs_iget_reclaim_fail); -DEFINE_INODE_EVENT (xfs_iget_hit); -DEFINE_INODE_EVENT (xfs_iget_miss); - -DEFINE_INODE_EVENT (xfs_getattr); -DEFINE_INODE_EVENT (xfs_setattr); -DEFINE_INODE_EVENT (xfs_readlink); -DEFINE_INODE_EVENT (xfs_alloc_file_space); -DEFINE_INODE_EVENT (xfs_free_file_space); -DEFINE_INODE_EVENT (xfs_readdir); +DEFINE_INODE_EVENT(xfs_iget_skip) +DEFINE_INODE_EVENT(xfs_iget_reclaim) +DEFINE_INODE_EVENT(xfs_iget_reclaim_fail) +DEFINE_INODE_EVENT(xfs_iget_hit) +DEFINE_INODE_EVENT(xfs_iget_miss) + +DEFINE_INODE_EVENT(xfs_getattr) +DEFINE_INODE_EVENT(xfs_setattr) +DEFINE_INODE_EVENT(xfs_readlink) +DEFINE_INODE_EVENT(xfs_alloc_file_space) +DEFINE_INODE_EVENT(xfs_free_file_space) +DEFINE_INODE_EVENT(xfs_readdir) #ifdef CONFIG_XFS_POSIX_ACL -DEFINE_INODE_EVENT (xfs_check_acl); +DEFINE_INODE_EVENT(xfs_check_acl) #endif -DEFINE_INODE_EVENT (xfs_vm_bmap); -DEFINE_INODE_EVENT (xfs_file_ioctl); -DEFINE_INODE_EVENT (xfs_file_compat_ioctl); -DEFINE_INODE_EVENT (xfs_ioctl_setattr); -DEFINE_INODE_EVENT (xfs_file_fsync); -DEFINE_INODE_EVENT (xfs_destroy_inode); -DEFINE_INODE_EVENT (xfs_write_inode); -DEFINE_INODE_EVENT (xfs_evict_inode); +DEFINE_INODE_EVENT(xfs_vm_bmap) +DEFINE_INODE_EVENT(xfs_file_ioctl) +DEFINE_INODE_EVENT(xfs_file_compat_ioctl) +DEFINE_INODE_EVENT(xfs_ioctl_setattr) +DEFINE_INODE_EVENT(xfs_file_fsync) +DEFINE_INODE_EVENT(xfs_destroy_inode) +DEFINE_INODE_EVENT(xfs_write_inode) +DEFINE_INODE_EVENT(xfs_evict_inode) -DEFINE_INODE_EVENT (xfs_dquot_dqalloc); -DEFINE_INODE_EVENT (xfs_dquot_dqdetach); +DEFINE_INODE_EVENT(xfs_dquot_dqalloc) +DEFINE_INODE_EVENT(xfs_dquot_dqdetach) DECLARE_EVENT_CLASS(xfs_iref_class, TP_PROTO(struct xfs_inode *ip, unsigned long caller_ip),
@@ -614,11 +619,11 @@ DECLARE_EVENT_CLASS(xfs_iref_class,DEFINE_EVENT (xfs_iref_class, name, \ TP_PROTO(struct xfs_inode *ip, unsigned long caller_ip), \ TP_ARGS(ip, caller_ip)) -DEFINE_IREF_EVENT (xfs_ihold); -DEFINE_IREF_EVENT (xfs_irele); -DEFINE_IREF_EVENT (xfs_inode_pin); -DEFINE_IREF_EVENT (xfs_inode_unpin); -DEFINE_IREF_EVENT (xfs_inode_unpin_nowait); +DEFINE_IREF_EVENT(xfs_ihold) +DEFINE_IREF_EVENT(xfs_irele) +DEFINE_IREF_EVENT(xfs_inode_pin) +DEFINE_IREF_EVENT(xfs_inode_unpin) +DEFINE_IREF_EVENT(xfs_inode_unpin_nowait) DECLARE_EVENT_CLASS(xfs_namespace_class, TP_PROTO(struct xfs_inode *dp, struct xfs_name *name),
@@ -643,11 +648,11 @@ DECLARE_EVENT_CLASS(xfs_namespace_class,DEFINE_EVENT (xfs_namespace_class, name, \ TP_PROTO(struct xfs_inode *dp, struct xfs_name *name), \ TP_ARGS(dp, name)) -DEFINE_NAMESPACE_EVENT (xfs_remove); -DEFINE_NAMESPACE_EVENT (xfs_link); -DEFINE_NAMESPACE_EVENT (xfs_lookup); -DEFINE_NAMESPACE_EVENT (xfs_create); -DEFINE_NAMESPACE_EVENT (xfs_symlink); +DEFINE_NAMESPACE_EVENT(xfs_remove) +DEFINE_NAMESPACE_EVENT(xfs_link) +DEFINE_NAMESPACE_EVENT(xfs_lookup) +DEFINE_NAMESPACE_EVENT(xfs_create) +DEFINE_NAMESPACE_EVENT(xfs_symlink) TRACE_EVENT(xfs_rename, TP_PROTO(struct xfs_inode *src_dp, struct xfs_inode *target_dp,
@@ -729,31 +734,31 @@ DECLARE_EVENT_CLASS(xfs_dquot_class,DEFINE_EVENT (xfs_dquot_class, name, \ TP_PROTO(struct xfs_dquot *dqp), \ TP_ARGS(dqp)) -DEFINE_DQUOT_EVENT (xfs_dqadjust); -DEFINE_DQUOT_EVENT (xfs_dqreclaim_want); -DEFINE_DQUOT_EVENT (xfs_dqreclaim_dirty); -DEFINE_DQUOT_EVENT (xfs_dqreclaim_unlink); -DEFINE_DQUOT_EVENT (xfs_dqattach_found); -DEFINE_DQUOT_EVENT (xfs_dqattach_get); -DEFINE_DQUOT_EVENT (xfs_dqinit); -DEFINE_DQUOT_EVENT (xfs_dqreuse); -DEFINE_DQUOT_EVENT (xfs_dqalloc); -DEFINE_DQUOT_EVENT (xfs_dqtobp_read); -DEFINE_DQUOT_EVENT (xfs_dqread); -DEFINE_DQUOT_EVENT (xfs_dqread_fail); -DEFINE_DQUOT_EVENT (xfs_dqlookup_found); -DEFINE_DQUOT_EVENT (xfs_dqlookup_want); -DEFINE_DQUOT_EVENT (xfs_dqlookup_freelist); -DEFINE_DQUOT_EVENT (xfs_dqlookup_done); -DEFINE_DQUOT_EVENT (xfs_dqget_hit); -DEFINE_DQUOT_EVENT (xfs_dqget_miss); -DEFINE_DQUOT_EVENT (xfs_dqput); -DEFINE_DQUOT_EVENT (xfs_dqput_wait); -DEFINE_DQUOT_EVENT (xfs_dqput_free); -DEFINE_DQUOT_EVENT (xfs_dqrele); -DEFINE_DQUOT_EVENT (xfs_dqflush); -DEFINE_DQUOT_EVENT (xfs_dqflush_force); -DEFINE_DQUOT_EVENT (xfs_dqflush_done); +DEFINE_DQUOT_EVENT(xfs_dqadjust) +DEFINE_DQUOT_EVENT(xfs_dqreclaim_want) +DEFINE_DQUOT_EVENT(xfs_dqreclaim_dirty) +DEFINE_DQUOT_EVENT(xfs_dqreclaim_unlink) +DEFINE_DQUOT_EVENT(xfs_dqattach_found) +DEFINE_DQUOT_EVENT(xfs_dqattach_get) +DEFINE_DQUOT_EVENT(xfs_dqinit) +DEFINE_DQUOT_EVENT(xfs_dqreuse) +DEFINE_DQUOT_EVENT(xfs_dqalloc) +DEFINE_DQUOT_EVENT(xfs_dqtobp_read) +DEFINE_DQUOT_EVENT(xfs_dqread) +DEFINE_DQUOT_EVENT(xfs_dqread_fail) +DEFINE_DQUOT_EVENT(xfs_dqlookup_found) +DEFINE_DQUOT_EVENT(xfs_dqlookup_want) +DEFINE_DQUOT_EVENT(xfs_dqlookup_freelist) +DEFINE_DQUOT_EVENT(xfs_dqlookup_done) +DEFINE_DQUOT_EVENT(xfs_dqget_hit) +DEFINE_DQUOT_EVENT(xfs_dqget_miss) +DEFINE_DQUOT_EVENT(xfs_dqput) +DEFINE_DQUOT_EVENT(xfs_dqput_wait) +DEFINE_DQUOT_EVENT(xfs_dqput_free) +DEFINE_DQUOT_EVENT(xfs_dqrele) +DEFINE_DQUOT_EVENT(xfs_dqflush) +DEFINE_DQUOT_EVENT(xfs_dqflush_force) +DEFINE_DQUOT_EVENT(xfs_dqflush_done) DECLARE_EVENT_CLASS(xfs_loggrant_class, TP_PROTO(struct log *log, struct xlog_ticket *tic),
@@ -824,30 +829,30 @@ DECLARE_EVENT_CLASS(xfs_loggrant_class,DEFINE_EVENT (xfs_loggrant_class, name, \ TP_PROTO(struct log *log, struct xlog_ticket *tic), \ TP_ARGS(log, tic)) -DEFINE_LOGGRANT_EVENT (xfs_log_done_nonperm); -DEFINE_LOGGRANT_EVENT (xfs_log_done_perm); -DEFINE_LOGGRANT_EVENT (xfs_log_reserve); -DEFINE_LOGGRANT_EVENT (xfs_log_umount_write); -DEFINE_LOGGRANT_EVENT (xfs_log_grant_enter); -DEFINE_LOGGRANT_EVENT (xfs_log_grant_exit); -DEFINE_LOGGRANT_EVENT (xfs_log_grant_error); -DEFINE_LOGGRANT_EVENT (xfs_log_grant_sleep1); -DEFINE_LOGGRANT_EVENT (xfs_log_grant_wake1); -DEFINE_LOGGRANT_EVENT (xfs_log_grant_sleep2); -DEFINE_LOGGRANT_EVENT (xfs_log_grant_wake2); -DEFINE_LOGGRANT_EVENT (xfs_log_regrant_write_enter); -DEFINE_LOGGRANT_EVENT (xfs_log_regrant_write_exit); -DEFINE_LOGGRANT_EVENT (xfs_log_regrant_write_error); -DEFINE_LOGGRANT_EVENT (xfs_log_regrant_write_sleep1); -DEFINE_LOGGRANT_EVENT (xfs_log_regrant_write_wake1); -DEFINE_LOGGRANT_EVENT (xfs_log_regrant_write_sleep2); -DEFINE_LOGGRANT_EVENT (xfs_log_regrant_write_wake2); -DEFINE_LOGGRANT_EVENT (xfs_log_regrant_reserve_enter); -DEFINE_LOGGRANT_EVENT (xfs_log_regrant_reserve_exit); -DEFINE_LOGGRANT_EVENT (xfs_log_regrant_reserve_sub); -DEFINE_LOGGRANT_EVENT (xfs_log_ungrant_enter); -DEFINE_LOGGRANT_EVENT (xfs_log_ungrant_exit); -DEFINE_LOGGRANT_EVENT (xfs_log_ungrant_sub); +DEFINE_LOGGRANT_EVENT(xfs_log_done_nonperm) +DEFINE_LOGGRANT_EVENT(xfs_log_done_perm) +DEFINE_LOGGRANT_EVENT(xfs_log_reserve) +DEFINE_LOGGRANT_EVENT(xfs_log_umount_write) +DEFINE_LOGGRANT_EVENT(xfs_log_grant_enter) +DEFINE_LOGGRANT_EVENT(xfs_log_grant_exit) +DEFINE_LOGGRANT_EVENT(xfs_log_grant_error) +DEFINE_LOGGRANT_EVENT(xfs_log_grant_sleep1) +DEFINE_LOGGRANT_EVENT(xfs_log_grant_wake1) +DEFINE_LOGGRANT_EVENT(xfs_log_grant_sleep2) +DEFINE_LOGGRANT_EVENT(xfs_log_grant_wake2) +DEFINE_LOGGRANT_EVENT(xfs_log_regrant_write_enter) +DEFINE_LOGGRANT_EVENT(xfs_log_regrant_write_exit) +DEFINE_LOGGRANT_EVENT(xfs_log_regrant_write_error) +DEFINE_LOGGRANT_EVENT(xfs_log_regrant_write_sleep1) +DEFINE_LOGGRANT_EVENT(xfs_log_regrant_write_wake1) +DEFINE_LOGGRANT_EVENT(xfs_log_regrant_write_sleep2) +DEFINE_LOGGRANT_EVENT(xfs_log_regrant_write_wake2) +DEFINE_LOGGRANT_EVENT(xfs_log_regrant_reserve_enter) +DEFINE_LOGGRANT_EVENT(xfs_log_regrant_reserve_exit) +DEFINE_LOGGRANT_EVENT(xfs_log_regrant_reserve_sub) +DEFINE_LOGGRANT_EVENT(xfs_log_ungrant_enter) +DEFINE_LOGGRANT_EVENT(xfs_log_ungrant_exit) +DEFINE_LOGGRANT_EVENT(xfs_log_ungrant_sub) DECLARE_EVENT_CLASS(xfs_file_class, TP_PROTO(struct xfs_inode *ip, size_t count, loff_t offset, int flags),
@@ -885,11 +890,11 @@ DECLARE_EVENT_CLASS(xfs_file_class,DEFINE_EVENT (xfs_file_class, name, \ TP_PROTO(struct xfs_inode *ip, size_t count, loff_t offset, int flags), \ TP_ARGS(ip, count, offset, flags)) -DEFINE_RW_EVENT (xfs_file_read); -DEFINE_RW_EVENT (xfs_file_buffered_write); -DEFINE_RW_EVENT (xfs_file_direct_write); -DEFINE_RW_EVENT (xfs_file_splice_read); -DEFINE_RW_EVENT (xfs_file_splice_write); +DEFINE_RW_EVENT(xfs_file_read) +DEFINE_RW_EVENT(xfs_file_buffered_write) +DEFINE_RW_EVENT(xfs_file_direct_write) +DEFINE_RW_EVENT(xfs_file_splice_read) +DEFINE_RW_EVENT(xfs_file_splice_write) DECLARE_EVENT_CLASS(xfs_page_class, TP_PROTO(struct inode *inode, struct page *page, unsigned long off),
@@ -931,9 +936,9 @@ DECLARE_EVENT_CLASS(xfs_page_class,DEFINE_EVENT (xfs_page_class, name, \ TP_PROTO(struct inode *inode, struct page *page, unsigned long off), \ TP_ARGS(inode, page, off)) -DEFINE_PAGE_EVENT (xfs_writepage); -DEFINE_PAGE_EVENT (xfs_releasepage); -DEFINE_PAGE_EVENT (xfs_invalidatepage); +DEFINE_PAGE_EVENT(xfs_writepage) +DEFINE_PAGE_EVENT(xfs_releasepage) +DEFINE_PAGE_EVENT(xfs_invalidatepage) DECLARE_EVENT_CLASS(xfs_iomap_class, TP_PROTO(struct xfs_inode *ip, xfs_off_t offset, ssize_t count,
@@ -983,9 +988,9 @@ DEFINE_EVENT(xfs_iomap_class, name, \ TP_PROTO(struct xfs_inode *ip, xfs_off_t offset, ssize_t count, \ int flags, struct xfs_bmbt_irec *irec), \ TP_ARGS(ip, offset, count, flags, irec)) -DEFINE_IOMAP_EVENT(xfs_iomap_enter); -DEFINE_IOMAP_EVENT (xfs_iomap_found); -DEFINE_IOMAP_EVENT (xfs_iomap_alloc); +DEFINE_IOMAP_EVENT(xfs_iomap_enter) +DEFINE_IOMAP_EVENT(xfs_iomap_found) +DEFINE_IOMAP_EVENT(xfs_iomap_alloc) DECLARE_EVENT_CLASS(xfs_simple_io_class, TP_PROTO(struct xfs_inode *ip, xfs_off_t offset, ssize_t count),
@@ -1014,14 +1019,14 @@ DECLARE_EVENT_CLASS(xfs_simple_io_class, __entry->new_size, __entry->offset, __entry->count) -); +)#define DEFINE_SIMPLE_IO_EVENT (name) \ DEFINE_EVENT(xfs_simple_io_class, name, \ TP_PROTO(struct xfs_inode *ip, xfs_off_t offset, ssize_t count), \ TP_ARGS(ip, offset, count)) -DEFINE_SIMPLE_IO_EVENT (xfs_delalloc_enospc); -DEFINE_SIMPLE_IO_EVENT (xfs_unwritten_convert); +DEFINE_SIMPLE_IO_EVENT(xfs_delalloc_enospc) +DEFINE_SIMPLE_IO_EVENT(xfs_unwritten_convert) TRACE_EVENT(xfs_itruncate_start,
@@ -1055,7 +1060,7 @@ TRACE_EVENT(xfs_itruncate_start, __entry->new_size, __entry->toss_start, __entry->toss_finish) -); +) DECLARE_EVENT_CLASS(xfs_itrunc_class, TP_PROTO(struct xfs_inode *ip, xfs_fsize_t new_size),
@@ -1083,8 +1088,8 @@ DECLARE_EVENT_CLASS(xfs_itrunc_class,DEFINE_EVENT (xfs_itrunc_class, name, \ TP_PROTO(struct xfs_inode *ip, xfs_fsize_t new_size), \ TP_ARGS(ip, new_size)) -DEFINE_ITRUNC_EVENT (xfs_itruncate_finish_start); -DEFINE_ITRUNC_EVENT (xfs_itruncate_finish_end); +DEFINE_ITRUNC_EVENT(xfs_itruncate_finish_start) +DEFINE_ITRUNC_EVENT(xfs_itruncate_finish_end) TRACE_EVENT(xfs_pagecache_inval, TP_PROTO(struct xfs_inode *ip, xfs_off_t start, xfs_off_t finish),
@@ -1109,7 +1114,7 @@ TRACE_EVENT(xfs_pagecache_inval, __entry->size, __entry->start, __entry->finish) -); +) TRACE_EVENT(xfs_bunmap, TP_PROTO(struct xfs_inode *ip, xfs_fileoff_t bno, xfs_filblks_t len,
@@ -1143,7 +1148,7 @@ TRACE_EVENT(xfs_bunmap, __print_flags(__entry->flags, "|", XFS_BMAPI_FLAGS), (void *)__entry->caller_ip) -); +)#define XFS_BUSY_SYNC \ { 0, "async" }, \
@@ -1180,7 +1185,7 @@ TRACE_EVENT(xfs_alloc_busy, __entry->len, __print_symbolic(__entry->sync, XFS_BUSY_SYNC)) -); +) TRACE_EVENT(xfs_alloc_unbusy, TP_PROTO(struct xfs_mount *mp, xfs_agnumber_t agno,
@@ -1203,7 +1208,7 @@ TRACE_EVENT(xfs_alloc_unbusy, __entry->agno, __entry->agbno, __entry->len) -); +)#define XFS_BUSY_STATES \ { 0, "missing" }, \
@@ -1233,7 +1238,7 @@ TRACE_EVENT(xfs_alloc_busysearch, __entry->agbno, __entry->len, __print_symbolic(__entry->found, XFS_BUSY_STATES)) -); +) TRACE_EVENT(xfs_trans_commit_lsn, TP_PROTO(struct xfs_trans *trans),
@@ -1252,7 +1257,7 @@ TRACE_EVENT(xfs_trans_commit_lsn, MAJOR(__entry->dev), MINOR(__entry->dev), __entry->tp, __entry->lsn) -); +) TRACE_EVENT(xfs_agf, TP_PROTO(struct xfs_mount *mp, struct xfs_agf *agf, int flags,
@@ -1309,7 +1314,7 @@ TRACE_EVENT(xfs_agf, __entry->freeblks, __entry->longest, (void *)__entry->caller_ip) -); +) TRACE_EVENT(xfs_free_extent, TP_PROTO(struct xfs_mount *mp, xfs_agnumber_t agno, xfs_agblock_t agbno,
@@ -1343,7 +1348,7 @@ TRACE_EVENT(xfs_free_extent, (__entry->haveright ? "both" : "left") : (__entry->haveright ? "right" : "none")) -); +) DECLARE_EVENT_CLASS(xfs_alloc_class, TP_PROTO(struct xfs_alloc_arg *args),
@@ -1419,27 +1424,27 @@ DECLARE_EVENT_CLASS(xfs_alloc_class,DEFINE_EVENT (xfs_alloc_class, name, \ TP_PROTO(struct xfs_alloc_arg *args), \ TP_ARGS(args)) -DEFINE_ALLOC_EVENT (xfs_alloc_exact_done); -DEFINE_ALLOC_EVENT (xfs_alloc_exact_error); -DEFINE_ALLOC_EVENT (xfs_alloc_near_nominleft); -DEFINE_ALLOC_EVENT (xfs_alloc_near_first); -DEFINE_ALLOC_EVENT (xfs_alloc_near_greater); -DEFINE_ALLOC_EVENT (xfs_alloc_near_lesser); -DEFINE_ALLOC_EVENT (xfs_alloc_near_error); -DEFINE_ALLOC_EVENT (xfs_alloc_size_neither); -DEFINE_ALLOC_EVENT (xfs_alloc_size_noentry); -DEFINE_ALLOC_EVENT (xfs_alloc_size_nominleft); -DEFINE_ALLOC_EVENT (xfs_alloc_size_done); -DEFINE_ALLOC_EVENT (xfs_alloc_size_error); -DEFINE_ALLOC_EVENT (xfs_alloc_small_freelist); -DEFINE_ALLOC_EVENT (xfs_alloc_small_notenough); -DEFINE_ALLOC_EVENT (xfs_alloc_small_done); -DEFINE_ALLOC_EVENT (xfs_alloc_small_error); -DEFINE_ALLOC_EVENT (xfs_alloc_vextent_badargs); -DEFINE_ALLOC_EVENT (xfs_alloc_vextent_nofix); -DEFINE_ALLOC_EVENT (xfs_alloc_vextent_noagbp); -DEFINE_ALLOC_EVENT (xfs_alloc_vextent_loopfailed); -DEFINE_ALLOC_EVENT (xfs_alloc_vextent_allfailed); +DEFINE_ALLOC_EVENT(xfs_alloc_exact_done) +DEFINE_ALLOC_EVENT(xfs_alloc_exact_error) +DEFINE_ALLOC_EVENT(xfs_alloc_near_nominleft) +DEFINE_ALLOC_EVENT(xfs_alloc_near_first) +DEFINE_ALLOC_EVENT(xfs_alloc_near_greater) +DEFINE_ALLOC_EVENT(xfs_alloc_near_lesser) +DEFINE_ALLOC_EVENT(xfs_alloc_near_error) +DEFINE_ALLOC_EVENT(xfs_alloc_size_neither) +DEFINE_ALLOC_EVENT(xfs_alloc_size_noentry) +DEFINE_ALLOC_EVENT(xfs_alloc_size_nominleft) +DEFINE_ALLOC_EVENT(xfs_alloc_size_done) +DEFINE_ALLOC_EVENT(xfs_alloc_size_error) +DEFINE_ALLOC_EVENT(xfs_alloc_small_freelist) +DEFINE_ALLOC_EVENT(xfs_alloc_small_notenough) +DEFINE_ALLOC_EVENT(xfs_alloc_small_done) +DEFINE_ALLOC_EVENT(xfs_alloc_small_error) +DEFINE_ALLOC_EVENT(xfs_alloc_vextent_badargs) +DEFINE_ALLOC_EVENT(xfs_alloc_vextent_nofix) +DEFINE_ALLOC_EVENT(xfs_alloc_vextent_noagbp) +DEFINE_ALLOC_EVENT(xfs_alloc_vextent_loopfailed) +DEFINE_ALLOC_EVENT(xfs_alloc_vextent_allfailed) DECLARE_EVENT_CLASS(xfs_dir2_class, TP_PROTO(struct xfs_da_args *args),
@@ -1479,31 +1484,31 @@ DECLARE_EVENT_CLASS(xfs_dir2_class,DEFINE_EVENT (xfs_dir2_class, name, \ TP_PROTO(struct xfs_da_args *args), \ TP_ARGS(args)) -DEFINE_DIR2_EVENT (xfs_dir2_sf_addname); -DEFINE_DIR2_EVENT (xfs_dir2_sf_create); -DEFINE_DIR2_EVENT (xfs_dir2_sf_lookup); -DEFINE_DIR2_EVENT (xfs_dir2_sf_replace); -DEFINE_DIR2_EVENT (xfs_dir2_sf_removename); -DEFINE_DIR2_EVENT (xfs_dir2_sf_toino4); -DEFINE_DIR2_EVENT (xfs_dir2_sf_toino8); -DEFINE_DIR2_EVENT (xfs_dir2_sf_to_block); -DEFINE_DIR2_EVENT (xfs_dir2_block_addname); -DEFINE_DIR2_EVENT (xfs_dir2_block_lookup); -DEFINE_DIR2_EVENT (xfs_dir2_block_replace); -DEFINE_DIR2_EVENT (xfs_dir2_block_removename); -DEFINE_DIR2_EVENT (xfs_dir2_block_to_sf); -DEFINE_DIR2_EVENT (xfs_dir2_block_to_leaf); -DEFINE_DIR2_EVENT (xfs_dir2_leaf_addname); -DEFINE_DIR2_EVENT (xfs_dir2_leaf_lookup); -DEFINE_DIR2_EVENT (xfs_dir2_leaf_replace); -DEFINE_DIR2_EVENT (xfs_dir2_leaf_removename); -DEFINE_DIR2_EVENT (xfs_dir2_leaf_to_block); -DEFINE_DIR2_EVENT (xfs_dir2_leaf_to_node); -DEFINE_DIR2_EVENT (xfs_dir2_node_addname); -DEFINE_DIR2_EVENT (xfs_dir2_node_lookup); -DEFINE_DIR2_EVENT (xfs_dir2_node_replace); -DEFINE_DIR2_EVENT (xfs_dir2_node_removename); -DEFINE_DIR2_EVENT (xfs_dir2_node_to_leaf); +DEFINE_DIR2_EVENT(xfs_dir2_sf_addname) +DEFINE_DIR2_EVENT(xfs_dir2_sf_create) +DEFINE_DIR2_EVENT(xfs_dir2_sf_lookup) +DEFINE_DIR2_EVENT(xfs_dir2_sf_replace) +DEFINE_DIR2_EVENT(xfs_dir2_sf_removename) +DEFINE_DIR2_EVENT(xfs_dir2_sf_toino4) +DEFINE_DIR2_EVENT(xfs_dir2_sf_toino8) +DEFINE_DIR2_EVENT(xfs_dir2_sf_to_block) +DEFINE_DIR2_EVENT(xfs_dir2_block_addname) +DEFINE_DIR2_EVENT(xfs_dir2_block_lookup) +DEFINE_DIR2_EVENT(xfs_dir2_block_replace) +DEFINE_DIR2_EVENT(xfs_dir2_block_removename) +DEFINE_DIR2_EVENT(xfs_dir2_block_to_sf) +DEFINE_DIR2_EVENT(xfs_dir2_block_to_leaf) +DEFINE_DIR2_EVENT(xfs_dir2_leaf_addname) +DEFINE_DIR2_EVENT(xfs_dir2_leaf_lookup) +DEFINE_DIR2_EVENT(xfs_dir2_leaf_replace) +DEFINE_DIR2_EVENT(xfs_dir2_leaf_removename) +DEFINE_DIR2_EVENT(xfs_dir2_leaf_to_block) +DEFINE_DIR2_EVENT(xfs_dir2_leaf_to_node) +DEFINE_DIR2_EVENT(xfs_dir2_node_addname) +DEFINE_DIR2_EVENT(xfs_dir2_node_lookup) +DEFINE_DIR2_EVENT(xfs_dir2_node_replace) +DEFINE_DIR2_EVENT(xfs_dir2_node_removename) +DEFINE_DIR2_EVENT(xfs_dir2_node_to_leaf) DECLARE_EVENT_CLASS(xfs_dir2_space_class, TP_PROTO(struct xfs_da_args *args, int idx),
@@ -1531,10 +1536,10 @@ DECLARE_EVENT_CLASS(xfs_dir2_space_classDEFINE_EVENT (xfs_dir2_space_class, name, \ TP_PROTO(struct xfs_da_args *args, int idx), \ TP_ARGS(args, idx)) -DEFINE_DIR2_SPACE_EVENT (xfs_dir2_leafn_add); -DEFINE_DIR2_SPACE_EVENT (xfs_dir2_leafn_remove); -DEFINE_DIR2_SPACE_EVENT (xfs_dir2_grow_inode); -DEFINE_DIR2_SPACE_EVENT (xfs_dir2_shrink_inode); +DEFINE_DIR2_SPACE_EVENT(xfs_dir2_leafn_add) +DEFINE_DIR2_SPACE_EVENT(xfs_dir2_leafn_remove) +DEFINE_DIR2_SPACE_EVENT(xfs_dir2_grow_inode) +DEFINE_DIR2_SPACE_EVENT(xfs_dir2_shrink_inode) TRACE_EVENT(xfs_dir2_leafn_moveents, TP_PROTO(struct xfs_da_args *args, int src_idx, int dst_idx, int count),
@@ -1563,7 +1568,7 @@ TRACE_EVENT(xfs_dir2_leafn_moveents, __entry->src_idx, __entry->dst_idx, __entry->count) -); +)#define XFS_SWAPEXT_INODES \ { 0, "target" }, \
@@ -1615,8 +1620,8 @@ DEFINE_EVENT(xfs_swap_extent_class, name TP_PROTO(struct xfs_inode *ip, int which), \ TP_ARGS(ip, which)) -DEFINE_SWAPEXT_EVENT(xfs_swap_extent_before); -DEFINE_SWAPEXT_EVENT (xfs_swap_extent_after); +DEFINE_SWAPEXT_EVENT(xfs_swap_extent_before) +DEFINE_SWAPEXT_EVENT(xfs_swap_extent_after) DECLARE_EVENT_CLASS(xfs_log_recover_item_class, TP_PROTO(struct log *log, struct xlog_recover *trans,
@@ -1657,11 +1662,11 @@ DEFINE_EVENT(xfs_log_recover_item_class, struct xlog_recover_item *item, int pass), \ TP_ARGS(log, trans, item, pass)) -DEFINE_LOG_RECOVER_ITEM(xfs_log_recover_item_add); -DEFINE_LOG_RECOVER_ITEM (xfs_log_recover_item_add_cont); -DEFINE_LOG_RECOVER_ITEM (xfs_log_recover_item_reorder_head); -DEFINE_LOG_RECOVER_ITEM (xfs_log_recover_item_reorder_tail); -DEFINE_LOG_RECOVER_ITEM (xfs_log_recover_item_recover); +DEFINE_LOG_RECOVER_ITEM(xfs_log_recover_item_add) +DEFINE_LOG_RECOVER_ITEM(xfs_log_recover_item_add_cont) +DEFINE_LOG_RECOVER_ITEM(xfs_log_recover_item_reorder_head) +DEFINE_LOG_RECOVER_ITEM(xfs_log_recover_item_reorder_tail) +DEFINE_LOG_RECOVER_ITEM(xfs_log_recover_item_recover) DECLARE_EVENT_CLASS(xfs_log_recover_buf_item_class, TP_PROTO(struct log *log, struct xfs_buf_log_format *buf_f),
@@ -1697,14 +1702,14 @@ DEFINE_EVENT(xfs_log_recover_buf_item_cl TP_PROTO(struct log *log, struct xfs_buf_log_format *buf_f), \ TP_ARGS(log, buf_f)) -DEFINE_LOG_RECOVER_BUF_ITEM(xfs_log_recover_buf_not_cancel); -DEFINE_LOG_RECOVER_BUF_ITEM (xfs_log_recover_buf_cancel); -DEFINE_LOG_RECOVER_BUF_ITEM (xfs_log_recover_buf_cancel_add); -DEFINE_LOG_RECOVER_BUF_ITEM (xfs_log_recover_buf_cancel_ref_inc); -DEFINE_LOG_RECOVER_BUF_ITEM (xfs_log_recover_buf_recover); -DEFINE_LOG_RECOVER_BUF_ITEM (xfs_log_recover_buf_inode_buf); -DEFINE_LOG_RECOVER_BUF_ITEM (xfs_log_recover_buf_reg_buf); -DEFINE_LOG_RECOVER_BUF_ITEM (xfs_log_recover_buf_dquot_buf); +DEFINE_LOG_RECOVER_BUF_ITEM(xfs_log_recover_buf_not_cancel) +DEFINE_LOG_RECOVER_BUF_ITEM(xfs_log_recover_buf_cancel) +DEFINE_LOG_RECOVER_BUF_ITEM(xfs_log_recover_buf_cancel_add) +DEFINE_LOG_RECOVER_BUF_ITEM(xfs_log_recover_buf_cancel_ref_inc) +DEFINE_LOG_RECOVER_BUF_ITEM(xfs_log_recover_buf_recover) +DEFINE_LOG_RECOVER_BUF_ITEM(xfs_log_recover_buf_inode_buf) +DEFINE_LOG_RECOVER_BUF_ITEM(xfs_log_recover_buf_reg_buf) +DEFINE_LOG_RECOVER_BUF_ITEM(xfs_log_recover_buf_dquot_buf) DECLARE_EVENT_CLASS(xfs_log_recover_ino_item_class, TP_PROTO(struct log *log, struct xfs_inode_log_format *in_f),
@@ -1748,9 +1753,9 @@ DEFINE_EVENT(xfs_log_recover_ino_item_cl TP_PROTO(struct log *log, struct xfs_inode_log_format *in_f), \ TP_ARGS(log, in_f)) -DEFINE_LOG_RECOVER_INO_ITEM(xfs_log_recover_inode_recover); -DEFINE_LOG_RECOVER_INO_ITEM (xfs_log_recover_inode_cancel); -DEFINE_LOG_RECOVER_INO_ITEM (xfs_log_recover_inode_skip); +DEFINE_LOG_RECOVER_INO_ITEM(xfs_log_recover_inode_recover) +DEFINE_LOG_RECOVER_INO_ITEM(xfs_log_recover_inode_cancel) +DEFINE_LOG_RECOVER_INO_ITEM(xfs_log_recover_inode_skip)#endif /* _TRACE_XFS_H */
Signature · 4 lines
Mathieu Desnoyers Operating System Efficiency R&D Consultant EfficiOS Inc. http://www.efficios.com
Mathieu Desnoyers
reviewerRe: [RFC patch 27/28] trace event fs remove semicolons
Quoted 12 lines · * Mathieu Desnoyers ([email protected]) wrote:
Quoted 8 lines · * Dave Chinner ([email protected]) wrote:
Quoted 3 lines · Mathieu Desnoyers
Part of the gradual
TRACE_EVENT()semicolon removal. Enables creation of array of events, thus saving space for trace event probes. Remove extra trailing semicolons at the end of XFS and GFS2 trace event declarations.Can you split the patch in to a separate XFs and GFS2 patches (similar to the ext4-only patch) so we can take it through the XFS tree as needed?
Sure, here we go!
Quoted 7 lines
First patch, for XFS:
trace event xfs remove semicolons
Part of the gradual
TRACE_EVENT()semicolon removal. Enables creation of array of events, thus saving space for trace event probes. Remove extra trailing semicolons at the end of XFS and GFS2 trace event declarations.
of course, this one should only state:
"semicolons at the end of XFS trace event declarations."
Quoted 821 lines
Signed-off-by Mathieu Desnoyers <[email protected]>CC Steven Rostedt <[email protected]>CC Frederic Weisbecker <[email protected]>CC Ingo Molnar <[email protected]>CC Thomas Gleixner <[email protected]>CC Dave Chinner <[email protected]>CC Christoph Hellwig <[email protected]>CC Alex Elder <[email protected]>CC Li Zefan <[email protected]>--- fs/gfs2/trace_gfs2.h | 26 +- fs/xfs/linux-2.6/xfs_trace.h | 513 +++++++++++++++++++++---------------------- 2 files changed, 272 insertions(+), 267 deletions(-)Index:
linux-2.6-lttng/fs/xfs/linux-2.6/xfs_trace.h
===================================================================fs/xfs/linux-2.6/xfs_trace.h +259
-254@@ -23,6 +23,9 @@#include <linux/tracepoint.h> +#ifndef _TRACE_XFS_DEF_ +#define _TRACE_XFS_DEF_ +struct xfs_agf ;struct xfs_alloc_arg ;struct xfs_attr_list_context ;@@ -37,6 +40,8 @@ struct xlog_recover_item;struct xfs_buf_log_format ;struct xfs_inode_log_format ; +#endif /* _TRACE_XFS_DEF_ */ + DECLARE_EVENT_CLASS(xfs_attr_list_class, TP_PROTO(struct xfs_attr_list_context *ctx), TP_ARGS(ctx),@@ -86,14 +91,14 @@ DECLARE_EVENT_CLASS(xfs_attr_list_class,DEFINE_EVENT (xfs_attr_list_class, name, \ TP_PROTO(struct xfs_attr_list_context *ctx), \ TP_ARGS(ctx)) -DEFINE_ATTR_LIST_EVENT (xfs_attr_list_sf); -DEFINE_ATTR_LIST_EVENT (xfs_attr_list_sf_all); -DEFINE_ATTR_LIST_EVENT (xfs_attr_list_leaf); -DEFINE_ATTR_LIST_EVENT (xfs_attr_list_leaf_end); -DEFINE_ATTR_LIST_EVENT (xfs_attr_list_full); -DEFINE_ATTR_LIST_EVENT (xfs_attr_list_add); -DEFINE_ATTR_LIST_EVENT (xfs_attr_list_wrong_blk); -DEFINE_ATTR_LIST_EVENT (xfs_attr_list_notfound); +DEFINE_ATTR_LIST_EVENT(xfs_attr_list_sf) +DEFINE_ATTR_LIST_EVENT(xfs_attr_list_sf_all) +DEFINE_ATTR_LIST_EVENT(xfs_attr_list_leaf) +DEFINE_ATTR_LIST_EVENT(xfs_attr_list_leaf_end) +DEFINE_ATTR_LIST_EVENT(xfs_attr_list_full) +DEFINE_ATTR_LIST_EVENT(xfs_attr_list_add) +DEFINE_ATTR_LIST_EVENT(xfs_attr_list_wrong_blk) +DEFINE_ATTR_LIST_EVENT(xfs_attr_list_notfound) DECLARE_EVENT_CLASS(xfs_perag_class, TP_PROTO(struct xfs_mount *mp, xfs_agnumber_t agno, int refcount,@@ -116,18 +121,18 @@ DECLARE_EVENT_CLASS(xfs_perag_class, __entry->agno, __entry->refcount, (char *)__entry->caller_ip) -); +)#define DEFINE_PERAG_REF_EVENT (name) \ DEFINE_EVENT(xfs_perag_class, name, \ TP_PROTO(struct xfs_mount *mp, xfs_agnumber_t agno, int refcount, \ unsigned long caller_ip), \ TP_ARGS(mp, agno, refcount, caller_ip)) -DEFINE_PERAG_REF_EVENT (xfs_perag_get); -DEFINE_PERAG_REF_EVENT (xfs_perag_get_tag); -DEFINE_PERAG_REF_EVENT (xfs_perag_put); -DEFINE_PERAG_REF_EVENT (xfs_perag_set_reclaim); -DEFINE_PERAG_REF_EVENT (xfs_perag_clear_reclaim); +DEFINE_PERAG_REF_EVENT(xfs_perag_get) +DEFINE_PERAG_REF_EVENT(xfs_perag_get_tag) +DEFINE_PERAG_REF_EVENT(xfs_perag_put) +DEFINE_PERAG_REF_EVENT(xfs_perag_set_reclaim) +DEFINE_PERAG_REF_EVENT(xfs_perag_clear_reclaim) TRACE_EVENT(xfs_attr_list_node_descend, TP_PROTO(struct xfs_attr_list_context *ctx,@@ -179,7 +184,7 @@ TRACE_EVENT(xfs_attr_list_node_descend, __print_flags(__entry->flags, "|", XFS_ATTR_FLAGS), __entry->bt_hashval, __entry->bt_before) -); +) TRACE_EVENT(xfs_iext_insert, TP_PROTO(struct xfs_inode *ip, xfs_extnum_t idx,@@ -218,7 +223,7 @@ TRACE_EVENT(xfs_iext_insert, __entry->blockcount, __entry->state, (char *)__entry->caller_ip) -); +) DECLARE_EVENT_CLASS(xfs_bmap_class, TP_PROTO(struct xfs_inode *ip, xfs_extnum_t idx, int state,@@ -269,10 +274,10 @@ DEFINE_EVENT(xfs_bmap_class, name, \ TP_PROTO(struct xfs_inode *ip, xfs_extnum_t idx, int state, \ unsigned long caller_ip), \ TP_ARGS(ip, idx, state, caller_ip)) -DEFINE_BMAP_EVENT(xfs_iext_remove); -DEFINE_BMAP_EVENT (xfs_bmap_pre_update); -DEFINE_BMAP_EVENT (xfs_bmap_post_update); -DEFINE_BMAP_EVENT (xfs_extlist); +DEFINE_BMAP_EVENT(xfs_iext_remove) +DEFINE_BMAP_EVENT(xfs_bmap_pre_update) +DEFINE_BMAP_EVENT(xfs_bmap_post_update) +DEFINE_BMAP_EVENT(xfs_extlist) DECLARE_EVENT_CLASS(xfs_buf_class, TP_PROTO(struct xfs_buf *bp, unsigned long caller_ip),@@ -313,37 +318,37 @@ DECLARE_EVENT_CLASS(xfs_buf_class,DEFINE_EVENT (xfs_buf_class, name, \ TP_PROTO(struct xfs_buf *bp, unsigned long caller_ip), \ TP_ARGS(bp, caller_ip)) -DEFINE_BUF_EVENT (xfs_buf_init); -DEFINE_BUF_EVENT (xfs_buf_free); -DEFINE_BUF_EVENT (xfs_buf_hold); -DEFINE_BUF_EVENT (xfs_buf_rele); -DEFINE_BUF_EVENT (xfs_buf_iodone); -DEFINE_BUF_EVENT (xfs_buf_iorequest); -DEFINE_BUF_EVENT (xfs_buf_bawrite); -DEFINE_BUF_EVENT (xfs_buf_bdwrite); -DEFINE_BUF_EVENT (xfs_buf_lock); -DEFINE_BUF_EVENT (xfs_buf_lock_done); -DEFINE_BUF_EVENT (xfs_buf_cond_lock); -DEFINE_BUF_EVENT (xfs_buf_unlock); -DEFINE_BUF_EVENT (xfs_buf_iowait); -DEFINE_BUF_EVENT (xfs_buf_iowait_done); -DEFINE_BUF_EVENT (xfs_buf_delwri_queue); -DEFINE_BUF_EVENT (xfs_buf_delwri_dequeue); -DEFINE_BUF_EVENT (xfs_buf_delwri_split); -DEFINE_BUF_EVENT (xfs_buf_get_uncached); -DEFINE_BUF_EVENT (xfs_bdstrat_shut); -DEFINE_BUF_EVENT (xfs_buf_item_relse); -DEFINE_BUF_EVENT (xfs_buf_item_iodone); -DEFINE_BUF_EVENT (xfs_buf_item_iodone_async); -DEFINE_BUF_EVENT (xfs_buf_error_relse); -DEFINE_BUF_EVENT (xfs_trans_read_buf_io); -DEFINE_BUF_EVENT (xfs_trans_read_buf_shut); +DEFINE_BUF_EVENT(xfs_buf_init) +DEFINE_BUF_EVENT(xfs_buf_free) +DEFINE_BUF_EVENT(xfs_buf_hold) +DEFINE_BUF_EVENT(xfs_buf_rele) +DEFINE_BUF_EVENT(xfs_buf_iodone) +DEFINE_BUF_EVENT(xfs_buf_iorequest) +DEFINE_BUF_EVENT(xfs_buf_bawrite) +DEFINE_BUF_EVENT(xfs_buf_bdwrite) +DEFINE_BUF_EVENT(xfs_buf_lock) +DEFINE_BUF_EVENT(xfs_buf_lock_done) +DEFINE_BUF_EVENT(xfs_buf_cond_lock) +DEFINE_BUF_EVENT(xfs_buf_unlock) +DEFINE_BUF_EVENT(xfs_buf_iowait) +DEFINE_BUF_EVENT(xfs_buf_iowait_done) +DEFINE_BUF_EVENT(xfs_buf_delwri_queue) +DEFINE_BUF_EVENT(xfs_buf_delwri_dequeue) +DEFINE_BUF_EVENT(xfs_buf_delwri_split) +DEFINE_BUF_EVENT(xfs_buf_get_uncached) +DEFINE_BUF_EVENT(xfs_bdstrat_shut) +DEFINE_BUF_EVENT(xfs_buf_item_relse) +DEFINE_BUF_EVENT(xfs_buf_item_iodone) +DEFINE_BUF_EVENT(xfs_buf_item_iodone_async) +DEFINE_BUF_EVENT(xfs_buf_error_relse) +DEFINE_BUF_EVENT(xfs_trans_read_buf_io) +DEFINE_BUF_EVENT(xfs_trans_read_buf_shut) /* not really buffer traces, but the buf provides useful information */ -DEFINE_BUF_EVENT (xfs_btree_corrupt); -DEFINE_BUF_EVENT (xfs_da_btree_corrupt); -DEFINE_BUF_EVENT (xfs_reset_dqcounts); -DEFINE_BUF_EVENT (xfs_inode_item_push); +DEFINE_BUF_EVENT(xfs_btree_corrupt) +DEFINE_BUF_EVENT(xfs_da_btree_corrupt) +DEFINE_BUF_EVENT(xfs_reset_dqcounts) +DEFINE_BUF_EVENT(xfs_inode_item_push) /* pass flags explicitly */ DECLARE_EVENT_CLASS(xfs_buf_flags_class,@@ -385,9 +390,9 @@ DECLARE_EVENT_CLASS(xfs_buf_flags_class,DEFINE_EVENT (xfs_buf_flags_class, name, \ TP_PROTO(struct xfs_buf *bp, unsigned flags, unsigned long caller_ip), \ TP_ARGS(bp, flags, caller_ip)) -DEFINE_BUF_FLAGS_EVENT (xfs_buf_find); -DEFINE_BUF_FLAGS_EVENT (xfs_buf_get); -DEFINE_BUF_FLAGS_EVENT (xfs_buf_read); +DEFINE_BUF_FLAGS_EVENT(xfs_buf_find) +DEFINE_BUF_FLAGS_EVENT(xfs_buf_get) +DEFINE_BUF_FLAGS_EVENT(xfs_buf_read) TRACE_EVENT(xfs_buf_ioerror, TP_PROTO(struct xfs_buf *bp, int error, unsigned long caller_ip),@@ -425,7 +430,7 @@ TRACE_EVENT(xfs_buf_ioerror, __entry->error, __print_flags(__entry->flags, "|", XFS_BUF_FLAGS), (void *)__entry->caller_ip) -); +) DECLARE_EVENT_CLASS(xfs_buf_item_class, TP_PROTO(struct xfs_buf_log_item *bip),@@ -479,31 +484,31 @@ DECLARE_EVENT_CLASS(xfs_buf_item_class,DEFINE_EVENT (xfs_buf_item_class, name, \ TP_PROTO(struct xfs_buf_log_item *bip), \ TP_ARGS(bip)) -DEFINE_BUF_ITEM_EVENT (xfs_buf_item_size); -DEFINE_BUF_ITEM_EVENT (xfs_buf_item_size_stale); -DEFINE_BUF_ITEM_EVENT (xfs_buf_item_format); -DEFINE_BUF_ITEM_EVENT (xfs_buf_item_format_stale); -DEFINE_BUF_ITEM_EVENT (xfs_buf_item_pin); -DEFINE_BUF_ITEM_EVENT (xfs_buf_item_unpin); -DEFINE_BUF_ITEM_EVENT (xfs_buf_item_unpin_stale); -DEFINE_BUF_ITEM_EVENT (xfs_buf_item_trylock); -DEFINE_BUF_ITEM_EVENT (xfs_buf_item_unlock); -DEFINE_BUF_ITEM_EVENT (xfs_buf_item_unlock_stale); -DEFINE_BUF_ITEM_EVENT (xfs_buf_item_committed); -DEFINE_BUF_ITEM_EVENT (xfs_buf_item_push); -DEFINE_BUF_ITEM_EVENT (xfs_buf_item_pushbuf); -DEFINE_BUF_ITEM_EVENT (xfs_trans_get_buf); -DEFINE_BUF_ITEM_EVENT (xfs_trans_get_buf_recur); -DEFINE_BUF_ITEM_EVENT (xfs_trans_getsb); -DEFINE_BUF_ITEM_EVENT (xfs_trans_getsb_recur); -DEFINE_BUF_ITEM_EVENT (xfs_trans_read_buf); -DEFINE_BUF_ITEM_EVENT (xfs_trans_read_buf_recur); -DEFINE_BUF_ITEM_EVENT (xfs_trans_log_buf); -DEFINE_BUF_ITEM_EVENT (xfs_trans_brelse); -DEFINE_BUF_ITEM_EVENT (xfs_trans_bjoin); -DEFINE_BUF_ITEM_EVENT (xfs_trans_bhold); -DEFINE_BUF_ITEM_EVENT (xfs_trans_bhold_release); -DEFINE_BUF_ITEM_EVENT (xfs_trans_binval); +DEFINE_BUF_ITEM_EVENT(xfs_buf_item_size) +DEFINE_BUF_ITEM_EVENT(xfs_buf_item_size_stale) +DEFINE_BUF_ITEM_EVENT(xfs_buf_item_format) +DEFINE_BUF_ITEM_EVENT(xfs_buf_item_format_stale) +DEFINE_BUF_ITEM_EVENT(xfs_buf_item_pin) +DEFINE_BUF_ITEM_EVENT(xfs_buf_item_unpin) +DEFINE_BUF_ITEM_EVENT(xfs_buf_item_unpin_stale) +DEFINE_BUF_ITEM_EVENT(xfs_buf_item_trylock) +DEFINE_BUF_ITEM_EVENT(xfs_buf_item_unlock) +DEFINE_BUF_ITEM_EVENT(xfs_buf_item_unlock_stale) +DEFINE_BUF_ITEM_EVENT(xfs_buf_item_committed) +DEFINE_BUF_ITEM_EVENT(xfs_buf_item_push) +DEFINE_BUF_ITEM_EVENT(xfs_buf_item_pushbuf) +DEFINE_BUF_ITEM_EVENT(xfs_trans_get_buf) +DEFINE_BUF_ITEM_EVENT(xfs_trans_get_buf_recur) +DEFINE_BUF_ITEM_EVENT(xfs_trans_getsb) +DEFINE_BUF_ITEM_EVENT(xfs_trans_getsb_recur) +DEFINE_BUF_ITEM_EVENT(xfs_trans_read_buf) +DEFINE_BUF_ITEM_EVENT(xfs_trans_read_buf_recur) +DEFINE_BUF_ITEM_EVENT(xfs_trans_log_buf) +DEFINE_BUF_ITEM_EVENT(xfs_trans_brelse) +DEFINE_BUF_ITEM_EVENT(xfs_trans_bjoin) +DEFINE_BUF_ITEM_EVENT(xfs_trans_bhold) +DEFINE_BUF_ITEM_EVENT(xfs_trans_bhold_release) +DEFINE_BUF_ITEM_EVENT(xfs_trans_binval) DECLARE_EVENT_CLASS(xfs_lock_class, TP_PROTO(struct xfs_inode *ip, unsigned lock_flags,@@ -558,32 +563,32 @@ DECLARE_EVENT_CLASS(xfs_inode_class,DEFINE_EVENT (xfs_inode_class, name, \ TP_PROTO(struct xfs_inode *ip), \ TP_ARGS(ip)) -DEFINE_INODE_EVENT (xfs_iget_skip); -DEFINE_INODE_EVENT (xfs_iget_reclaim); -DEFINE_INODE_EVENT (xfs_iget_reclaim_fail); -DEFINE_INODE_EVENT (xfs_iget_hit); -DEFINE_INODE_EVENT (xfs_iget_miss); - -DEFINE_INODE_EVENT (xfs_getattr); -DEFINE_INODE_EVENT (xfs_setattr); -DEFINE_INODE_EVENT (xfs_readlink); -DEFINE_INODE_EVENT (xfs_alloc_file_space); -DEFINE_INODE_EVENT (xfs_free_file_space); -DEFINE_INODE_EVENT (xfs_readdir); +DEFINE_INODE_EVENT(xfs_iget_skip) +DEFINE_INODE_EVENT(xfs_iget_reclaim) +DEFINE_INODE_EVENT(xfs_iget_reclaim_fail) +DEFINE_INODE_EVENT(xfs_iget_hit) +DEFINE_INODE_EVENT(xfs_iget_miss) + +DEFINE_INODE_EVENT(xfs_getattr) +DEFINE_INODE_EVENT(xfs_setattr) +DEFINE_INODE_EVENT(xfs_readlink) +DEFINE_INODE_EVENT(xfs_alloc_file_space) +DEFINE_INODE_EVENT(xfs_free_file_space) +DEFINE_INODE_EVENT(xfs_readdir) #ifdef CONFIG_XFS_POSIX_ACL -DEFINE_INODE_EVENT (xfs_check_acl); +DEFINE_INODE_EVENT(xfs_check_acl) #endif -DEFINE_INODE_EVENT (xfs_vm_bmap); -DEFINE_INODE_EVENT (xfs_file_ioctl); -DEFINE_INODE_EVENT (xfs_file_compat_ioctl); -DEFINE_INODE_EVENT (xfs_ioctl_setattr); -DEFINE_INODE_EVENT (xfs_file_fsync); -DEFINE_INODE_EVENT (xfs_destroy_inode); -DEFINE_INODE_EVENT (xfs_write_inode); -DEFINE_INODE_EVENT (xfs_evict_inode); +DEFINE_INODE_EVENT(xfs_vm_bmap) +DEFINE_INODE_EVENT(xfs_file_ioctl) +DEFINE_INODE_EVENT(xfs_file_compat_ioctl) +DEFINE_INODE_EVENT(xfs_ioctl_setattr) +DEFINE_INODE_EVENT(xfs_file_fsync) +DEFINE_INODE_EVENT(xfs_destroy_inode) +DEFINE_INODE_EVENT(xfs_write_inode) +DEFINE_INODE_EVENT(xfs_evict_inode) -DEFINE_INODE_EVENT (xfs_dquot_dqalloc); -DEFINE_INODE_EVENT (xfs_dquot_dqdetach); +DEFINE_INODE_EVENT(xfs_dquot_dqalloc) +DEFINE_INODE_EVENT(xfs_dquot_dqdetach) DECLARE_EVENT_CLASS(xfs_iref_class, TP_PROTO(struct xfs_inode *ip, unsigned long caller_ip),@@ -614,11 +619,11 @@ DECLARE_EVENT_CLASS(xfs_iref_class,DEFINE_EVENT (xfs_iref_class, name, \ TP_PROTO(struct xfs_inode *ip, unsigned long caller_ip), \ TP_ARGS(ip, caller_ip)) -DEFINE_IREF_EVENT (xfs_ihold); -DEFINE_IREF_EVENT (xfs_irele); -DEFINE_IREF_EVENT (xfs_inode_pin); -DEFINE_IREF_EVENT (xfs_inode_unpin); -DEFINE_IREF_EVENT (xfs_inode_unpin_nowait); +DEFINE_IREF_EVENT(xfs_ihold) +DEFINE_IREF_EVENT(xfs_irele) +DEFINE_IREF_EVENT(xfs_inode_pin) +DEFINE_IREF_EVENT(xfs_inode_unpin) +DEFINE_IREF_EVENT(xfs_inode_unpin_nowait) DECLARE_EVENT_CLASS(xfs_namespace_class, TP_PROTO(struct xfs_inode *dp, struct xfs_name *name),@@ -643,11 +648,11 @@ DECLARE_EVENT_CLASS(xfs_namespace_class,DEFINE_EVENT (xfs_namespace_class, name, \ TP_PROTO(struct xfs_inode *dp, struct xfs_name *name), \ TP_ARGS(dp, name)) -DEFINE_NAMESPACE_EVENT (xfs_remove); -DEFINE_NAMESPACE_EVENT (xfs_link); -DEFINE_NAMESPACE_EVENT (xfs_lookup); -DEFINE_NAMESPACE_EVENT (xfs_create); -DEFINE_NAMESPACE_EVENT (xfs_symlink); +DEFINE_NAMESPACE_EVENT(xfs_remove) +DEFINE_NAMESPACE_EVENT(xfs_link) +DEFINE_NAMESPACE_EVENT(xfs_lookup) +DEFINE_NAMESPACE_EVENT(xfs_create) +DEFINE_NAMESPACE_EVENT(xfs_symlink) TRACE_EVENT(xfs_rename, TP_PROTO(struct xfs_inode *src_dp, struct xfs_inode *target_dp,@@ -729,31 +734,31 @@ DECLARE_EVENT_CLASS(xfs_dquot_class,DEFINE_EVENT (xfs_dquot_class, name, \ TP_PROTO(struct xfs_dquot *dqp), \ TP_ARGS(dqp)) -DEFINE_DQUOT_EVENT (xfs_dqadjust); -DEFINE_DQUOT_EVENT (xfs_dqreclaim_want); -DEFINE_DQUOT_EVENT (xfs_dqreclaim_dirty); -DEFINE_DQUOT_EVENT (xfs_dqreclaim_unlink); -DEFINE_DQUOT_EVENT (xfs_dqattach_found); -DEFINE_DQUOT_EVENT (xfs_dqattach_get); -DEFINE_DQUOT_EVENT (xfs_dqinit); -DEFINE_DQUOT_EVENT (xfs_dqreuse); -DEFINE_DQUOT_EVENT (xfs_dqalloc); -DEFINE_DQUOT_EVENT (xfs_dqtobp_read); -DEFINE_DQUOT_EVENT (xfs_dqread); -DEFINE_DQUOT_EVENT (xfs_dqread_fail); -DEFINE_DQUOT_EVENT (xfs_dqlookup_found); -DEFINE_DQUOT_EVENT (xfs_dqlookup_want); -DEFINE_DQUOT_EVENT (xfs_dqlookup_freelist); -DEFINE_DQUOT_EVENT (xfs_dqlookup_done); -DEFINE_DQUOT_EVENT (xfs_dqget_hit); -DEFINE_DQUOT_EVENT (xfs_dqget_miss); -DEFINE_DQUOT_EVENT (xfs_dqput); -DEFINE_DQUOT_EVENT (xfs_dqput_wait); -DEFINE_DQUOT_EVENT (xfs_dqput_free); -DEFINE_DQUOT_EVENT (xfs_dqrele); -DEFINE_DQUOT_EVENT (xfs_dqflush); -DEFINE_DQUOT_EVENT (xfs_dqflush_force); -DEFINE_DQUOT_EVENT (xfs_dqflush_done); +DEFINE_DQUOT_EVENT(xfs_dqadjust) +DEFINE_DQUOT_EVENT(xfs_dqreclaim_want) +DEFINE_DQUOT_EVENT(xfs_dqreclaim_dirty) +DEFINE_DQUOT_EVENT(xfs_dqreclaim_unlink) +DEFINE_DQUOT_EVENT(xfs_dqattach_found) +DEFINE_DQUOT_EVENT(xfs_dqattach_get) +DEFINE_DQUOT_EVENT(xfs_dqinit) +DEFINE_DQUOT_EVENT(xfs_dqreuse) +DEFINE_DQUOT_EVENT(xfs_dqalloc) +DEFINE_DQUOT_EVENT(xfs_dqtobp_read) +DEFINE_DQUOT_EVENT(xfs_dqread) +DEFINE_DQUOT_EVENT(xfs_dqread_fail) +DEFINE_DQUOT_EVENT(xfs_dqlookup_found) +DEFINE_DQUOT_EVENT(xfs_dqlookup_want) +DEFINE_DQUOT_EVENT(xfs_dqlookup_freelist) +DEFINE_DQUOT_EVENT(xfs_dqlookup_done) +DEFINE_DQUOT_EVENT(xfs_dqget_hit) +DEFINE_DQUOT_EVENT(xfs_dqget_miss) +DEFINE_DQUOT_EVENT(xfs_dqput) +DEFINE_DQUOT_EVENT(xfs_dqput_wait) +DEFINE_DQUOT_EVENT(xfs_dqput_free) +DEFINE_DQUOT_EVENT(xfs_dqrele) +DEFINE_DQUOT_EVENT(xfs_dqflush) +DEFINE_DQUOT_EVENT(xfs_dqflush_force) +DEFINE_DQUOT_EVENT(xfs_dqflush_done) DECLARE_EVENT_CLASS(xfs_loggrant_class, TP_PROTO(struct log *log, struct xlog_ticket *tic),@@ -824,30 +829,30 @@ DECLARE_EVENT_CLASS(xfs_loggrant_class,DEFINE_EVENT (xfs_loggrant_class, name, \ TP_PROTO(struct log *log, struct xlog_ticket *tic), \ TP_ARGS(log, tic)) -DEFINE_LOGGRANT_EVENT (xfs_log_done_nonperm); -DEFINE_LOGGRANT_EVENT (xfs_log_done_perm); -DEFINE_LOGGRANT_EVENT (xfs_log_reserve); -DEFINE_LOGGRANT_EVENT (xfs_log_umount_write); -DEFINE_LOGGRANT_EVENT (xfs_log_grant_enter); -DEFINE_LOGGRANT_EVENT (xfs_log_grant_exit); -DEFINE_LOGGRANT_EVENT (xfs_log_grant_error); -DEFINE_LOGGRANT_EVENT (xfs_log_grant_sleep1); -DEFINE_LOGGRANT_EVENT (xfs_log_grant_wake1); -DEFINE_LOGGRANT_EVENT (xfs_log_grant_sleep2); -DEFINE_LOGGRANT_EVENT (xfs_log_grant_wake2); -DEFINE_LOGGRANT_EVENT (xfs_log_regrant_write_enter); -DEFINE_LOGGRANT_EVENT (xfs_log_regrant_write_exit); -DEFINE_LOGGRANT_EVENT (xfs_log_regrant_write_error); -DEFINE_LOGGRANT_EVENT (xfs_log_regrant_write_sleep1); -DEFINE_LOGGRANT_EVENT (xfs_log_regrant_write_wake1); -DEFINE_LOGGRANT_EVENT (xfs_log_regrant_write_sleep2); -DEFINE_LOGGRANT_EVENT (xfs_log_regrant_write_wake2); -DEFINE_LOGGRANT_EVENT (xfs_log_regrant_reserve_enter); -DEFINE_LOGGRANT_EVENT (xfs_log_regrant_reserve_exit); -DEFINE_LOGGRANT_EVENT (xfs_log_regrant_reserve_sub); -DEFINE_LOGGRANT_EVENT (xfs_log_ungrant_enter); -DEFINE_LOGGRANT_EVENT (xfs_log_ungrant_exit); -DEFINE_LOGGRANT_EVENT (xfs_log_ungrant_sub); +DEFINE_LOGGRANT_EVENT(xfs_log_done_nonperm) +DEFINE_LOGGRANT_EVENT(xfs_log_done_perm) +DEFINE_LOGGRANT_EVENT(xfs_log_reserve) +DEFINE_LOGGRANT_EVENT(xfs_log_umount_write) +DEFINE_LOGGRANT_EVENT(xfs_log_grant_enter) +DEFINE_LOGGRANT_EVENT(xfs_log_grant_exit) +DEFINE_LOGGRANT_EVENT(xfs_log_grant_error) +DEFINE_LOGGRANT_EVENT(xfs_log_grant_sleep1) +DEFINE_LOGGRANT_EVENT(xfs_log_grant_wake1) +DEFINE_LOGGRANT_EVENT(xfs_log_grant_sleep2) +DEFINE_LOGGRANT_EVENT(xfs_log_grant_wake2) +DEFINE_LOGGRANT_EVENT(xfs_log_regrant_write_enter) +DEFINE_LOGGRANT_EVENT(xfs_log_regrant_write_exit) +DEFINE_LOGGRANT_EVENT(xfs_log_regrant_write_error) +DEFINE_LOGGRANT_EVENT(xfs_log_regrant_write_sleep1) +DEFINE_LOGGRANT_EVENT(xfs_log_regrant_write_wake1) +DEFINE_LOGGRANT_EVENT(xfs_log_regrant_write_sleep2) +DEFINE_LOGGRANT_EVENT(xfs_log_regrant_write_wake2) +DEFINE_LOGGRANT_EVENT(xfs_log_regrant_reserve_enter) +DEFINE_LOGGRANT_EVENT(xfs_log_regrant_reserve_exit) +DEFINE_LOGGRANT_EVENT(xfs_log_regrant_reserve_sub) +DEFINE_LOGGRANT_EVENT(xfs_log_ungrant_enter) +DEFINE_LOGGRANT_EVENT(xfs_log_ungrant_exit) +DEFINE_LOGGRANT_EVENT(xfs_log_ungrant_sub) DECLARE_EVENT_CLASS(xfs_file_class, TP_PROTO(struct xfs_inode *ip, size_t count, loff_t offset, int flags),@@ -885,11 +890,11 @@ DECLARE_EVENT_CLASS(xfs_file_class,DEFINE_EVENT (xfs_file_class, name, \ TP_PROTO(struct xfs_inode *ip, size_t count, loff_t offset, int flags), \ TP_ARGS(ip, count, offset, flags)) -DEFINE_RW_EVENT (xfs_file_read); -DEFINE_RW_EVENT (xfs_file_buffered_write); -DEFINE_RW_EVENT (xfs_file_direct_write); -DEFINE_RW_EVENT (xfs_file_splice_read); -DEFINE_RW_EVENT (xfs_file_splice_write); +DEFINE_RW_EVENT(xfs_file_read) +DEFINE_RW_EVENT(xfs_file_buffered_write) +DEFINE_RW_EVENT(xfs_file_direct_write) +DEFINE_RW_EVENT(xfs_file_splice_read) +DEFINE_RW_EVENT(xfs_file_splice_write) DECLARE_EVENT_CLASS(xfs_page_class, TP_PROTO(struct inode *inode, struct page *page, unsigned long off),@@ -931,9 +936,9 @@ DECLARE_EVENT_CLASS(xfs_page_class,DEFINE_EVENT (xfs_page_class, name, \ TP_PROTO(struct inode *inode, struct page *page, unsigned long off), \ TP_ARGS(inode, page, off)) -DEFINE_PAGE_EVENT (xfs_writepage); -DEFINE_PAGE_EVENT (xfs_releasepage); -DEFINE_PAGE_EVENT (xfs_invalidatepage); +DEFINE_PAGE_EVENT(xfs_writepage) +DEFINE_PAGE_EVENT(xfs_releasepage) +DEFINE_PAGE_EVENT(xfs_invalidatepage) DECLARE_EVENT_CLASS(xfs_iomap_class, TP_PROTO(struct xfs_inode *ip, xfs_off_t offset, ssize_t count,@@ -983,9 +988,9 @@ DEFINE_EVENT(xfs_iomap_class, name, \ TP_PROTO(struct xfs_inode *ip, xfs_off_t offset, ssize_t count, \ int flags, struct xfs_bmbt_irec *irec), \ TP_ARGS(ip, offset, count, flags, irec)) -DEFINE_IOMAP_EVENT(xfs_iomap_enter); -DEFINE_IOMAP_EVENT (xfs_iomap_found); -DEFINE_IOMAP_EVENT (xfs_iomap_alloc); +DEFINE_IOMAP_EVENT(xfs_iomap_enter) +DEFINE_IOMAP_EVENT(xfs_iomap_found) +DEFINE_IOMAP_EVENT(xfs_iomap_alloc) DECLARE_EVENT_CLASS(xfs_simple_io_class, TP_PROTO(struct xfs_inode *ip, xfs_off_t offset, ssize_t count),@@ -1014,14 +1019,14 @@ DECLARE_EVENT_CLASS(xfs_simple_io_class, __entry->new_size, __entry->offset, __entry->count) -); +)#define DEFINE_SIMPLE_IO_EVENT (name) \ DEFINE_EVENT(xfs_simple_io_class, name, \ TP_PROTO(struct xfs_inode *ip, xfs_off_t offset, ssize_t count), \ TP_ARGS(ip, offset, count)) -DEFINE_SIMPLE_IO_EVENT (xfs_delalloc_enospc); -DEFINE_SIMPLE_IO_EVENT (xfs_unwritten_convert); +DEFINE_SIMPLE_IO_EVENT(xfs_delalloc_enospc) +DEFINE_SIMPLE_IO_EVENT(xfs_unwritten_convert) TRACE_EVENT(xfs_itruncate_start,@@ -1055,7 +1060,7 @@ TRACE_EVENT(xfs_itruncate_start, __entry->new_size, __entry->toss_start, __entry->toss_finish) -); +) DECLARE_EVENT_CLASS(xfs_itrunc_class, TP_PROTO(struct xfs_inode *ip, xfs_fsize_t new_size),@@ -1083,8 +1088,8 @@ DECLARE_EVENT_CLASS(xfs_itrunc_class,DEFINE_EVENT (xfs_itrunc_class, name, \ TP_PROTO(struct xfs_inode *ip, xfs_fsize_t new_size), \ TP_ARGS(ip, new_size)) -DEFINE_ITRUNC_EVENT (xfs_itruncate_finish_start); -DEFINE_ITRUNC_EVENT (xfs_itruncate_finish_end); +DEFINE_ITRUNC_EVENT(xfs_itruncate_finish_start) +DEFINE_ITRUNC_EVENT(xfs_itruncate_finish_end) TRACE_EVENT(xfs_pagecache_inval, TP_PROTO(struct xfs_inode *ip, xfs_off_t start, xfs_off_t finish),@@ -1109,7 +1114,7 @@ TRACE_EVENT(xfs_pagecache_inval, __entry->size, __entry->start, __entry->finish) -); +) TRACE_EVENT(xfs_bunmap, TP_PROTO(struct xfs_inode *ip, xfs_fileoff_t bno, xfs_filblks_t len,@@ -1143,7 +1148,7 @@ TRACE_EVENT(xfs_bunmap, __print_flags(__entry->flags, "|", XFS_BMAPI_FLAGS), (void *)__entry->caller_ip) -); +)#define XFS_BUSY_SYNC \ { 0, "async" }, \@@ -1180,7 +1185,7 @@ TRACE_EVENT(xfs_alloc_busy, __entry->len, __print_symbolic(__entry->sync, XFS_BUSY_SYNC)) -); +) TRACE_EVENT(xfs_alloc_unbusy, TP_PROTO(struct xfs_mount *mp, xfs_agnumber_t agno,@@ -1203,7 +1208,7 @@ TRACE_EVENT(xfs_alloc_unbusy, __entry->agno, __entry->agbno, __entry->len) -); +)#define XFS_BUSY_STATES \ { 0, "missing" }, \@@ -1233,7 +1238,7 @@ TRACE_EVENT(xfs_alloc_busysearch, __entry->agbno, __entry->len, __print_symbolic(__entry->found, XFS_BUSY_STATES)) -); +) TRACE_EVENT(xfs_trans_commit_lsn, TP_PROTO(struct xfs_trans *trans),@@ -1252,7 +1257,7 @@ TRACE_EVENT(xfs_trans_commit_lsn, MAJOR(__entry->dev), MINOR(__entry->dev), __entry->tp, __entry->lsn) -); +) TRACE_EVENT(xfs_agf, TP_PROTO(struct xfs_mount *mp, struct xfs_agf *agf, int flags,@@ -1309,7 +1314,7 @@ TRACE_EVENT(xfs_agf, __entry->freeblks, __entry->longest, (void *)__entry->caller_ip) -); +) TRACE_EVENT(xfs_free_extent, TP_PROTO(struct xfs_mount *mp, xfs_agnumber_t agno, xfs_agblock_t agbno,@@ -1343,7 +1348,7 @@ TRACE_EVENT(xfs_free_extent, (__entry->haveright ? "both" : "left") : (__entry->haveright ? "right" : "none")) -); +) DECLARE_EVENT_CLASS(xfs_alloc_class, TP_PROTO(struct xfs_alloc_arg *args),@@ -1419,27 +1424,27 @@ DECLARE_EVENT_CLASS(xfs_alloc_class,DEFINE_EVENT (xfs_alloc_class, name, \ TP_PROTO(struct xfs_alloc_arg *args), \ TP_ARGS(args)) -DEFINE_ALLOC_EVENT (xfs_alloc_exact_done); -DEFINE_ALLOC_EVENT (xfs_alloc_exact_error); -DEFINE_ALLOC_EVENT (xfs_alloc_near_nominleft); -DEFINE_ALLOC_EVENT (xfs_alloc_near_first); -DEFINE_ALLOC_EVENT (xfs_alloc_near_greater); -DEFINE_ALLOC_EVENT (xfs_alloc_near_lesser); -DEFINE_ALLOC_EVENT (xfs_alloc_near_error); -DEFINE_ALLOC_EVENT (xfs_alloc_size_neither); -DEFINE_ALLOC_EVENT (xfs_alloc_size_noentry); -DEFINE_ALLOC_EVENT (xfs_alloc_size_nominleft); -DEFINE_ALLOC_EVENT (xfs_alloc_size_done); -DEFINE_ALLOC_EVENT (xfs_alloc_size_error); -DEFINE_ALLOC_EVENT (xfs_alloc_small_freelist); -DEFINE_ALLOC_EVENT (xfs_alloc_small_notenough); -DEFINE_ALLOC_EVENT (xfs_alloc_small_done); -DEFINE_ALLOC_EVENT (xfs_alloc_small_error); -DEFINE_ALLOC_EVENT (xfs_alloc_vextent_badargs); -DEFINE_ALLOC_EVENT (xfs_alloc_vextent_nofix); -DEFINE_ALLOC_EVENT (xfs_alloc_vextent_noagbp); -DEFINE_ALLOC_EVENT (xfs_alloc_vextent_loopfailed); -DEFINE_ALLOC_EVENT (xfs_alloc_vextent_allfailed); +DEFINE_ALLOC_EVENT(xfs_alloc_exact_done) +DEFINE_ALLOC_EVENT(xfs_alloc_exact_error) +DEFINE_ALLOC_EVENT(xfs_alloc_near_nominleft) +DEFINE_ALLOC_EVENT(xfs_alloc_near_first) +DEFINE_ALLOC_EVENT(xfs_alloc_near_greater) +DEFINE_ALLOC_EVENT(xfs_alloc_near_lesser) +DEFINE_ALLOC_EVENT(xfs_alloc_near_error) +DEFINE_ALLOC_EVENT(xfs_alloc_size_neither) +DEFINE_ALLOC_EVENT(xfs_alloc_size_noentry) +DEFINE_ALLOC_EVENT(xfs_alloc_size_nominleft) +DEFINE_ALLOC_EVENT(xfs_alloc_size_done) +DEFINE_ALLOC_EVENT(xfs_alloc_size_error) +DEFINE_ALLOC_EVENT(xfs_alloc_small_freelist) +DEFINE_ALLOC_EVENT(xfs_alloc_small_notenough) +DEFINE_ALLOC_EVENT(xfs_alloc_small_done) +DEFINE_ALLOC_EVENT(xfs_alloc_small_error) +DEFINE_ALLOC_EVENT(xfs_alloc_vextent_badargs) +DEFINE_ALLOC_EVENT(xfs_alloc_vextent_nofix) +DEFINE_ALLOC_EVENT(xfs_alloc_vextent_noagbp) +DEFINE_ALLOC_EVENT(xfs_alloc_vextent_loopfailed) +DEFINE_ALLOC_EVENT(xfs_alloc_vextent_allfailed) DECLARE_EVENT_CLASS(xfs_dir2_class, TP_PROTO(struct xfs_da_args *args),@@ -1479,31 +1484,31 @@ DECLARE_EVENT_CLASS(xfs_dir2_class,DEFINE_EVENT (xfs_dir2_class, name, \ TP_PROTO(struct xfs_da_args *args), \ TP_ARGS(args)) -DEFINE_DIR2_EVENT (xfs_dir2_sf_addname); -DEFINE_DIR2_EVENT (xfs_dir2_sf_create); -DEFINE_DIR2_EVENT (xfs_dir2_sf_lookup); -DEFINE_DIR2_EVENT (xfs_dir2_sf_replace); -DEFINE_DIR2_EVENT (xfs_dir2_sf_removename); -DEFINE_DIR2_EVENT (xfs_dir2_sf_toino4); -DEFINE_DIR2_EVENT (xfs_dir2_sf_toino8); -DEFINE_DIR2_EVENT (xfs_dir2_sf_to_block); -DEFINE_DIR2_EVENT (xfs_dir2_block_addname); -DEFINE_DIR2_EVENT (xfs_dir2_block_lookup); -DEFINE_DIR2_EVENT (xfs_dir2_block_replace); -DEFINE_DIR2_EVENT (xfs_dir2_block_removename); -DEFINE_DIR2_EVENT (xfs_dir2_block_to_sf); -DEFINE_DIR2_EVENT (xfs_dir2_block_to_leaf); -DEFINE_DIR2_EVENT (xfs_dir2_leaf_addname); -DEFINE_DIR2_EVENT (xfs_dir2_leaf_lookup); -DEFINE_DIR2_EVENT (xfs_dir2_leaf_replace); -DEFINE_DIR2_EVENT (xfs_dir2_leaf_removename); -DEFINE_DIR2_EVENT (xfs_dir2_leaf_to_block); -DEFINE_DIR2_EVENT (xfs_dir2_leaf_to_node); -DEFINE_DIR2_EVENT (xfs_dir2_node_addname); -DEFINE_DIR2_EVENT (xfs_dir2_node_lookup); -DEFINE_DIR2_EVENT (xfs_dir2_node_replace); -DEFINE_DIR2_EVENT (xfs_dir2_node_removename); -DEFINE_DIR2_EVENT (xfs_dir2_node_to_leaf); +DEFINE_DIR2_EVENT(xfs_dir2_sf_addname) +DEFINE_DIR2_EVENT(xfs_dir2_sf_create) +DEFINE_DIR2_EVENT(xfs_dir2_sf_lookup) +DEFINE_DIR2_EVENT(xfs_dir2_sf_replace) +DEFINE_DIR2_EVENT(xfs_dir2_sf_removename) +DEFINE_DIR2_EVENT(xfs_dir2_sf_toino4) +DEFINE_DIR2_EVENT(xfs_dir2_sf_toino8) +DEFINE_DIR2_EVENT(xfs_dir2_sf_to_block) +DEFINE_DIR2_EVENT(xfs_dir2_block_addname) +DEFINE_DIR2_EVENT(xfs_dir2_block_lookup) +DEFINE_DIR2_EVENT(xfs_dir2_block_replace) +DEFINE_DIR2_EVENT(xfs_dir2_block_removename) +DEFINE_DIR2_EVENT(xfs_dir2_block_to_sf) +DEFINE_DIR2_EVENT(xfs_dir2_block_to_leaf) +DEFINE_DIR2_EVENT(xfs_dir2_leaf_addname) +DEFINE_DIR2_EVENT(xfs_dir2_leaf_lookup) +DEFINE_DIR2_EVENT(xfs_dir2_leaf_replace) +DEFINE_DIR2_EVENT(xfs_dir2_leaf_removename) +DEFINE_DIR2_EVENT(xfs_dir2_leaf_to_block) +DEFINE_DIR2_EVENT(xfs_dir2_leaf_to_node) +DEFINE_DIR2_EVENT(xfs_dir2_node_addname) +DEFINE_DIR2_EVENT(xfs_dir2_node_lookup) +DEFINE_DIR2_EVENT(xfs_dir2_node_replace) +DEFINE_DIR2_EVENT(xfs_dir2_node_removename) +DEFINE_DIR2_EVENT(xfs_dir2_node_to_leaf) DECLARE_EVENT_CLASS(xfs_dir2_space_class, TP_PROTO(struct xfs_da_args *args, int idx),@@ -1531,10 +1536,10 @@ DECLARE_EVENT_CLASS(xfs_dir2_space_classDEFINE_EVENT (xfs_dir2_space_class, name, \ TP_PROTO(struct xfs_da_args *args, int idx), \ TP_ARGS(args, idx)) -DEFINE_DIR2_SPACE_EVENT (xfs_dir2_leafn_add); -DEFINE_DIR2_SPACE_EVENT (xfs_dir2_leafn_remove); -DEFINE_DIR2_SPACE_EVENT (xfs_dir2_grow_inode); -DEFINE_DIR2_SPACE_EVENT (xfs_dir2_shrink_inode); +DEFINE_DIR2_SPACE_EVENT(xfs_dir2_leafn_add) +DEFINE_DIR2_SPACE_EVENT(xfs_dir2_leafn_remove) +DEFINE_DIR2_SPACE_EVENT(xfs_dir2_grow_inode) +DEFINE_DIR2_SPACE_EVENT(xfs_dir2_shrink_inode) TRACE_EVENT(xfs_dir2_leafn_moveents, TP_PROTO(struct xfs_da_args *args, int src_idx, int dst_idx, int count),@@ -1563,7 +1568,7 @@ TRACE_EVENT(xfs_dir2_leafn_moveents, __entry->src_idx, __entry->dst_idx, __entry->count) -); +)#define XFS_SWAPEXT_INODES \ { 0, "target" }, \@@ -1615,8 +1620,8 @@ DEFINE_EVENT(xfs_swap_extent_class, name TP_PROTO(struct xfs_inode *ip, int which), \ TP_ARGS(ip, which)) -DEFINE_SWAPEXT_EVENT(xfs_swap_extent_before); -DEFINE_SWAPEXT_EVENT (xfs_swap_extent_after); +DEFINE_SWAPEXT_EVENT(xfs_swap_extent_before) +DEFINE_SWAPEXT_EVENT(xfs_swap_extent_after) DECLARE_EVENT_CLASS(xfs_log_recover_item_class, TP_PROTO(struct log *log, struct xlog_recover *trans,@@ -1657,11 +1662,11 @@ DEFINE_EVENT(xfs_log_recover_item_class, struct xlog_recover_item *item, int pass), \ TP_ARGS(log, trans, item, pass)) -DEFINE_LOG_RECOVER_ITEM(xfs_log_recover_item_add); -DEFINE_LOG_RECOVER_ITEM (xfs_log_recover_item_add_cont); -DEFINE_LOG_RECOVER_ITEM (xfs_log_recover_item_reorder_head); -DEFINE_LOG_RECOVER_ITEM (xfs_log_recover_item_reorder_tail); -DEFINE_LOG_RECOVER_ITEM (xfs_log_recover_item_recover); +DEFINE_LOG_RECOVER_ITEM(xfs_log_recover_item_add) +DEFINE_LOG_RECOVER_ITEM(xfs_log_recover_item_add_cont) +DEFINE_LOG_RECOVER_ITEM(xfs_log_recover_item_reorder_head) +DEFINE_LOG_RECOVER_ITEM(xfs_log_recover_item_reorder_tail) +DEFINE_LOG_RECOVER_ITEM(xfs_log_recover_item_recover) DECLARE_EVENT_CLASS(xfs_log_recover_buf_item_class, TP_PROTO(struct log *log, struct xfs_buf_log_format *buf_f),@@ -1697,14 +1702,14 @@ DEFINE_EVENT(xfs_log_recover_buf_item_cl TP_PROTO(struct log *log, struct xfs_buf_log_format *buf_f), \ TP_ARGS(log, buf_f)) -DEFINE_LOG_RECOVER_BUF_ITEM(xfs_log_recover_buf_not_cancel); -DEFINE_LOG_RECOVER_BUF_ITEM (xfs_log_recover_buf_cancel); -DEFINE_LOG_RECOVER_BUF_ITEM (xfs_log_recover_buf_cancel_add); -DEFINE_LOG_RECOVER_BUF_ITEM (xfs_log_recover_buf_cancel_ref_inc); -DEFINE_LOG_RECOVER_BUF_ITEM (xfs_log_recover_buf_recover); -DEFINE_LOG_RECOVER_BUF_ITEM (xfs_log_recover_buf_inode_buf); -DEFINE_LOG_RECOVER_BUF_ITEM (xfs_log_recover_buf_reg_buf); -DEFINE_LOG_RECOVER_BUF_ITEM (xfs_log_recover_buf_dquot_buf); +DEFINE_LOG_RECOVER_BUF_ITEM(xfs_log_recover_buf_not_cancel) +DEFINE_LOG_RECOVER_BUF_ITEM(xfs_log_recover_buf_cancel) +DEFINE_LOG_RECOVER_BUF_ITEM(xfs_log_recover_buf_cancel_add) +DEFINE_LOG_RECOVER_BUF_ITEM(xfs_log_recover_buf_cancel_ref_inc) +DEFINE_LOG_RECOVER_BUF_ITEM(xfs_log_recover_buf_recover) +DEFINE_LOG_RECOVER_BUF_ITEM(xfs_log_recover_buf_inode_buf) +DEFINE_LOG_RECOVER_BUF_ITEM(xfs_log_recover_buf_reg_buf) +DEFINE_LOG_RECOVER_BUF_ITEM(xfs_log_recover_buf_dquot_buf) DECLARE_EVENT_CLASS(xfs_log_recover_ino_item_class, TP_PROTO(struct log *log, struct xfs_inode_log_format *in_f),@@ -1748,9 +1753,9 @@ DEFINE_EVENT(xfs_log_recover_ino_item_cl TP_PROTO(struct log *log, struct xfs_inode_log_format *in_f), \ TP_ARGS(log, in_f)) -DEFINE_LOG_RECOVER_INO_ITEM(xfs_log_recover_inode_recover); -DEFINE_LOG_RECOVER_INO_ITEM (xfs_log_recover_inode_cancel); -DEFINE_LOG_RECOVER_INO_ITEM (xfs_log_recover_inode_skip); +DEFINE_LOG_RECOVER_INO_ITEM(xfs_log_recover_inode_recover) +DEFINE_LOG_RECOVER_INO_ITEM(xfs_log_recover_inode_cancel) +DEFINE_LOG_RECOVER_INO_ITEM(xfs_log_recover_inode_skip)#endif /* _TRACE_XFS_H */ Signature · 5 lines
-- Mathieu Desnoyers Operating System Efficiency R&D Consultant EfficiOS Inc. http://www.efficios.com
Signature · 4 lines
Mathieu Desnoyers Operating System Efficiency R&D Consultant EfficiOS Inc. http://www.efficios.com
Mathieu Desnoyers
reviewerRe: [RFC patch 27/28] trace event fs remove semicolons
In reply to Dave ChinnerQuoted 8 lines · * Dave Chinner ([email protected]) wrote:
Quoted 3 lines · Mathieu Desnoyers
Part of the gradual
TRACE_EVENT()semicolon removal. Enables creation of array of events, thus saving space for trace event probes. Remove extra trailing semicolons at the end of XFS and GFS2 trace event declarations.Can you split the patch in to a separate XFs and GFS2 patches (similar to the ext4-only patch) so we can take it through the XFS tree as needed?
Second patch, for GFS2:
trace event gfs2 remove semicolons
Part of the gradual TRACE_EVENT() semicolon removal. Enables creation of array of events, thus saving space for trace event probes. Remove extra trailing semicolons at the end of GFS2 trace event declarations.
Signed-off-by Mathieu Desnoyers <[email protected]>
CC Steven Rostedt <[email protected]>
CC Frederic Weisbecker <[email protected]>
CC Ingo Molnar <[email protected]>
CC Thomas Gleixner <[email protected]>
CC Steven Whitehouse <[email protected]>
--- fs/gfs2/trace_gfs2.h | 26 +++++++++++++------------- 1 file changed, 13 insertions(+), 13 deletions(-)
fs/gfs2/trace_gfs2.h +13 -13
@@ -42,8 +42,8 @@ {(1UL << GLF_FROZEN), "F" }, \ {(1UL << GLF_QUEUED), "q" }) -#ifndef NUMPTY -#define NUMPTY +#ifndef _TRACE_GFS2_DEF_ +#define _TRACE_GFS2_DEF_ static inline u8 glock_trace_state(unsigned int state) { switch(state) {
@@ -56,7 +56,7 @@ static inline u8 glock_trace_state(unsig }return DLM_LOCK_NL ; } -#endif +#endif /* _TRACE_GFS2_DEF_ */ /* Section 1 - Locking *
@@ -105,7 +105,7 @@ TRACE_EVENT(gfs2_glock_state_change, glock_trace_name(__entry->tgt_state), glock_trace_name(__entry->dmt_state), show_glock_flags(__entry->flags)) -); +)/* State change -> unlocked, glock is being deallocated */ TRACE_EVENT(gfs2_glock_put,
@@ -137,7 +137,7 @@ TRACE_EVENT(gfs2_glock_put, glock_trace_name(DLM_LOCK_IV), show_glock_flags(__entry->flags)) -); +)/* Callback (local or remote) requesting lock demotion */ TRACE_EVENT(gfs2_demote_rq,
@@ -171,7 +171,7 @@ TRACE_EVENT(gfs2_demote_rq, glock_trace_name(__entry->dmt_state), show_glock_flags(__entry->flags)) -); +)/* Promotion/grant of a glock */ TRACE_EVENT(gfs2_promote,
@@ -201,7 +201,7 @@ TRACE_EVENT(gfs2_promote, (unsigned long long)__entry->glnum, __entry->first ? "first": "other", glock_trace_name(__entry->state)) -); +)/* Queue/dequeue a lock request */ TRACE_EVENT(gfs2_glock_queue,
@@ -231,7 +231,7 @@ TRACE_EVENT(gfs2_glock_queue, (unsigned long long )__entry->glnum, __entry->queue ?"" :"de" , glock_trace_name(__entry->state)) -); +)/* Section 2 - Log/journal *
@@ -270,7 +270,7 @@ TRACE_EVENT(gfs2_pin, (unsigned long long)__entry->block, (unsigned long)__entry->len, (unsigned long long)__entry->ino) -); +)/* Flushing the log */ TRACE_EVENT(gfs2_log_flush,
@@ -295,7 +295,7 @@ TRACE_EVENT(gfs2_log_flush, MAJOR(__entry->dev), MINOR(__entry->dev), __entry->start ? "start" : "end", (unsigned long long)__entry->log_seq) -); +)/* Reserving/releasing blocks in the log */ TRACE_EVENT(gfs2_log_blocks,
@@ -316,7 +316,7 @@ TRACE_EVENT(gfs2_log_blocks,TP_printk ("%u,%u log reserve %d" ,MAJOR (__entry->dev),MINOR (__entry->dev), __entry->blocks) -); +)/* Section 3 - bmap *
@@ -364,7 +364,7 @@ TRACE_EVENT(gfs2_bmap, (unsigned long long)__entry->pblock, __entry->state, __entry->create ? "create " : "nocreate", __entry->errno) -); +)/* Keep track of blocks as they are allocated/freed */ TRACE_EVENT(gfs2_block_alloc,
@@ -396,7 +396,7 @@ TRACE_EVENT(gfs2_block_alloc, (unsigned long long)__entry->start, (unsigned long)__entry->len, block_state_name(__entry->block_state)) -); +)#endif /* _TRACE_GFS2_H */
Signature · 4 lines
Mathieu Desnoyers Operating System Efficiency R&D Consultant EfficiOS Inc. http://www.efficios.com
Steven Whitehouse
Acked-byRe: [RFC patch 27/28] trace event fs remove semicolons
Hi,
Steve.
Quoted 148 lines · Mathieu Desnoyers
Quoted 8 lines · * Dave Chinner ([email protected]) wrote:
Quoted 3 lines · Mathieu Desnoyers
Part of the gradual
TRACE_EVENT()semicolon removal. Enables creation of array of events, thus saving space for trace event probes. Remove extra trailing semicolons at the end of XFS and GFS2 trace event declarations.Can you split the patch in to a separate XFs and GFS2 patches (similar to the ext4-only patch) so we can take it through the XFS tree as needed?
Second patch, for GFS2:
trace event gfs2 remove semicolons
Part of the gradual
TRACE_EVENT()semicolon removal. Enables creation of array of events, thus saving space for trace event probes. Remove extra trailing semicolons at the end of GFS2 trace event declarations.Signed-off-by Mathieu Desnoyers <[email protected]>CC Steven Rostedt <[email protected]>CC Frederic Weisbecker <[email protected]>CC Ingo Molnar <[email protected]>CC Thomas Gleixner <[email protected]>CC Steven Whitehouse <[email protected]>--- fs/gfs2/trace_gfs2.h | 26 +++++++++++++------------- 1 file changed, 13 insertions(+), 13 deletions(-)Index:
linux-2.6-lttng/fs/gfs2/trace_gfs2.h
===================================================================fs/gfs2/trace_gfs2.h +13
-13@@ -42,8 +42,8 @@ {(1UL << GLF_FROZEN), "F" }, \ {(1UL << GLF_QUEUED), "q" }) -#ifndef NUMPTY -#define NUMPTY +#ifndef _TRACE_GFS2_DEF_ +#define _TRACE_GFS2_DEF_ static inline u8 glock_trace_state(unsigned int state) { switch(state) {@@ -56,7 +56,7 @@ static inline u8 glock_trace_state(unsig }return DLM_LOCK_NL ; } -#endif +#endif /* _TRACE_GFS2_DEF_ */ /* Section 1 - Locking * @@ -105,7 +105,7 @@ TRACE_EVENT(gfs2_glock_state_change, glock_trace_name(__entry->tgt_state), glock_trace_name(__entry->dmt_state), show_glock_flags(__entry->flags)) -); +)/* State change -> unlocked, glock is being deallocated */ TRACE_EVENT(gfs2_glock_put,@@ -137,7 +137,7 @@ TRACE_EVENT(gfs2_glock_put, glock_trace_name(DLM_LOCK_IV), show_glock_flags(__entry->flags)) -); +)/* Callback (local or remote) requesting lock demotion */ TRACE_EVENT(gfs2_demote_rq,@@ -171,7 +171,7 @@ TRACE_EVENT(gfs2_demote_rq, glock_trace_name(__entry->dmt_state), show_glock_flags(__entry->flags)) -); +)/* Promotion/grant of a glock */ TRACE_EVENT(gfs2_promote,@@ -201,7 +201,7 @@ TRACE_EVENT(gfs2_promote, (unsigned long long)__entry->glnum, __entry->first ? "first": "other", glock_trace_name(__entry->state)) -); +)/* Queue/dequeue a lock request */ TRACE_EVENT(gfs2_glock_queue,@@ -231,7 +231,7 @@ TRACE_EVENT(gfs2_glock_queue, (unsigned long long )__entry->glnum, __entry->queue ?"" :"de" , glock_trace_name(__entry->state)) -); +)/* Section 2 - Log/journal * @@ -270,7 +270,7 @@ TRACE_EVENT(gfs2_pin, (unsigned long long)__entry->block, (unsigned long)__entry->len, (unsigned long long)__entry->ino) -); +)/* Flushing the log */ TRACE_EVENT(gfs2_log_flush,@@ -295,7 +295,7 @@ TRACE_EVENT(gfs2_log_flush, MAJOR(__entry->dev), MINOR(__entry->dev), __entry->start ? "start" : "end", (unsigned long long)__entry->log_seq) -); +)/* Reserving/releasing blocks in the log */ TRACE_EVENT(gfs2_log_blocks,@@ -316,7 +316,7 @@ TRACE_EVENT(gfs2_log_blocks,TP_printk ("%u,%u log reserve %d" ,MAJOR (__entry->dev),MINOR (__entry->dev), __entry->blocks) -); +)/* Section 3 - bmap * @@ -364,7 +364,7 @@ TRACE_EVENT(gfs2_bmap, (unsigned long long)__entry->pblock, __entry->state, __entry->create ? "create " : "nocreate", __entry->errno) -); +)/* Keep track of blocks as they are allocated/freed */ TRACE_EVENT(gfs2_block_alloc,@@ -396,7 +396,7 @@ TRACE_EVENT(gfs2_block_alloc, (unsigned long long)__entry->start, (unsigned long)__entry->len, block_state_name(__entry->block_state)) -); +)#endif /* _TRACE_GFS2_H */ Signature · 5 lines
-- Mathieu Desnoyers Operating System Efficiency R&D Consultant EfficiOS Inc. http://www.efficios.com
Mathieu Desnoyers
reviewerRFC PATCH 28/28 trace event powerpc remove semicolons
In reply to Mathieu DesnoyersPart of the gradual TRACE_EVENT() semicolon removal. Enables creation of array of events, thus saving space for trace event probes.
Signed-off-by Mathieu Desnoyers <[email protected]>
CC Steven Rostedt <[email protected]>
CC Frederic Weisbecker <[email protected]>
CC Ingo Molnar <[email protected]>
CC Thomas Gleixner <[email protected]>
CC Anton Blanchard <[email protected]>
CC Paul Mackerras <[email protected]>
CC Christoph Hellwig <[email protected]>
CC Jeremy Kerr <[email protected]>
CC Benjamin Herrenschmidt <[email protected]>
--- arch/powerpc/include/asm/trace.h | 23 +++++++++++++++++------ arch/powerpc/platforms/cell/spufs/sputrace.h | 2 +- 2 files changed, 18 insertions(+), 7 deletions(-)
arch/powerpc/include/asm/trace.h +17 -6
@@ -6,8 +6,13 @@#include <linux/tracepoint.h> +#ifndef _TRACE_POWERPC_DEF_ +#define _TRACE_POWERPC_DEF_ +struct pt_regs ; +#endif /* _TRACE_POWERPC_DEF_ */ + TRACE_EVENT(irq_entry, TP_PROTO(struct pt_regs *regs),
@@ -23,7 +28,7 @@ TRACE_EVENT(irq_entry, ), TP_printk("pt_regs=%p", __entry->regs) -); +) TRACE_EVENT(irq_exit,
@@ -40,7 +45,7 @@ TRACE_EVENT(irq_exit, ), TP_printk("pt_regs=%p", __entry->regs) -); +) TRACE_EVENT(timer_interrupt_entry,
@@ -57,7 +62,7 @@ TRACE_EVENT(timer_interrupt_entry, ), TP_printk("pt_regs=%p", __entry->regs) -); +) TRACE_EVENT(timer_interrupt_exit,
@@ -74,12 +79,18 @@ TRACE_EVENT(timer_interrupt_exit, ), TP_printk("pt_regs=%p", __entry->regs) -); +)#ifdef CONFIG_PPC_PSERIES + +#ifndef _TRACE_PPC_PSERIES_DEF_ +#define _TRACE_PPC_PSERIES_DEF_ +extern void hcall_tracepoint_regfunc (void );extern void hcall_tracepoint_unregfunc (void ); +#endif /* _TRACE_PPC_PSERIES_DEF_ */ + TRACE_EVENT_FN(hcall_entry, TP_PROTO(unsigned long opcode, unsigned long *args),
@@ -97,7 +108,7 @@ TRACE_EVENT_FN(hcall_entry, TP_printk("opcode=%lu", __entry->opcode), hcall_tracepoint_regfunc, hcall_tracepoint_unregfunc -); +) TRACE_EVENT_FN(hcall_exit,
@@ -119,7 +130,7 @@ TRACE_EVENT_FN(hcall_exit, TP_printk("opcode=%lu retval=%lu", __entry->opcode, __entry->retval), hcall_tracepoint_regfunc, hcall_tracepoint_unregfunc -); +)#endif #endif /* _TRACE_POWERPC_H */
arch/powerpc/platforms/cell/spufs/sputrace.h +1 -1
@@ -24,7 +24,7 @@ TRACE_EVENT(spufs_context, TP_printk("%s (ctxthread = %d, spu = %d)", __entry->name, __entry->owner_tid, __entry->number) -); +)#define spu_context_trace (name, ctx, spu) \ trace_spufs_context(ctx, spu, __stringify(name))
Quoted 5 lines · Mathieu Desnoyers
Hi,
I am hereby proposing the removal of trailing semicolons within the trace event headers.
Quoted 8 lines
Please refer to "patch 01:
TRACE_EVENT: gradual semicolon removal" for explanation of this change. This patchset is based on the 2.6.37 kernel.Feedback is welcome,
Thanks,
Mathieu
So, it seems there is no issue in spreading the whole into each relevant trees?
The others (core, bkl, lock, sched, etc...) can go through the tracing tree as often did by the past. Same for some others if necessary.
Mathieu Desnoyers
reviewerQuoted 11 lines · * Frederic Weisbecker ([email protected]) wrote:
Quoted 10 lines · Mathieu Desnoyers
Hi,
I am hereby proposing the removal of trailing semicolons within the trace event headers.
Please refer to "patch 01:
TRACE_EVENT: gradual semicolon removal" for explanation of this change. This patchset is based on the 2.6.37 kernel.Feedback is welcome,
Quoted 7 lines
Quoted 3 lines
Thanks,
Mathieu
So, it seems there is no issue in spreading the whole into each relevant trees?
Because there is a dependency on patch 01, I think it would be much less painful to bring in the whole patchset through the tracing tree rather than each targeted tree. Otherwise, we have to ensure that each tree has pulled the commit from the tracing tree before pulling the patches that depend on it.
And it only really touches the include/trace/ header files, so it's not as if it touched any specific subsystem code.
Thanks,
Mathieu
Signature · 4 lines
Mathieu Desnoyers Operating System Efficiency R&D Consultant EfficiOS Inc. http://www.efficios.com
Quoted 17 lines · Mathieu Desnoyers
Quoted 16 lines · * Frederic Weisbecker ([email protected]) wrote:
Quoted 13 lines · Mathieu Desnoyers
Hi,
I am hereby proposing the removal of trailing semicolons within the trace event headers.
Please refer to "patch 01:
TRACE_EVENT: gradual semicolon removal" for explanation of this change. This patchset is based on the 2.6.37 kernel.Feedback is welcome,
Thanks,
Mathieu
Quoted 7 lines
Quoted 2 lines
So, it seems there is no issue in spreading the whole into each relevant trees?
Because there is a dependency on patch 01, I think it would be much less painful to bring in the whole patchset through the tracing tree rather than each targeted tree. Otherwise, we have to ensure that each tree has pulled the commit from the tracing tree before pulling the patches that depend on it.
Ok.
Quoted 2 lines
And it only really touches the
include/trace/header files, so it's not as if it touched any specific subsystem code.
Beware, there are many trace events all over the kernel, not only in include/trace
Mathieu Desnoyers
reviewerQuoted 26 lines · * Frederic Weisbecker ([email protected]) wrote:
Quoted 17 lines · Mathieu Desnoyers
Quoted 16 lines · * Frederic Weisbecker ([email protected]) wrote:
Quoted 13 lines · Mathieu Desnoyers
Hi,
I am hereby proposing the removal of trailing semicolons within the trace event headers.
Please refer to "patch 01:
TRACE_EVENT: gradual semicolon removal" for explanation of this change. This patchset is based on the 2.6.37 kernel.Feedback is welcome,
Thanks,
Mathieu
Quoted 7 lines
Quoted 2 lines
So, it seems there is no issue in spreading the whole into each relevant trees?
Because there is a dependency on patch 01, I think it would be much less painful to bring in the whole patchset through the tracing tree rather than each targeted tree. Otherwise, we have to ensure that each tree has pulled the commit from the tracing tree before pulling the patches that depend on it.
Quoted 7 lines
Ok.
Quoted 2 lines
And it only really touches the
include/trace/header files, so it's not as if it touched any specific subsystem code.Beware, there are many trace events all over the kernel, not only in
include/trace
That's right. I grepped for all includes of define_trace.h throughout the whole kernel to find the others. But they also depend on patch 01.
Thanks,
Mathieu
Signature · 4 lines
Mathieu Desnoyers Operating System Efficiency R&D Consultant EfficiOS Inc. http://www.efficios.com