projects / lttng-modules.git / blobdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | inline | side by side
Rename LTTng instrumentation macros
[lttng-modules.git] / instrumentation / events / lttng-module / jbd2.h
diff --git a/instrumentation/events/lttng-module/jbd2.h b/instrumentation/events/lttng-module/jbd2.h
index 91e2e6c0d06dbf36ab9ac8e988ec8edf3ff97a1e..491a15a97d70683635c8cc1e2f4b4b4008ea687a 100644 (file)
--- a/instrumentation/events/lttng-module/jbd2.h
+++ b/instrumentation/events/lttng-module/jbd2.h
@@ -1,19 +1,22 @@
 #undef TRACE_SYSTEM
 #define TRACE_SYSTEM jbd2
 
-#if !defined(_TRACE_JBD2_H) || defined(TRACE_HEADER_MULTI_READ)
-#define _TRACE_JBD2_H
+#if !defined(LTTNG_TRACE_JBD2_H) || defined(TRACE_HEADER_MULTI_READ)
+#define LTTNG_TRACE_JBD2_H
 
+#include "../../../probes/lttng-tracepoint-event.h"
 #include <linux/jbd2.h>
-#include <linux/tracepoint.h>
+#include <linux/version.h>
 
+#if (LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,32))
 #ifndef _TRACE_JBD2_DEF
 #define _TRACE_JBD2_DEF
 struct transaction_chp_stats_s;
 struct transaction_run_stats_s;
 #endif
+#endif
 
