X-Git-Url: http://git.lttng.org/?a=blobdiff_plain;f=instrumentation%2Fevents%2Flttng-module%2Fext4.h;h=fe6f802be9ee47f83d530d6fb68229f0dd84669d;hb=2e9cb2ea35b4d7f91af714cbddf58b674bbf7b2c;hp=41c89fd3bb65cc6c5887c04e76b0e06f0c9cac81;hpb=f127e61ee231d002fb9a7803643a157e06f6d2e2;p=lttng-modules.git diff --git a/instrumentation/events/lttng-module/ext4.h b/instrumentation/events/lttng-module/ext4.h index 41c89fd3..fe6f802b 100644 --- a/instrumentation/events/lttng-module/ext4.h +++ b/instrumentation/events/lttng-module/ext4.h @@ -4,7 +4,7 @@ #if !defined(LTTNG_TRACE_EXT4_H) || defined(TRACE_HEADER_MULTI_READ) #define LTTNG_TRACE_EXT4_H -#include "../../../probes/lttng-tracepoint-event.h" +#include #include #include @@ -277,7 +277,7 @@ LTTNG_TRACEPOINT_EVENT(ext4_da_write_pages, ctf_integer(int, io_done, mpd->io_done) ctf_integer(int, pages_written, mpd->pages_written) #if (LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,39)) - ctf_integer(int, sync_mode, mpd->sync_mode) + ctf_integer(int, sync_mode, mpd->wbc->sync_mode) #endif ) ) @@ -689,6 +689,19 @@ LTTNG_TRACEPOINT_EVENT(ext4_sync_fs, ) ) +#if (LINUX_VERSION_CODE >= KERNEL_VERSION(4,13,0)) +LTTNG_TRACEPOINT_EVENT(ext4_alloc_da_blocks, + TP_PROTO(struct inode *inode), + + TP_ARGS(inode), + + TP_FIELDS( + ctf_integer(dev_t, dev, inode->i_sb->s_dev) + ctf_integer(ino_t, ino, inode->i_ino) + ctf_integer(unsigned int, data_blocks, EXT4_I(inode)->i_reserved_data_blocks) + ) +) +#else LTTNG_TRACEPOINT_EVENT(ext4_alloc_da_blocks, TP_PROTO(struct inode *inode), @@ -701,6 +714,7 @@ LTTNG_TRACEPOINT_EVENT(ext4_alloc_da_blocks, ctf_integer(unsigned int, meta_blocks, EXT4_I(inode)->i_reserved_meta_blocks) ) ) +#endif LTTNG_TRACEPOINT_EVENT(ext4_mballoc_alloc, TP_PROTO(struct ext4_allocation_context *ac), @@ -833,17 +847,49 @@ LTTNG_TRACEPOINT_EVENT(ext4_forget, ) #endif -#if (LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,34)) +#if (LINUX_VERSION_CODE >= KERNEL_VERSION(4,13,0)) LTTNG_TRACEPOINT_EVENT(ext4_da_update_reserve_space, -#if (LINUX_VERSION_CODE >= KERNEL_VERSION(3,2,0)) TP_PROTO(struct inode *inode, int used_blocks, int quota_claim), TP_ARGS(inode, used_blocks, quota_claim), -#else + + TP_FIELDS( + ctf_integer(dev_t, dev, inode->i_sb->s_dev) + ctf_integer(ino_t, ino, inode->i_ino) + ctf_integer(__u64, i_blocks, inode->i_blocks) + ctf_integer(int, used_blocks, used_blocks) + ctf_integer(int, reserved_data_blocks, + EXT4_I(inode)->i_reserved_data_blocks) + ctf_integer(int, quota_claim, quota_claim) + ctf_integer(TP_MODE_T, mode, inode->i_mode) + ) +) +#elif (LINUX_VERSION_CODE >= KERNEL_VERSION(3,2,0)) +LTTNG_TRACEPOINT_EVENT(ext4_da_update_reserve_space, + TP_PROTO(struct inode *inode, int used_blocks, int quota_claim), + + TP_ARGS(inode, used_blocks, quota_claim), + + TP_FIELDS( + ctf_integer(dev_t, dev, inode->i_sb->s_dev) + ctf_integer(ino_t, ino, inode->i_ino) + ctf_integer(__u64, i_blocks, inode->i_blocks) + ctf_integer(int, used_blocks, used_blocks) + ctf_integer(int, reserved_data_blocks, + EXT4_I(inode)->i_reserved_data_blocks) + ctf_integer(int, reserved_meta_blocks, + EXT4_I(inode)->i_reserved_meta_blocks) + ctf_integer(int, allocated_meta_blocks, + EXT4_I(inode)->i_allocated_meta_blocks) + ctf_integer(int, quota_claim, quota_claim) + ctf_integer(TP_MODE_T, mode, inode->i_mode) + ) +) +#elif (LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,34)) +LTTNG_TRACEPOINT_EVENT(ext4_da_update_reserve_space, TP_PROTO(struct inode *inode, int used_blocks), TP_ARGS(inode, used_blocks), -#endif TP_FIELDS( ctf_integer(dev_t, dev, inode->i_sb->s_dev) @@ -856,13 +902,44 @@ LTTNG_TRACEPOINT_EVENT(ext4_da_update_reserve_space, EXT4_I(inode)->i_reserved_meta_blocks) ctf_integer(int, allocated_meta_blocks, EXT4_I(inode)->i_allocated_meta_blocks) -#if (LINUX_VERSION_CODE >= KERNEL_VERSION(3,2,0)) - ctf_integer(int, quota_claim, quota_claim) + ctf_integer(TP_MODE_T, mode, inode->i_mode) + ) +) #endif + +#if (LINUX_VERSION_CODE >= KERNEL_VERSION(4,13,0)) +LTTNG_TRACEPOINT_EVENT(ext4_da_reserve_space, + TP_PROTO(struct inode *inode), + + TP_ARGS(inode), + + TP_FIELDS( + ctf_integer(dev_t, dev, inode->i_sb->s_dev) + ctf_integer(ino_t, ino, inode->i_ino) + ctf_integer(__u64, i_blocks, inode->i_blocks) + ctf_integer(int, reserved_data_blocks, + EXT4_I(inode)->i_reserved_data_blocks) ctf_integer(TP_MODE_T, mode, inode->i_mode) ) ) +#elif (LINUX_VERSION_CODE >= KERNEL_VERSION(4,2,0)) +LTTNG_TRACEPOINT_EVENT(ext4_da_reserve_space, + TP_PROTO(struct inode *inode), + TP_ARGS(inode), + + TP_FIELDS( + ctf_integer(dev_t, dev, inode->i_sb->s_dev) + ctf_integer(ino_t, ino, inode->i_ino) + ctf_integer(__u64, i_blocks, inode->i_blocks) + ctf_integer(int, reserved_data_blocks, + EXT4_I(inode)->i_reserved_data_blocks) + ctf_integer(int, reserved_meta_blocks, + EXT4_I(inode)->i_reserved_meta_blocks) + ctf_integer(TP_MODE_T, mode, inode->i_mode) + ) +) +#elif (LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,34)) LTTNG_TRACEPOINT_EVENT(ext4_da_reserve_space, TP_PROTO(struct inode *inode, int md_needed), @@ -880,7 +957,25 @@ LTTNG_TRACEPOINT_EVENT(ext4_da_reserve_space, ctf_integer(TP_MODE_T, mode, inode->i_mode) ) ) +#endif + +#if (LINUX_VERSION_CODE >= KERNEL_VERSION(4,13,0)) +LTTNG_TRACEPOINT_EVENT(ext4_da_release_space, + TP_PROTO(struct inode *inode, int freed_blocks), + + TP_ARGS(inode, freed_blocks), + TP_FIELDS( + ctf_integer(dev_t, dev, inode->i_sb->s_dev) + ctf_integer(ino_t, ino, inode->i_ino) + ctf_integer(__u64, i_blocks, inode->i_blocks) + ctf_integer(int, freed_blocks, freed_blocks) + ctf_integer(int, reserved_data_blocks, + EXT4_I(inode)->i_reserved_data_blocks) + ctf_integer(TP_MODE_T, mode, inode->i_mode) + ) +) +#elif (LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,34)) LTTNG_TRACEPOINT_EVENT(ext4_da_release_space, TP_PROTO(struct inode *inode, int freed_blocks), @@ -1229,7 +1324,6 @@ LTTNG_TRACEPOINT_EVENT_CLASS(ext4__map_blocks_exit, TP_FIELDS( ctf_integer(dev_t, dev, inode->i_sb->s_dev) ctf_integer(ino_t, ino, inode->i_ino) - ctf_integer(unsigned int, flags, flags) ctf_integer(ext4_fsblk_t, pblk, map->m_pblk) ctf_integer(ext4_lblk_t, lblk, map->m_lblk) ctf_integer(unsigned int, len, map->m_len) @@ -1824,4 +1918,4 @@ LTTNG_TRACEPOINT_EVENT(ext4_es_shrink_exit, #endif /* LTTNG_TRACE_EXT4_H */ /* This part must be outside protection */ -#include "../../../probes/define_trace.h" +#include