X-Git-Url: https://git.lttng.org/?a=blobdiff_plain;f=include%2Flttng%2Ftracepoint-rcu.h;h=f2d10afae35dba7c9f09fd67766e541eb6155492;hb=9b14815a9ee98c0dbc842a1e545cd6a82ae7b18a;hp=a754048cc51ccc624a028c522aa8a030fbf04fcf;hpb=6423c3134bf07d4a7db56f69f2c79b540a79c4f1;p=lttng-ust.git

diff --git a/include/lttng/tracepoint-rcu.h b/include/lttng/tracepoint-rcu.h
index a754048c..f2d10afa 100644
--- a/include/lttng/tracepoint-rcu.h
+++ b/include/lttng/tracepoint-rcu.h
@@ -1,45 +1,43 @@
-#ifndef _LTTNG_TRACEPOINT_RCU_H
-#define _LTTNG_TRACEPOINT_RCU_H
-
 /*
- * Copyright 2011-2012 - Mathieu Desnoyers <mathieu.desnoyers@efficios.com>
- *
- * Permission is hereby granted, free of charge, to any person obtaining a copy
- * of this software and associated documentation files (the "Software"), to deal
- * in the Software without restriction, including without limitation the rights
- * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
- * copies of the Software, and to permit persons to whom the Software is
- * furnished to do so, subject to the following conditions:
+ * SPDX-License-Identifier: MIT
  *
- * The above copyright notice and this permission notice shall be included in
- * all copies or substantial portions of the Software.
+ * 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 && 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 */