-TRACE_EVENT(jbd2_checkpoint,
+LTTNG_TRACEPOINT_EVENT(jbd2_checkpoint,
 
        TP_PROTO(journal_t *journal, int result),
 
@@ -25,15 +28,15 @@ TRACE_EVENT(jbd2_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",
                  MAJOR(__entry->dev), MINOR(__entry->dev), __entry->result)
 )
 
-DECLARE_EVENT_CLASS(jbd2_commit,
+LTTNG_TRACEPOINT_EVENT_CLASS(jbd2_commit,
 
        TP_PROTO(journal_t *journal, transaction_t *commit_transaction),
 
@@ -46,9 +49,9 @@ DECLARE_EVENT_CLASS(jbd2_commit,
        ),
 
        TP_fast_assign(
-               tp_assign(dev, journal->j_fs_dev->bd_dev);
-               tp_assign(sync_commit, commit_transaction->t_synchronous_commit);
-               tp_assign(transaction, commit_transaction->t_tid);
+               tp_assign(dev, journal->j_fs_dev->bd_dev)
+               tp_assign(sync_commit, commit_transaction->t_synchronous_commit)
+               tp_assign(transaction, commit_transaction->t_tid)
        ),
 
        TP_printk("dev %d,%d transaction %d sync %d",
@@ -56,35 +59,44 @@ DECLARE_EVENT_CLASS(jbd2_commit,
                  __entry->transaction, __entry->sync_commit)
 )
 
-DEFINE_EVENT(jbd2_commit, jbd2_start_commit,
+LTTNG_TRACEPOINT_EVENT_INSTANCE(jbd2_commit, jbd2_start_commit,
+
+       TP_PROTO(journal_t *journal, transaction_t *commit_transaction),
+
+       TP_ARGS(journal, commit_transaction)
+)
+
+LTTNG_TRACEPOINT_EVENT_INSTANCE(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_locking,
+LTTNG_TRACEPOINT_EVENT_INSTANCE(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_flushing,
+LTTNG_TRACEPOINT_EVENT_INSTANCE(jbd2_commit, jbd2_commit_logging,
 
        TP_PROTO(journal_t *journal, transaction_t *commit_transaction),
 
        TP_ARGS(journal, commit_transaction)
 )
 
-DEFINE_EVENT(jbd2_commit, jbd2_commit_logging,
+#if (LINUX_VERSION_CODE >= KERNEL_VERSION(3,4,0))
+LTTNG_TRACEPOINT_EVENT_INSTANCE(jbd2_commit, jbd2_drop_transaction,
 
        TP_PROTO(journal_t *journal, transaction_t *commit_transaction),
 
        TP_ARGS(journal, commit_transaction)
 )
+#endif
 
-TRACE_EVENT(jbd2_end_commit,
+LTTNG_TRACEPOINT_EVENT(jbd2_end_commit,
        TP_PROTO(journal_t *journal, transaction_t *commit_transaction),
 
        TP_ARGS(journal, commit_transaction),
@@ -97,10 +109,10 @@ TRACE_EVENT(jbd2_end_commit,
        ),
 
        TP_fast_assign(
-               tp_assign(dev, journal->j_fs_dev->bd_dev);
-               tp_assign(sync_commit, commit_transaction->t_synchronous_commit);
-               tp_assign(transaction, commit_transaction->t_tid);
-               tp_assign(head, journal->j_tail_sequence);
+               tp_assign(dev, journal->j_fs_dev->bd_dev)
+               tp_assign(sync_commit, commit_transaction->t_synchronous_commit)
+               tp_assign(transaction, commit_transaction->t_tid)
+               tp_assign(head, journal->j_tail_sequence)
        ),
 
        TP_printk("dev %d,%d transaction %d sync %d head %d",
@@ -108,7 +120,7 @@ TRACE_EVENT(jbd2_end_commit,
                  __entry->transaction, __entry->sync_commit, __entry->head)
 )
 
-TRACE_EVENT(jbd2_submit_inode_data,
+LTTNG_TRACEPOINT_EVENT(jbd2_submit_inode_data,
        TP_PROTO(struct inode *inode),
 
        TP_ARGS(inode),
@@ -119,8 +131,8 @@ TRACE_EVENT(jbd2_submit_inode_data,
        ),
 
        TP_fast_assign(
-               tp_assign(dev, inode->i_sb->s_dev);
-               tp_assign(ino, inode->i_ino);
+               tp_assign(dev, inode->i_sb->s_dev)
+               tp_assign(ino, inode->i_ino)
        ),
 
        TP_printk("dev %d,%d ino %lu",
@@ -128,7 +140,8 @@ TRACE_EVENT(jbd2_submit_inode_data,
                  (unsigned long) __entry->ino)
 )
 
-TRACE_EVENT(jbd2_run_stats,
+#if (LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,32))
+LTTNG_TRACEPOINT_EVENT(jbd2_run_stats,
        TP_PROTO(dev_t dev, unsigned long tid,
                 struct transaction_run_stats_s *stats),
 
@@ -172,7 +185,7 @@ TRACE_EVENT(jbd2_run_stats,
                  __entry->blocks_logged)
 )
 
-TRACE_EVENT(jbd2_checkpoint_stats,
+LTTNG_TRACEPOINT_EVENT(jbd2_checkpoint_stats,
        TP_PROTO(dev_t dev, unsigned long tid,
                 struct transaction_chp_stats_s *stats),
 
@@ -202,8 +215,14 @@ TRACE_EVENT(jbd2_checkpoint_stats,
                  jiffies_to_msecs(__entry->chp_time),
                  __entry->forced_to_close, __entry->written, __entry->dropped)
 )
+#endif
 
-TRACE_EVENT(jbd2_cleanup_journal_tail,
+#if (LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,34))
+#if (LINUX_VERSION_CODE >= KERNEL_VERSION(3,4,0))
+LTTNG_TRACEPOINT_EVENT(jbd2_update_log_tail,
+#else
+LTTNG_TRACEPOINT_EVENT(jbd2_cleanup_journal_tail,
+#endif
 
        TP_PROTO(journal_t *journal, tid_t first_tid,
                 unsigned long block_nr, unsigned long freed),
@@ -231,8 +250,31 @@ TRACE_EVENT(jbd2_cleanup_journal_tail,
                  __entry->tail_sequence, __entry->first_tid,
                  __entry->block_nr, __entry->freed)
 )
+#endif
+
+#if (LINUX_VERSION_CODE >= KERNEL_VERSION(3,4,0))
+LTTNG_TRACEPOINT_EVENT(jbd2_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)
+)
+#endif
 
-#endif /* _TRACE_JBD2_H */
+#endif /* LTTNG_TRACE_JBD2_H */
 
 /* This part must be outside protection */
 #include "../../../probes/define_trace.h"
LTTng 2.0/0.x modules
This page took 0.027469 seconds and 4 git commands to generate.