X-Git-Url: http://git.lttng.org/?a=blobdiff_plain;f=include%2Flttng%2Ftracepoint-rcu.h;h=552af64ae8d1e438524e62791adb2ed03f574581;hb=dbcc2f9279a03c620350b4743467aa2f7cb7bf5f;hp=ee936ff507338cf2e9bbda0cd6a397087e4ac871;hpb=178ee83cb5b6463ae7299462ab2ce3598a0421fc;p=lttng-ust.git

diff --git a/include/lttng/tracepoint-rcu.h b/include/lttng/tracepoint-rcu.h
index ee936ff5..552af64a 100644
--- a/include/lttng/tracepoint-rcu.h
+++ b/include/lttng/tracepoint-rcu.h
@@ -1,49 +1,34 @@
-#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.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
- * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
- * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
- * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
- * SOFTWARE.
+ * 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
+#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	lttng_ust_tracepoint_dlopen_ptr->rcu_read_lock_sym
+#define tp_rcu_read_unlock	lttng_ust_tracepoint_dlopen_ptr->rcu_read_unlock_sym
 
-#define tp_rcu_dereference_bp(p)					   \
+#define tp_rcu_dereference(p)						   \
 		URCU_FORCE_CAST(__typeof__(p),				   \
-			tracepoint_dlopen.rcu_dereference_sym_bp(URCU_FORCE_CAST(void *, 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 TP_RCU_LINK_TEST()	(lttng_ust_tracepoint_dlopen_ptr && tp_rcu_read_lock)
 
 #endif	/* _LGPL_SOURCE */