X-Git-Url: https://git.lttng.org/?a=blobdiff_plain;f=instrumentation%2Fevents%2Flttng-module%2Fjbd.h;h=d1da49a09733deef55adb7361b430a5d4d317ccd;hb=3579179e8028a10a3298c7b712a9fc6f8c0d721a;hp=97ba1e59ff5ba9d97027769e850a1be861530b4a;hpb=b283666ff19841a28b0448c6a867beb2f809f11a;p=lttng-modules.git diff --git a/instrumentation/events/lttng-module/jbd.h b/instrumentation/events/lttng-module/jbd.h index 97ba1e59..d1da49a0 100644 --- a/instrumentation/events/lttng-module/jbd.h +++ b/instrumentation/events/lttng-module/jbd.h @@ -1,13 +1,14 @@ #undef TRACE_SYSTEM #define TRACE_SYSTEM jbd -#if !defined(_TRACE_JBD_H) || defined(TRACE_HEADER_MULTI_READ) -#define _TRACE_JBD_H +#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 -TRACE_EVENT(jbd_checkpoint, +LTTNG_TRACEPOINT_EVENT(jbd_checkpoint, TP_PROTO(journal_t *journal, int result), @@ -19,8 +20,8 @@ TRACE_EVENT(jbd_checkpoint, ), TP_fast_assign( - tp_assign(dev, journal->j_fs_dev->bd_dev); - tp_assign(result, result); + tp_assign(dev, journal->j_fs_dev->bd_dev) + tp_assign(result, result) ), TP_printk("dev %d,%d result %d", @@ -28,7 +29,7 @@ TRACE_EVENT(jbd_checkpoint, __entry->result) ) -DECLARE_EVENT_CLASS(jbd_commit, +LTTNG_TRACEPOINT_EVENT_CLASS(jbd_commit, TP_PROTO(journal_t *journal, transaction_t *commit_transaction), @@ -43,11 +44,11 @@ DECLARE_EVENT_CLASS(jbd_commit, ), TP_fast_assign( - tp_assign(dev, journal->j_fs_dev->bd_dev); + tp_assign(dev, journal->j_fs_dev->bd_dev) #if (LINUX_VERSION_CODE < KERNEL_VERSION(3,5,0)) - tp_assign(sync_commit, commit_transaction->t_synchronous_commit); + tp_assign(sync_commit, commit_transaction->t_synchronous_commit) #endif - tp_assign(transaction, commit_transaction->t_tid); + tp_assign(transaction, commit_transaction->t_tid) ), #if (LINUX_VERSION_CODE < KERNEL_VERSION(3,5,0)) @@ -61,35 +62,35 @@ DECLARE_EVENT_CLASS(jbd_commit, #endif ) -DEFINE_EVENT(jbd_commit, jbd_start_commit, +LTTNG_TRACEPOINT_EVENT_INSTANCE(jbd_commit, jbd_start_commit, TP_PROTO(journal_t *journal, transaction_t *commit_transaction), TP_ARGS(journal, commit_transaction) ) -DEFINE_EVENT(jbd_commit, jbd_commit_locking, +LTTNG_TRACEPOINT_EVENT_INSTANCE(jbd_commit, jbd_commit_locking, TP_PROTO(journal_t *journal, transaction_t *commit_transaction), TP_ARGS(journal, commit_transaction) ) -DEFINE_EVENT(jbd_commit, jbd_commit_flushing, +LTTNG_TRACEPOINT_EVENT_INSTANCE(jbd_commit, jbd_commit_flushing, TP_PROTO(journal_t *journal, transaction_t *commit_transaction), TP_ARGS(journal, commit_transaction) ) -DEFINE_EVENT(jbd_commit, jbd_commit_logging, +LTTNG_TRACEPOINT_EVENT_INSTANCE(jbd_commit, jbd_commit_logging, TP_PROTO(journal_t *journal, transaction_t *commit_transaction), TP_ARGS(journal, commit_transaction) ) -TRACE_EVENT(jbd_drop_transaction, +LTTNG_TRACEPOINT_EVENT(jbd_drop_transaction, TP_PROTO(journal_t *journal, transaction_t *commit_transaction), @@ -104,11 +105,11 @@ TRACE_EVENT(jbd_drop_transaction, ), TP_fast_assign( - tp_assign(dev, journal->j_fs_dev->bd_dev); + tp_assign(dev, journal->j_fs_dev->bd_dev) #if (LINUX_VERSION_CODE < KERNEL_VERSION(3,5,0)) - tp_assign(sync_commit, commit_transaction->t_synchronous_commit); + tp_assign(sync_commit, commit_transaction->t_synchronous_commit) #endif - tp_assign(transaction, commit_transaction->t_tid); + tp_assign(transaction, commit_transaction->t_tid) ), #if (LINUX_VERSION_CODE < KERNEL_VERSION(3,5,0)) @@ -122,7 +123,7 @@ TRACE_EVENT(jbd_drop_transaction, #endif ) -TRACE_EVENT(jbd_end_commit, +LTTNG_TRACEPOINT_EVENT(jbd_end_commit, TP_PROTO(journal_t *journal, transaction_t *commit_transaction), TP_ARGS(journal, commit_transaction), @@ -137,12 +138,12 @@ TRACE_EVENT(jbd_end_commit, ), TP_fast_assign( - tp_assign(dev, journal->j_fs_dev->bd_dev); + tp_assign(dev, journal->j_fs_dev->bd_dev) #if (LINUX_VERSION_CODE < KERNEL_VERSION(3,5,0)) - tp_assign(sync_commit, commit_transaction->t_synchronous_commit); + tp_assign(sync_commit, commit_transaction->t_synchronous_commit) #endif - tp_assign(transaction, commit_transaction->t_tid); - tp_assign(head, journal->j_tail_sequence); + tp_assign(transaction, commit_transaction->t_tid) + tp_assign(head, journal->j_tail_sequence) ), #if (LINUX_VERSION_CODE < KERNEL_VERSION(3,5,0)) @@ -156,7 +157,7 @@ TRACE_EVENT(jbd_end_commit, #endif ) -TRACE_EVENT(jbd_do_submit_data, +LTTNG_TRACEPOINT_EVENT(jbd_do_submit_data, TP_PROTO(journal_t *journal, transaction_t *commit_transaction), TP_ARGS(journal, commit_transaction), @@ -170,11 +171,11 @@ TRACE_EVENT(jbd_do_submit_data, ), TP_fast_assign( - tp_assign(dev, journal->j_fs_dev->bd_dev); + tp_assign(dev, journal->j_fs_dev->bd_dev) #if (LINUX_VERSION_CODE < KERNEL_VERSION(3,5,0)) - tp_assign(sync_commit, commit_transaction->t_synchronous_commit); + tp_assign(sync_commit, commit_transaction->t_synchronous_commit) #endif - tp_assign(transaction, commit_transaction->t_tid); + tp_assign(transaction, commit_transaction->t_tid) ), #if (LINUX_VERSION_CODE < KERNEL_VERSION(3,5,0)) @@ -188,7 +189,7 @@ TRACE_EVENT(jbd_do_submit_data, #endif ) -TRACE_EVENT(jbd_cleanup_journal_tail, +LTTNG_TRACEPOINT_EVENT(jbd_cleanup_journal_tail, TP_PROTO(journal_t *journal, tid_t first_tid, unsigned long block_nr, unsigned long freed), @@ -204,11 +205,11 @@ TRACE_EVENT(jbd_cleanup_journal_tail, ), TP_fast_assign( - tp_assign(dev, journal->j_fs_dev->bd_dev); - tp_assign(tail_sequence, journal->j_tail_sequence); - tp_assign(first_tid, first_tid); - tp_assign(block_nr, block_nr); - tp_assign(freed, freed); + tp_assign(dev, journal->j_fs_dev->bd_dev) + tp_assign(tail_sequence, journal->j_tail_sequence) + tp_assign(first_tid, first_tid) + tp_assign(block_nr, block_nr) + tp_assign(freed, freed) ), TP_printk("dev %d,%d from %u to %u offset %lu freed %lu", @@ -217,7 +218,30 @@ TRACE_EVENT(jbd_cleanup_journal_tail, __entry->block_nr, __entry->freed) ) -TRACE_EVENT(jbd_update_superblock_end, +#if (LINUX_VERSION_CODE >= KERNEL_VERSION(3,5,0)) +LTTNG_TRACEPOINT_EVENT_MAP(journal_write_superblock, + + jbd_journal_write_superblock, + + TP_PROTO(journal_t *journal, int write_op), + + 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) +) +#else +LTTNG_TRACEPOINT_EVENT(jbd_update_superblock_end, TP_PROTO(journal_t *journal, int wait), TP_ARGS(journal, wait), @@ -228,16 +252,17 @@ TRACE_EVENT(jbd_update_superblock_end, ), TP_fast_assign( - tp_assign(dev, journal->j_fs_dev->bd_dev); - tp_assign(wait, wait); + tp_assign(dev, journal->j_fs_dev->bd_dev) + tp_assign(wait, wait) ), TP_printk("dev %d,%d wait %d", MAJOR(__entry->dev), MINOR(__entry->dev), __entry->wait) ) +#endif -#endif /* _TRACE_JBD_H */ +#endif /* LTTNG_TRACE_JBD_H */ /* This part must be outside protection */ #include "../../../probes/define_trace.h"