Add line info and SET_ERROR() to ZFS debug log

[mirror_zfs.git] / include / sys / trace_dbgmsg.h

diff --git a/include/sys/trace_dbgmsg.h b/include/sys/trace_dbgmsg.h
index 08d96c59c2fb091ac60dc895d697c30dff53948a..a4aab1e63f756146f521e5871f34d93cd40dfdda 100644 (file)
--- a/include/sys/trace_dbgmsg.h
+++ b/include/sys/trace_dbgmsg.h
@@ -37,92 +37,29 @@
  */
 
 /*
- * Generic support for four argument tracepoints of the form:
+ * Generic support for one argument tracepoints of the form:
  *
- * DTRACE_PROBE4(...,
- *     const char *, ...,
- *     const char *, ...,
- *     int, ...,
+ * DTRACE_PROBE1(...,
  *     const char *, ...);
  */
 /* BEGIN CSTYLED */
 DECLARE_EVENT_CLASS(zfs_dprintf_class,
-       TP_PROTO(const char *file, const char *function, int line,
-           const char *msg),
-       TP_ARGS(file, function, line, msg),
+       TP_PROTO(const char *msg),
+       TP_ARGS(msg),
        TP_STRUCT__entry(
-           __string(file, file)
-           __string(function, function)
-           __field(int,                line)
            __string(msg, msg)
        ),
        TP_fast_assign(
-           __assign_str(file, strchr(file, '/') ?
-               strrchr(file, '/') + 1 : file)
-           __assign_str(function, function);
-           __entry->line               = line;
            __assign_str(msg, msg);
        ),
-       TP_printk("%s:%d:%s(): %s", __get_str(file), __entry->line,
-           __get_str(function), __get_str(msg))
+       TP_printk("%s", __get_str(msg))
 );
 /* END CSTYLED */
 
 /* BEGIN CSTYLED */
 #define        DEFINE_DPRINTF_EVENT(name) \
 DEFINE_EVENT(zfs_dprintf_class, name, \
-       TP_PROTO(const char *file, const char *function, int line, \
-           const char *msg), \
-       TP_ARGS(file, function, line, msg))
+       TP_PROTO(const char *msg), \
+       TP_ARGS(msg))
 /* END CSTYLED */
 DEFINE_DPRINTF_EVENT(zfs_zfs__dprintf);
-
-/*
- * Generic support for four argument tracepoints of the form:
- *
- * DTRACE_PROBE4(...,
- *     const char *, ...,
- *     const char *, ...,
- *     int, ...,
- *     uintptr_t, ...);
- */
-/* BEGIN CSTYLED */
-DECLARE_EVENT_CLASS(zfs_set_error_class,
-       TP_PROTO(const char *file, const char *function, int line,
-           uintptr_t error),
-       TP_ARGS(file, function, line, error),
-       TP_STRUCT__entry(
-           __string(file, file)
-           __string(function, function)
-           __field(int,                line)
-           __field(uintptr_t,          error)
-       ),
-       TP_fast_assign(
-           __assign_str(file, strchr(file, '/') ?
-               strrchr(file, '/') + 1 : file)
-           __assign_str(function, function);
-           __entry->line               = line;
-           __entry->error              = error;
-       ),
-       TP_printk("%s:%d:%s(): error 0x%lx", __get_str(file), __entry->line,
-           __get_str(function), __entry->error)
-);
-/* END CSTYLED */
-
-/* BEGIN CSTYLED */
-#ifdef TP_CONDITION
-#define        DEFINE_SET_ERROR_EVENT(name) \
-DEFINE_EVENT_CONDITION(zfs_set_error_class, name, \
-       TP_PROTO(const char *file, const char *function, int line, \
-           uintptr_t error), \
-       TP_ARGS(file, function, line, error), \
-       TP_CONDITION(error))
-#else
-#define        DEFINE_SET_ERROR_EVENT(name) \
-DEFINE_EVENT(zfs_set_error_class, name, \
-       TP_PROTO(const char *file, const char *function, int line, \
-           uintptr_t error), \
-       TP_ARGS(file, function, line, error))
-#endif
-/* END CSTYLED */
-DEFINE_SET_ERROR_EVENT(zfs_set__error);