X-Git-Url: https://git.liburcu.org/?a=blobdiff_plain;f=instrumentation%2Fevents%2Flttng-module%2Fjbd.h;h=acc8a48d3c619e4357ce2f22844bac807fdb5195;hb=9f36eaed6f91d5897924b551b44d1edd8cee00e2;hp=d1da49a09733deef55adb7361b430a5d4d317ccd;hpb=3bc29f0a41b3c803245b845db2e1909042e72e9c;p=lttng-modules.git diff --git a/instrumentation/events/lttng-module/jbd.h b/instrumentation/events/lttng-module/jbd.h index d1da49a0..acc8a48d 100644 --- a/instrumentation/events/lttng-module/jbd.h +++ b/instrumentation/events/lttng-module/jbd.h @@ -1,10 +1,11 @@ +/* SPDX-License-Identifier: GPL-2.0 */ #undef TRACE_SYSTEM #define TRACE_SYSTEM jbd #if !defined(LTTNG_TRACE_JBD_H) || defined(TRACE_HEADER_MULTI_READ) #define LTTNG_TRACE_JBD_H -#include "../../../probes/lttng-tracepoint-event.h" +#include #include #include @@ -14,19 +15,10 @@ LTTNG_TRACEPOINT_EVENT(jbd_checkpoint, TP_ARGS(journal, result), - TP_STRUCT__entry( - __field( dev_t, dev ) - __field( int, result ) - ), - - TP_fast_assign( - tp_assign(dev, journal->j_fs_dev->bd_dev) - tp_assign(result, result) - ), - - TP_printk("dev %d,%d result %d", - MAJOR(__entry->dev), MINOR(__entry->dev), - __entry->result) + TP_FIELDS( + ctf_integer(dev_t, dev, journal->j_fs_dev->bd_dev) + ctf_integer(int, result, result) + ) ) LTTNG_TRACEPOINT_EVENT_CLASS(jbd_commit, @@ -35,31 +27,13 @@ LTTNG_TRACEPOINT_EVENT_CLASS(jbd_commit, TP_ARGS(journal, commit_transaction), - TP_STRUCT__entry( - __field( dev_t, dev ) -#if (LINUX_VERSION_CODE < KERNEL_VERSION(3,5,0)) - __field( char, sync_commit ) -#endif - __field( int, transaction ) - ), - - TP_fast_assign( - tp_assign(dev, journal->j_fs_dev->bd_dev) + TP_FIELDS( + ctf_integer(dev_t, dev, journal->j_fs_dev->bd_dev) #if (LINUX_VERSION_CODE < KERNEL_VERSION(3,5,0)) - tp_assign(sync_commit, commit_transaction->t_synchronous_commit) -#endif - tp_assign(transaction, commit_transaction->t_tid) - ), - -#if (LINUX_VERSION_CODE < KERNEL_VERSION(3,5,0)) - TP_printk("dev %d,%d transaction %d sync %d", - MAJOR(__entry->dev), MINOR(__entry->dev), - __entry->transaction, __entry->sync_commit) -#else - TP_printk("dev %d,%d transaction %d", - MAJOR(__entry->dev), MINOR(__entry->dev), - __entry->transaction) + ctf_integer(char, sync_commit, commit_transaction->t_synchronous_commit) #endif + ctf_integer(int, transaction, commit_transaction->t_tid) + ) ) LTTNG_TRACEPOINT_EVENT_INSTANCE(jbd_commit, jbd_start_commit, @@ -96,31 +70,13 @@ LTTNG_TRACEPOINT_EVENT(jbd_drop_transaction, TP_ARGS(journal, commit_transaction), - TP_STRUCT__entry( - __field( dev_t, dev ) + TP_FIELDS( + ctf_integer(dev_t, dev, journal->j_fs_dev->bd_dev) #if (LINUX_VERSION_CODE < KERNEL_VERSION(3,5,0)) - __field( char, sync_commit ) -#endif - __field( int, transaction ) - ), - - TP_fast_assign( - tp_assign(dev, journal->j_fs_dev->bd_dev) -#if (LINUX_VERSION_CODE < KERNEL_VERSION(3,5,0)) - tp_assign(sync_commit, commit_transaction->t_synchronous_commit) -#endif - tp_assign(transaction, commit_transaction->t_tid) - ), - -#if (LINUX_VERSION_CODE < KERNEL_VERSION(3,5,0)) - TP_printk("dev %d,%d transaction %d sync %d", - MAJOR(__entry->dev), MINOR(__entry->dev), - __entry->transaction, __entry->sync_commit) -#else - TP_printk("dev %d,%d transaction %d", - MAJOR(__entry->dev), MINOR(__entry->dev), - __entry->transaction) + ctf_integer(char, sync_commit, commit_transaction->t_synchronous_commit) #endif + ctf_integer(int, transaction, commit_transaction->t_tid) + ) ) LTTNG_TRACEPOINT_EVENT(jbd_end_commit, @@ -128,33 +84,14 @@ LTTNG_TRACEPOINT_EVENT(jbd_end_commit, TP_ARGS(journal, commit_transaction), - TP_STRUCT__entry( - __field( dev_t, dev ) -#if (LINUX_VERSION_CODE < KERNEL_VERSION(3,5,0)) - __field( char, sync_commit ) -#endif - __field( int, transaction ) - __field( int, head ) - ), - - TP_fast_assign( - tp_assign(dev, journal->j_fs_dev->bd_dev) + TP_FIELDS( + ctf_integer(dev_t, dev, journal->j_fs_dev->bd_dev) #if (LINUX_VERSION_CODE < KERNEL_VERSION(3,5,0)) - tp_assign(sync_commit, commit_transaction->t_synchronous_commit) -#endif - tp_assign(transaction, commit_transaction->t_tid) - tp_assign(head, journal->j_tail_sequence) - ), - -#if (LINUX_VERSION_CODE < KERNEL_VERSION(3,5,0)) - TP_printk("dev %d,%d transaction %d sync %d head %d", - MAJOR(__entry->dev), MINOR(__entry->dev), - __entry->transaction, __entry->sync_commit, __entry->head) -#else - TP_printk("dev %d,%d transaction %d head %d", - MAJOR(__entry->dev), MINOR(__entry->dev), - __entry->transaction, __entry->head) + ctf_integer(char, sync_commit, commit_transaction->t_synchronous_commit) #endif + ctf_integer(int, transaction, commit_transaction->t_tid) + ctf_integer(int, head, journal->j_tail_sequence) + ) ) LTTNG_TRACEPOINT_EVENT(jbd_do_submit_data, @@ -162,31 +99,13 @@ LTTNG_TRACEPOINT_EVENT(jbd_do_submit_data, TP_ARGS(journal, commit_transaction), - TP_STRUCT__entry( - __field( dev_t, dev ) -#if (LINUX_VERSION_CODE < KERNEL_VERSION(3,5,0)) - __field( char, sync_commit ) -#endif - __field( int, transaction ) - ), - - TP_fast_assign( - tp_assign(dev, journal->j_fs_dev->bd_dev) + TP_FIELDS( + ctf_integer(dev_t, dev, journal->j_fs_dev->bd_dev) #if (LINUX_VERSION_CODE < KERNEL_VERSION(3,5,0)) - tp_assign(sync_commit, commit_transaction->t_synchronous_commit) -#endif - tp_assign(transaction, commit_transaction->t_tid) - ), - -#if (LINUX_VERSION_CODE < KERNEL_VERSION(3,5,0)) - TP_printk("dev %d,%d transaction %d sync %d", - MAJOR(__entry->dev), MINOR(__entry->dev), - __entry->transaction, __entry->sync_commit) -#else - TP_printk("dev %d,%d transaction %d", - MAJOR(__entry->dev), MINOR(__entry->dev), - __entry->transaction) + ctf_integer(char, sync_commit, commit_transaction->t_synchronous_commit) #endif + ctf_integer(int, transaction, commit_transaction->t_tid) + ) ) LTTNG_TRACEPOINT_EVENT(jbd_cleanup_journal_tail, @@ -196,26 +115,13 @@ LTTNG_TRACEPOINT_EVENT(jbd_cleanup_journal_tail, TP_ARGS(journal, first_tid, block_nr, freed), - TP_STRUCT__entry( - __field( dev_t, dev ) - __field( tid_t, tail_sequence ) - __field( tid_t, first_tid ) - __field(unsigned long, block_nr ) - __field(unsigned long, freed ) - ), - - TP_fast_assign( - tp_assign(dev, journal->j_fs_dev->bd_dev) - tp_assign(tail_sequence, journal->j_tail_sequence) - tp_assign(first_tid, first_tid) - tp_assign(block_nr, block_nr) - tp_assign(freed, freed) - ), - - TP_printk("dev %d,%d from %u to %u offset %lu freed %lu", - MAJOR(__entry->dev), MINOR(__entry->dev), - __entry->tail_sequence, __entry->first_tid, - __entry->block_nr, __entry->freed) + TP_FIELDS( + ctf_integer(dev_t, dev, journal->j_fs_dev->bd_dev) + ctf_integer(tid_t, tail_sequence, journal->j_tail_sequence) + ctf_integer(tid_t, first_tid, first_tid) + ctf_integer(unsigned long, block_nr, block_nr) + ctf_integer(unsigned long, freed, freed) + ) ) #if (LINUX_VERSION_CODE >= KERNEL_VERSION(3,5,0)) @@ -227,18 +133,10 @@ LTTNG_TRACEPOINT_EVENT_MAP(journal_write_superblock, TP_ARGS(journal, write_op), - TP_STRUCT__entry( - __field( dev_t, dev ) - __field( int, write_op ) - ), - - TP_fast_assign( - tp_assign(dev, journal->j_fs_dev->bd_dev) - tp_assign(write_op, write_op) - ), - - TP_printk("dev %d,%d write_op %x", MAJOR(__entry->dev), - MINOR(__entry->dev), __entry->write_op) + TP_FIELDS( + ctf_integer(dev_t, dev, journal->j_fs_dev->bd_dev) + ctf_integer(int, write_op, write_op) + ) ) #else LTTNG_TRACEPOINT_EVENT(jbd_update_superblock_end, @@ -246,23 +144,14 @@ LTTNG_TRACEPOINT_EVENT(jbd_update_superblock_end, TP_ARGS(journal, wait), - TP_STRUCT__entry( - __field( dev_t, dev ) - __field( int, wait ) - ), - - TP_fast_assign( - tp_assign(dev, journal->j_fs_dev->bd_dev) - tp_assign(wait, wait) - ), - - TP_printk("dev %d,%d wait %d", - MAJOR(__entry->dev), MINOR(__entry->dev), - __entry->wait) + TP_FIELDS( + ctf_integer(dev_t, dev, journal->j_fs_dev->bd_dev) + ctf_integer(int, wait, wait) + ) ) #endif #endif /* LTTNG_TRACE_JBD_H */ /* This part must be outside protection */ -#include "../../../probes/define_trace.h" +#include