Rename LTTng instrumentation macros

[deliverable/lttng-modules.git] / instrumentation / events / lttng-module / lttng-statedump.h

diff --git a/instrumentation/events/lttng-module/lttng-statedump.h b/instrumentation/events/lttng-module/lttng-statedump.h
index e4c86d659373307b232216be42f85efc590a7e65..985b71cf3cdba2fb440d0963bce9d2a6058334d3 100644 (file)
--- a/instrumentation/events/lttng-module/lttng-statedump.h
+++ b/instrumentation/events/lttng-module/lttng-statedump.h
@@ -1,14 +1,15 @@
 #undef TRACE_SYSTEM
 #define TRACE_SYSTEM lttng_statedump
 
-#if !defined(_TRACE_LTTNG_STATEDUMP_H) || defined(TRACE_HEADER_MULTI_READ)
-#define _TRACE_LTTNG_STATEDUMP_H
+#if !defined(LTTNG_TRACE_LTTNG_STATEDUMP_H) || defined(TRACE_HEADER_MULTI_READ)
+#define LTTNG_TRACE_LTTNG_STATEDUMP_H
 
-#include <linux/tracepoint.h>
+#include "../../../probes/lttng-tracepoint-event.h"
 #include <linux/nsproxy.h>
 #include <linux/pid_namespace.h>
+#include <linux/types.h>
 
-TRACE_EVENT(lttng_statedump_start,
+LTTNG_TRACEPOINT_EVENT(lttng_statedump_start,
        TP_PROTO(struct lttng_session *session),
        TP_ARGS(session),
        TP_STRUCT__entry(
@@ -18,7 +19,7 @@ TRACE_EVENT(lttng_statedump_start,
        TP_printk("")
 )
 
-TRACE_EVENT(lttng_statedump_end,
+LTTNG_TRACEPOINT_EVENT(lttng_statedump_end,
        TP_PROTO(struct lttng_session *session),
        TP_ARGS(session),
        TP_STRUCT__entry(
@@ -28,7 +29,7 @@ TRACE_EVENT(lttng_statedump_end,
        TP_printk("")
 )
 
-TRACE_EVENT(lttng_statedump_process_state,
+LTTNG_TRACEPOINT_EVENT(lttng_statedump_process_state,
        TP_PROTO(struct lttng_session *session,
                struct task_struct *p,
                int type, int mode, int submode, int status,
@@ -85,24 +86,29 @@ TRACE_EVENT(lttng_statedump_process_state,
        TP_printk("")
 )
 
-TRACE_EVENT(lttng_statedump_file_descriptor,
+LTTNG_TRACEPOINT_EVENT(lttng_statedump_file_descriptor,
        TP_PROTO(struct lttng_session *session,
-               struct task_struct *p, int fd, const char *filename),
-       TP_ARGS(session, p, fd, filename),
+               struct task_struct *p, int fd, const char *filename,
+               unsigned int flags, fmode_t fmode),
+       TP_ARGS(session, p, fd, filename, flags, fmode),
        TP_STRUCT__entry(
                __field(pid_t, pid)
                __field(int, fd)
+               __field_oct(unsigned int, flags)
+               __field_hex(fmode_t, fmode)
                __string(filename, filename)
        ),
        TP_fast_assign(
                tp_assign(pid, p->tgid)
                tp_assign(fd, fd)
+               tp_assign(flags, flags)
+               tp_assign(fmode, fmode)
                tp_strcpy(filename, filename)
        ),
        TP_printk("")
 )
 
-TRACE_EVENT(lttng_statedump_vm_map,
+LTTNG_TRACEPOINT_EVENT(lttng_statedump_vm_map,
        TP_PROTO(struct lttng_session *session,
                struct task_struct *p, struct vm_area_struct *map,
                unsigned long inode),
@@ -126,7 +132,7 @@ TRACE_EVENT(lttng_statedump_vm_map,
        TP_printk("")
 )
 
-TRACE_EVENT(lttng_statedump_network_interface,
+LTTNG_TRACEPOINT_EVENT(lttng_statedump_network_interface,
        TP_PROTO(struct lttng_session *session,
                struct net_device *dev, struct in_ifaddr *ifa),
        TP_ARGS(session, dev, ifa),
@@ -141,8 +147,23 @@ TRACE_EVENT(lttng_statedump_network_interface,
        TP_printk("")
 )
 
+LTTNG_TRACEPOINT_EVENT(lttng_statedump_block_device,
+       TP_PROTO(struct lttng_session *session,
+               dev_t dev, const char *diskname),
+       TP_ARGS(session, dev, diskname),
+       TP_STRUCT__entry(
+               __field(dev_t, dev)
+               __string(diskname, diskname)
+       ),
+       TP_fast_assign(
+               tp_assign(dev, dev)
+               tp_strcpy(diskname, diskname)
+       ),
+       TP_printk("")
+)
+
 /* Called with desc->lock held */
-TRACE_EVENT(lttng_statedump_interrupt,
+LTTNG_TRACEPOINT_EVENT(lttng_statedump_interrupt,
        TP_PROTO(struct lttng_session *session,
                unsigned int irq, const char *chip_name,
                struct irqaction *action),
@@ -160,7 +181,7 @@ TRACE_EVENT(lttng_statedump_interrupt,
        TP_printk("")
 )
 
-#endif /*  _TRACE_LTTNG_STATEDUMP_H */
+#endif /*  LTTNG_TRACE_LTTNG_STATEDUMP_H */
 
 /* This part must be outside protection */
 #include "../../../probes/define_trace.h"