From: Michael Jeanson Date: Thu, 8 Nov 2018 20:51:22 +0000 (-0500) Subject: Drop support for kernels < 3.0 from lock instrumentation X-Git-Tag: v2.12.0-pre~82 X-Git-Url: http://git.lttng.org./?a=commitdiff_plain;ds=sidebyside;h=82ccabf3be054179f2a590eae8eafa0b56af5257;hp=55dac15aef598fdebea37418435212ba9ef32701;p=lttng-modules.git Drop support for kernels < 3.0 from lock instrumentation Signed-off-by: Michael Jeanson Signed-off-by: Mathieu Desnoyers --- diff --git a/instrumentation/events/lttng-module/lock.h b/instrumentation/events/lttng-module/lock.h index 49e78113..c8cdc55c 100644 --- a/instrumentation/events/lttng-module/lock.h +++ b/instrumentation/events/lttng-module/lock.h @@ -1,16 +1,7 @@ /* SPDX-License-Identifier: GPL-2.0 */ -#include #undef TRACE_SYSTEM -#if (LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,33)) #define TRACE_SYSTEM lock -#else -#define TRACE_SYSTEM lockdep -#define TRACE_INCLUDE_FILE lock -#if defined(_TRACE_LOCKDEP_H) -#define LTTNG_TRACE_LOCK_H -#endif -#endif #if !defined(LTTNG_TRACE_LOCK_H) || defined(TRACE_HEADER_MULTI_READ) #define LTTNG_TRACE_LOCK_H @@ -31,14 +22,10 @@ LTTNG_TRACEPOINT_EVENT(lock_acquire, TP_FIELDS( ctf_integer(unsigned int, flags, (trylock ? 1 : 0) | (read ? 2 : 0)) ctf_string(name, lock->name) -#if (LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,34)) ctf_integer_hex(void *, lockdep_addr, lock) -#endif ) ) -#if (LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,35)) - LTTNG_TRACEPOINT_EVENT_CLASS(lock, TP_PROTO(struct lockdep_map *lock, unsigned long ip), @@ -74,63 +61,9 @@ LTTNG_TRACEPOINT_EVENT_INSTANCE(lock, lock_acquired, TP_ARGS(lock, ip) ) -#endif - -#else /* #if (LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,35)) */ - -LTTNG_TRACEPOINT_EVENT(lock_release, - - TP_PROTO(struct lockdep_map *lock, int nested, unsigned long ip), - - TP_ARGS(lock, nested, ip), - - TP_FIELDS( - ctf_string(name, lock->name) -#if (LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,34)) - ctf_integer_hex(void *, lockdep_addr, lock) -#endif - ) -) - -#ifdef CONFIG_LOCK_STAT - -LTTNG_TRACEPOINT_EVENT(lock_contended, - - TP_PROTO(struct lockdep_map *lock, unsigned long ip), - - TP_ARGS(lock, ip), - - TP_FIELDS( - ctf_string(name, lock->name) -#if (LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,34)) - ctf_integer_hex(void *, lockdep_addr, lock) -#endif - ) -) - -LTTNG_TRACEPOINT_EVENT(lock_acquired, - - TP_PROTO(struct lockdep_map *lock, unsigned long ip, s64 waittime), - - TP_ARGS(lock, ip, waittime), - - TP_FIELDS( - ctf_string(name, lock->name) -#if (LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,34)) - ctf_integer(s64, wait_nsec, wait_nsec) - ctf_integer_hex(void *, lockdep_addr, lock) -#else - ctf_integer(unsigned long, wait_usec, (unsigned long) waittime) - ctf_integer(unsigned long, wait_nsec_rem, do_div(waittime, NSEC_PER_USEC)) -#endif - ) -) - -#endif - -#endif /* #if (LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,35)) */ +#endif /* CONFIG_LOCK_STAT */ -#endif +#endif /* CONFIG_LOCKDEP */ #endif /* LTTNG_TRACE_LOCK_H */ diff --git a/probes/lttng-probe-lock.c b/probes/lttng-probe-lock.c index b3ad2302..e81eb365 100644 --- a/probes/lttng-probe-lock.c +++ b/probes/lttng-probe-lock.c @@ -16,12 +16,7 @@ * Create the tracepoint static inlines from the kernel to validate that our * trace event macros match the kernel we run on. */ -#if (LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,33)) #include -#else -#include -#endif - #include /*