Move to kernel style SPDX license identifiers

[lttng-ust.git] / include / lttng / tracepoint-rcu.h

diff --git a/include/lttng/tracepoint-rcu.h b/include/lttng/tracepoint-rcu.h
index 23dab7d6c9b47e9838e719d00a479dff315d4cfc..4528236814c777b0b563fef05bd1f9a0ba3eaf86 100644 (file)
--- a/include/lttng/tracepoint-rcu.h
+++ b/include/lttng/tracepoint-rcu.h
@@ -1,46 +1,34 @@
-#ifndef _LTTNG_TRACEPOINT_RCU_H
-#define _LTTNG_TRACEPOINT_RCU_H
-
 /*
- * Copyright (c) 2011 - Mathieu Desnoyers <mathieu.desnoyers@efficios.com>
- *
- * THIS MATERIAL IS PROVIDED AS IS, WITH ABSOLUTELY NO WARRANTY EXPRESSED
- * OR IMPLIED.  ANY USE IS AT YOUR OWN RISK.
+ * SPDX-License-Identifier: MIT
  *
- * Permission is hereby granted to use or copy this program
- * for any purpose,  provided the above notices are retained on all copies.
- * Permission to modify the code and to distribute modified code is granted,
- * provided the above notices are retained, and a notice that the code was
- * modified is included with the above copyright notice.
- *
- * This file allows weak linking on tracepoint RCU symbols for non-LGPL
- * code.
+ * Copyright (C) 2011-2012 Mathieu Desnoyers <mathieu.desnoyers@efficios.com>
  */
 
+#ifndef _LTTNG_TRACEPOINT_RCU_H
+#define _LTTNG_TRACEPOINT_RCU_H
+
 #include <urcu/compiler.h>
+#include <lttng/urcu/pointer.h>
 
 #ifdef _LGPL_SOURCE
 
-#include <urcu-bp.h>
+#include <lttng/urcu/urcu-ust.h>
 
-#define tp_rcu_read_lock_bp    rcu_read_lock_bp
-#define tp_rcu_read_unlock_bp  rcu_read_unlock_bp
-#define tp_rcu_dereference_bp  rcu_dereference_bp
+#define tp_rcu_read_lock       lttng_ust_urcu_read_lock
+#define tp_rcu_read_unlock     lttng_ust_urcu_read_unlock
+#define tp_rcu_dereference     lttng_ust_rcu_dereference
 #define TP_RCU_LINK_TEST()     1
 
 #else  /* _LGPL_SOURCE */
 
-#define tp_rcu_read_lock_bp    tracepoint_dlopen.rcu_read_lock_sym_bp
-#define tp_rcu_read_unlock_bp  tracepoint_dlopen.rcu_read_unlock_sym_bp
+#define tp_rcu_read_lock       tracepoint_dlopen_ptr->rcu_read_lock_sym
+#define tp_rcu_read_unlock     tracepoint_dlopen_ptr->rcu_read_unlock_sym
 
-#define tp_rcu_dereference_bp(p)                                            \
-       ({                                                                   \
-               typeof(p) _________p1 = URCU_FORCE_CAST(typeof(p),           \
-                       tracepoint_dlopen.rcu_dereference_sym_bp(URCU_FORCE_CAST(void *, p))); \
-               (_________p1);                                               \
-       })
+#define tp_rcu_dereference(p)                                             \
+               URCU_FORCE_CAST(__typeof__(p),                             \
+                       tracepoint_dlopen_ptr->rcu_dereference_sym(URCU_FORCE_CAST(void *, p)))
 
-#define TP_RCU_LINK_TEST()     tp_rcu_read_lock_bp
+#define TP_RCU_LINK_TEST()     (tracepoint_dlopen_ptr && tp_rcu_read_lock)
 
 #endif /* _LGPL_SOURCE */