X-Git-Url: http://git.lttng.org/?a=blobdiff_plain;f=include%2Flttng%2Ftracepoint-rcu.h;h=3a543ce748e81022a6787c886826ae161f9973cd;hb=b9f99b070ea44396061eae8bf0e8cfca8ef11f32;hp=23dab7d6c9b47e9838e719d00a479dff315d4cfc;hpb=51920067af7b1049413c1b8c30ee254afbd4e448;p=lttng-ust.git

diff --git a/include/lttng/tracepoint-rcu.h b/include/lttng/tracepoint-rcu.h
index 23dab7d6..3a543ce7 100644
--- a/include/lttng/tracepoint-rcu.h
+++ b/include/lttng/tracepoint-rcu.h
@@ -1,47 +1,43 @@
-#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.
- *
- * 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.
+ * SPDX-License-Identifier: MIT
  *
- * 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_UST_TRACEPOINT_RCU_H
+#define _LTTNG_UST_TRACEPOINT_RCU_H
+
 #include <urcu/compiler.h>
+#include <lttng/urcu/pointer.h>
+#include <lttng/ust-api-compat.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_LINK_TEST()	1
+#define lttng_ust_tp_rcu_read_lock	lttng_ust_urcu_read_lock
+#define lttng_ust_tp_rcu_read_unlock	lttng_ust_urcu_read_unlock
+#define lttng_ust_tp_rcu_dereference	lttng_ust_rcu_dereference
+#define LTTNG_UST_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 lttng_ust_tp_rcu_read_lock	lttng_ust_tracepoint_dlopen_ptr->rcu_read_lock_sym
+#define lttng_ust_tp_rcu_read_unlock	lttng_ust_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 lttng_ust_tp_rcu_dereference(p)						   \
+		URCU_FORCE_CAST(__typeof__(p),				   \
+			lttng_ust_tracepoint_dlopen_ptr->rcu_dereference_sym(URCU_FORCE_CAST(void *, p)))
 
-#define TP_RCU_LINK_TEST()	tp_rcu_read_lock_bp
+#define LTTNG_UST_TP_RCU_LINK_TEST()	(lttng_ust_tracepoint_dlopen_ptr && lttng_ust_tp_rcu_read_lock)
 
 #endif	/* _LGPL_SOURCE */
 
-#endif	/* _LTTNG_TRACEPOINT_RCU_H */
+#if LTTNG_UST_COMPAT_API(0)
+#define tp_rcu_read_lock	lttng_ust_tp_rcu_read_lock
+#define tp_rcu_read_unlock	lttng_ust_tp_rcu_read_unlock
+#define tp_rcu_dereference	lttng_ust_tp_rcu_dereference
+#define TP_RCU_LINK_TEST	LTTNG_UST_TP_RCU_LINK_TEST
+#endif
+
+#endif	/* _LTTNG_UST_TRACEPOINT_RCU_H */