+/* SPDX-License-Identifier: GPL-2.0-only */
+
#undef TRACE_SYSTEM
#define TRACE_SYSTEM lock
-#if !defined(_TRACE_LOCK_H) || defined(TRACE_HEADER_MULTI_READ)
-#define _TRACE_LOCK_H
+#if !defined(LTTNG_TRACE_LOCK_H) || defined(TRACE_HEADER_MULTI_READ)
+#define LTTNG_TRACE_LOCK_H
#include <linux/lockdep.h>
-#include <linux/tracepoint.h>
+#include <probes/lttng-tracepoint-event.h>
#ifdef CONFIG_LOCKDEP
-TRACE_EVENT(lock_acquire,
+LTTNG_TRACEPOINT_EVENT(lock_acquire,
TP_PROTO(struct lockdep_map *lock, unsigned int subclass,
int trylock, int read, int check,
TP_ARGS(lock, subclass, trylock, read, check, next_lock, ip),
- TP_STRUCT__entry(
- __field(unsigned int, flags)
- __string(name, lock->name)
- __field(void *, lockdep_addr)
- ),
-
- TP_fast_assign(
- tp_assign(flags, (trylock ? 1 : 0) | (read ? 2 : 0))
- tp_strcpy(name, lock->name)
- tp_assign(lockdep_addr, lock)
- ),
-
- TP_printk("%p %s%s%s", __entry->lockdep_addr,
- (__entry->flags & 1) ? "try " : "",
- (__entry->flags & 2) ? "read " : "",
- __get_str(name))
+ TP_FIELDS(
+ ctf_integer(unsigned int, flags, (trylock ? 1 : 0) | (read ? 2 : 0))
+ ctf_string(name, lock->name)
+ ctf_integer_hex(void *, lockdep_addr, lock)
+ )
)
-DECLARE_EVENT_CLASS(lock,
+LTTNG_TRACEPOINT_EVENT_CLASS(lock,
TP_PROTO(struct lockdep_map *lock, unsigned long ip),
TP_ARGS(lock, ip),
- TP_STRUCT__entry(
- __string( name, lock->name )
- __field( void *, lockdep_addr )
- ),
-
- TP_fast_assign(
- tp_strcpy(name, lock->name)
- tp_assign(lockdep_addr, lock)
- ),
-
- TP_printk("%p %s", __entry->lockdep_addr, __get_str(name))
+ TP_FIELDS(
+ ctf_string(name, lock->name)
+ ctf_integer_hex(void *, lockdep_addr, lock)
+ )
)
-DEFINE_EVENT(lock, lock_release,
+LTTNG_TRACEPOINT_EVENT_INSTANCE(lock, lock_release,
TP_PROTO(struct lockdep_map *lock, unsigned long ip),
#ifdef CONFIG_LOCK_STAT
-DEFINE_EVENT(lock, lock_contended,
+LTTNG_TRACEPOINT_EVENT_INSTANCE(lock, lock_contended,
TP_PROTO(struct lockdep_map *lock, unsigned long ip),
TP_ARGS(lock, ip)
)
-DEFINE_EVENT(lock, lock_acquired,
+LTTNG_TRACEPOINT_EVENT_INSTANCE(lock, lock_acquired,
TP_PROTO(struct lockdep_map *lock, unsigned long ip),
TP_ARGS(lock, ip)
)
-#endif
-#endif
+#endif /* CONFIG_LOCK_STAT */
+
+#endif /* CONFIG_LOCKDEP */
-#endif /* _TRACE_LOCK_H */
+#endif /* LTTNG_TRACE_LOCK_H */
/* This part must be outside protection */
-#include "../../../probes/define_trace.h"
+#include <probes/define_trace.h>