Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 39517091 authored by Steven Rostedt's avatar Steven Rostedt Committed by Steven Rostedt
Browse files

tracing/lockdep: convert lockdep to use TRACE_EVENT macro 



The TRACE_FORMAT will soon be deprecated. This patch converts it to
the TRACE_EVENT macro.

Note, this change should also speed up the tracing.

[ Impact: remove a user of deprecated TRACE_FORMAT ]

Cc: Peter Zijlstra <peterz@infradead.org>
Signed-off-by: default avatarSteven Rostedt <rostedt@goodmis.org>
parent 334d4169

include/trace/events/lockdep.h

+46 −10
Original line number Diff line number Diff line
@@ -9,27 +9,63 @@ 


#ifdef CONFIG_LOCKDEP



TRACE_FORMAT(lock_acquire,

TRACE_EVENT(lock_acquire,



	TP_PROTO(struct lockdep_map *lock, unsigned int subclass,

		int trylock, int read, int check,

		struct lockdep_map *next_lock, unsigned long ip),



	TP_ARGS(lock, subclass, trylock, read, check, next_lock, ip),

	TP_FMT("%s%s%s", trylock ? "try " : "",

		read ? "read " : "", lock->name)



	TP_STRUCT__entry(

		__field(unsigned int, flags)

		__string(name, lock->name)

	),



	TP_fast_assign(

		__entry->flags = (trylock ? 1 : 0) | (read ? 2 : 0);

		__assign_str(name, lock->name);

	),



	TP_printk("%s%s%s", (__entry->flags & 1) ? "try " : "",

		  (__entry->flags & 2) ? "read " : "",

		  __get_str(name))

);



TRACE_FORMAT(lock_release,

TRACE_EVENT(lock_release,



	TP_PROTO(struct lockdep_map *lock, int nested, unsigned long ip),



	TP_ARGS(lock, nested, ip),

	TP_FMT("%s", lock->name)



	TP_STRUCT__entry(

		__string(name, lock->name)

	),



	TP_fast_assign(

		__assign_str(name, lock->name);

	),



	TP_printk("%s", __get_str(name))

);



#ifdef CONFIG_LOCK_STAT



TRACE_FORMAT(lock_contended,

TRACE_EVENT(lock_contended,



	TP_PROTO(struct lockdep_map *lock, unsigned long ip),



	TP_ARGS(lock, ip),

	TP_FMT("%s", lock->name)



	TP_STRUCT__entry(

		__string(name, lock->name)

	),



	TP_fast_assign(

		__assign_str(name, lock->name);

	),



	TP_printk("%s", __get_str(name))

);



TRACE_EVENT(lock_acquired,