X-Git-Url: http://git.liburcu.org/?a=blobdiff_plain;f=wrapper%2Ftrace-clock.h;h=211c1e93ceaa9736e7b4cff8c438a20380cd0edb;hb=a3f2d33768920bc81db654f4b12be7e244d3cb3f;hp=08f99229225e6e870d5d78d13d0446f5cc357b0c;hpb=a8f2d0c75c9cc179fc9e7f7ca17ea3b3b3b5af41;p=lttng-modules.git

diff --git a/wrapper/trace-clock.h b/wrapper/trace-clock.h
index 08f99229..211c1e93 100644
--- a/wrapper/trace-clock.h
+++ b/wrapper/trace-clock.h
@@ -1,29 +1,16 @@
-#ifndef _LTTNG_TRACE_CLOCK_H
-#define _LTTNG_TRACE_CLOCK_H
-
-/*
+/* SPDX-License-Identifier: (GPL-2.0 or LGPL-2.1)
+ *
  * wrapper/trace-clock.h
  *
  * Contains LTTng trace clock mapping to LTTng trace clock or mainline monotonic
  * clock. This wrapper depends on CONFIG_HIGH_RES_TIMERS=y.
  *
  * Copyright (C) 2011-2012 Mathieu Desnoyers <mathieu.desnoyers@efficios.com>
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; only
- * version 2.1 of the License.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
  */
 
+#ifndef _LTTNG_TRACE_CLOCK_H
+#define _LTTNG_TRACE_CLOCK_H
+
 #ifdef CONFIG_HAVE_TRACE_CLOCK
 #include <linux/trace-clock.h>
 #else /* CONFIG_HAVE_TRACE_CLOCK */
@@ -33,18 +20,14 @@
 #include <linux/time.h>
 #include <linux/hrtimer.h>
 #include <linux/percpu.h>
-#include <linux/version.h>
+#include <lttng-kernel-version.h>
 #include <asm/local.h>
 #include <lttng-kernel-version.h>
 #include <lttng-clock.h>
 #include <wrapper/compiler.h>
 #include <wrapper/percpu-defs.h>
 #include <wrapper/random.h>
-
-#if ((LTTNG_KERNEL_RANGE(3,10,0, 3,10,14) && !LTTNG_RHEL_KERNEL_RANGE(3,10,0,123,0,0, 3,10,14,0,0,0)) \
-	|| LTTNG_KERNEL_RANGE(3,11,0, 3,11,3))
-#error "Linux kernels 3.10 and 3.11 introduce a deadlock in the timekeeping subsystem. Fixed by commit 7bd36014460f793c19e7d6c94dab67b0afcfcb7f \"timekeeping: Fix HRTICK related deadlock from ntp lock changes\" in Linux."
-#endif
+#include <blacklist/timekeeping.h>
 
 extern struct lttng_trace_clock *lttng_trace_clock;
 
@@ -68,7 +51,7 @@ extern struct lttng_trace_clock *lttng_trace_clock;
  * this feature on 64-bit architectures.
  */
 
-#if (LINUX_VERSION_CODE >= KERNEL_VERSION(3,17,0) \
+#if (LTTNG_LINUX_VERSION_CODE >= LTTNG_KERNEL_VERSION(3,17,0) \
 	&& BITS_PER_LONG == 64 \
 	&& !defined(LTTNG_CLOCK_NMI_SAFE_BROKEN))
 #define LTTNG_USE_NMI_SAFE_CLOCK
@@ -177,33 +160,30 @@ static inline void put_trace_clock(void)
 
 static inline u64 trace_clock_read64(void)
 {
-	struct lttng_trace_clock *ltc = READ_ONCE(lttng_trace_clock);
+	struct lttng_trace_clock *ltc = LTTNG_READ_ONCE(lttng_trace_clock);
 
 	if (likely(!ltc)) {
 		return trace_clock_read64_monotonic();
 	} else {
-		read_barrier_depends();	/* load ltc before content */
 		return ltc->read64();
 	}
 }
 
 static inline u64 trace_clock_freq(void)
 {
-	struct lttng_trace_clock *ltc = READ_ONCE(lttng_trace_clock);
+	struct lttng_trace_clock *ltc = LTTNG_READ_ONCE(lttng_trace_clock);
 
 	if (!ltc) {
 		return trace_clock_freq_monotonic();
 	} else {
-		read_barrier_depends();	/* load ltc before content */
 		return ltc->freq();
 	}
 }
 
 static inline int trace_clock_uuid(char *uuid)
 {
-	struct lttng_trace_clock *ltc = READ_ONCE(lttng_trace_clock);
+	struct lttng_trace_clock *ltc = LTTNG_READ_ONCE(lttng_trace_clock);
 
-	read_barrier_depends();	/* load ltc before content */
 	/* Use default UUID cb when NULL */
 	if (!ltc || !ltc->uuid) {
 		return trace_clock_uuid_monotonic(uuid);
@@ -214,24 +194,22 @@ static inline int trace_clock_uuid(char *uuid)
 
 static inline const char *trace_clock_name(void)
 {
-	struct lttng_trace_clock *ltc = READ_ONCE(lttng_trace_clock);
+	struct lttng_trace_clock *ltc = LTTNG_READ_ONCE(lttng_trace_clock);
 
 	if (!ltc) {
 		return trace_clock_name_monotonic();
 	} else {
-		read_barrier_depends();	/* load ltc before content */
 		return ltc->name();
 	}
 }
 
 static inline const char *trace_clock_description(void)
 {
-	struct lttng_trace_clock *ltc = READ_ONCE(lttng_trace_clock);
+	struct lttng_trace_clock *ltc = LTTNG_READ_ONCE(lttng_trace_clock);
 
 	if (!ltc) {
 		return trace_clock_description_monotonic();
 	} else {
-		read_barrier_depends();	/* load ltc before content */
 		return ltc->description();
 	}
 }