New upstream version 0.7.11

[mirror_zfs-debian.git] / include / sys / trace_dmu.h

diff --git a/include/sys/trace_dmu.h b/include/sys/trace_dmu.h
index e070997bca432b9b479144ec67a9ac707e8f62eb..24e57f5146a4f11c997dd29734b4ec65e06a98e4 100644 (file)
--- a/include/sys/trace_dmu.h
+++ b/include/sys/trace_dmu.h
@@ -41,7 +41,7 @@
  *     uint64_t, ...,
  *     uint64_t, ...);
  */
-
+/* BEGIN CSTYLED */
 DECLARE_EVENT_CLASS(zfs_delay_mintime_class,
        TP_PROTO(dmu_tx_t *tx, uint64_t dirty, uint64_t min_tx_time),
        TP_ARGS(tx, dirty, min_tx_time),
@@ -50,18 +50,10 @@ DECLARE_EVENT_CLASS(zfs_delay_mintime_class,
            __field(uint64_t,                   tx_lastsnap_txg)
            __field(uint64_t,                   tx_lasttried_txg)
            __field(boolean_t,                  tx_anyobj)
-           __field(boolean_t,                  tx_waited)
+           __field(boolean_t,                  tx_dirty_delayed)
            __field(hrtime_t,                   tx_start)
            __field(boolean_t,                  tx_wait_dirty)
            __field(int,                        tx_err)
-#ifdef DEBUG_DMU_TX
-           __field(uint64_t,                   tx_space_towrite)
-           __field(uint64_t,                   tx_space_tofree)
-           __field(uint64_t,                   tx_space_tooverwrite)
-           __field(uint64_t,                   tx_space_tounref)
-           __field(int64_t,                    tx_space_written)
-           __field(int64_t,                    tx_space_freed)
-#endif
            __field(uint64_t,                   min_tx_time)
            __field(uint64_t,                   dirty)
        ),
@@ -70,45 +62,62 @@ DECLARE_EVENT_CLASS(zfs_delay_mintime_class,
            __entry->tx_lastsnap_txg            = tx->tx_lastsnap_txg;
            __entry->tx_lasttried_txg           = tx->tx_lasttried_txg;
            __entry->tx_anyobj                  = tx->tx_anyobj;
-           __entry->tx_waited                  = tx->tx_waited;
+           __entry->tx_dirty_delayed           = tx->tx_dirty_delayed;
            __entry->tx_start                   = tx->tx_start;
            __entry->tx_wait_dirty              = tx->tx_wait_dirty;
            __entry->tx_err                     = tx->tx_err;
-#ifdef DEBUG_DMU_TX
-           __entry->tx_space_towrite           = tx->tx_space_towrite;
-           __entry->tx_space_tofree            = tx->tx_space_tofree;
-           __entry->tx_space_tooverwrite       = tx->tx_space_tooverwrite;
-           __entry->tx_space_tounref           = tx->tx_space_tounref;
-           __entry->tx_space_written           = tx->tx_space_written.rc_count;
-           __entry->tx_space_freed             = tx->tx_space_freed.rc_count;
-#endif
            __entry->dirty                      = dirty;
            __entry->min_tx_time                = min_tx_time;
        ),
        TP_printk("tx { txg %llu lastsnap_txg %llu tx_lasttried_txg %llu "
-           "anyobj %d waited %d start %llu wait_dirty %d err %i "
-#ifdef DEBUG_DMU_TX
-           "space_towrite %llu space_tofree %llu space_tooverwrite %llu "
-           "space_tounref %llu space_written %lli space_freed %lli "
-#endif
+           "anyobj %d dirty_delayed %d start %llu wait_dirty %d err %i "
            "} dirty %llu min_tx_time %llu",
            __entry->tx_txg, __entry->tx_lastsnap_txg,
-           __entry->tx_lasttried_txg, __entry->tx_anyobj, __entry->tx_waited,
-           __entry->tx_start, __entry->tx_wait_dirty, __entry->tx_err,
-#ifdef DEBUG_DMU_TX
-           __entry->tx_space_towrite, __entry->tx_space_tofree,
-           __entry->tx_space_tooverwrite, __entry->tx_space_tounref,
-           __entry->tx_space_written, __entry->tx_space_freed,
-#endif
+           __entry->tx_lasttried_txg, __entry->tx_anyobj,
+           __entry->tx_dirty_delayed, __entry->tx_start,
+           __entry->tx_wait_dirty, __entry->tx_err,
            __entry->dirty, __entry->min_tx_time)
 );
+/* END CSTYLED */
 
+/* BEGIN CSTYLED */
 #define        DEFINE_DELAY_MINTIME_EVENT(name) \
 DEFINE_EVENT(zfs_delay_mintime_class, name, \
        TP_PROTO(dmu_tx_t *tx, uint64_t dirty, uint64_t min_tx_time), \
        TP_ARGS(tx, dirty, min_tx_time))
+/* END CSTYLED */
 DEFINE_DELAY_MINTIME_EVENT(zfs_delay__mintime);
 
+/* BEGIN CSTYLED */
+DECLARE_EVENT_CLASS(zfs_free_long_range_class,
+       TP_PROTO(uint64_t long_free_dirty_all_txgs, uint64_t chunk_len, \
+           uint64_t txg),
+       TP_ARGS(long_free_dirty_all_txgs, chunk_len, txg),
+       TP_STRUCT__entry(
+           __field(uint64_t,                   long_free_dirty_all_txgs)
+           __field(uint64_t,                   chunk_len)
+           __field(uint64_t,                   txg)
+       ),
+       TP_fast_assign(
+           __entry->long_free_dirty_all_txgs   = long_free_dirty_all_txgs;
+           __entry->chunk_len                                  = chunk_len;
+           __entry->txg                                                = txg;
+       ),
+       TP_printk("long_free_dirty_all_txgs %llu chunk_len %llu txg %llu",
+          __entry->long_free_dirty_all_txgs,
+          __entry->chunk_len, __entry->txg)
+);
+/* END CSTYLED */
+
+/* BEGIN CSTYLED */
+#define        DEFINE_FREE_LONG_RANGE_EVENT(name) \
+DEFINE_EVENT(zfs_free_long_range_class, name, \
+       TP_PROTO(uint64_t long_free_dirty_all_txgs, \
+           uint64_t chunk_len, uint64_t txg), \
+       TP_ARGS(long_free_dirty_all_txgs, chunk_len, txg))
+/* END CSTYLED */
+DEFINE_FREE_LONG_RANGE_EVENT(zfs_free__long__range);
+
 #endif /* _TRACE_DMU_H */
 
 #undef TRACE_INCLUDE_PATH