X-Git-Url: http://git.lttng.org/?a=blobdiff_plain;f=include%2Flttng%2Ftracepoint-rcu.h;h=3378d9243a05ea05a7c8ff25b0513292294cfd4c;hb=10544ee8af31afb239e3dfa71cb2fe09d3de3771;hp=852cfe48d55ee630d588a7ed64d822142e3c7561;hpb=40b2b5a43e4c2067849770b3379ca5360facacd5;p=lttng-ust.git

diff --git a/include/lttng/tracepoint-rcu.h b/include/lttng/tracepoint-rcu.h
index 852cfe48..3378d924 100644
--- a/include/lttng/tracepoint-rcu.h
+++ b/include/lttng/tracepoint-rcu.h
@@ -2,47 +2,49 @@
 #define _LTTNG_TRACEPOINT_RCU_H
 
 /*
- * Copyright (c) 2011 - Mathieu Desnoyers <mathieu.desnoyers@efficios.com>
+ * Copyright 2011-2012 - 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, 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:
  *
- * 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.
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
  *
- * This file allows weak linking on tracepoint RCU symbols for non-LGPL
- * code.
+ * 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.
  */
 
 #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	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
-#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
 
 #else	/* _LGPL_SOURCE */
 
-#define TP_RCU_LINK_TEST()     tp_rcu_read_lock_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
 
-/* Symbols looked up with dlsym */
-static void (*tp_rcu_read_lock_bp)(void) __attribute__((unused));
-static void (*tp_rcu_read_unlock_bp)(void) __attribute__((unused));
-static void *(*tp_rcu_dereference_sym_bp)(void *p) __attribute__((unused));
+#define tp_rcu_dereference(p)						   \
+		URCU_FORCE_CAST(__typeof__(p),				   \
+			tracepoint_dlopen_ptr->rcu_dereference_sym(URCU_FORCE_CAST(void *, p)))
 
-#define tp_rcu_dereference_bp(p)					     \
-	({								     \
-		typeof(p) _________p1 =	URCU_FORCE_CAST(typeof(p),	     \
-			tp_rcu_dereference_sym_bp(URCU_FORCE_CAST(void *, p))); \
-		(_________p1);						     \
-	})
+#define TP_RCU_LINK_TEST()	(tracepoint_dlopen_ptr && tp_rcu_read_lock)
 
 #endif	/* _LGPL_SOURCE */