X-Git-Url: http://git.lttng.org./?a=blobdiff_plain;f=include%2Flttng%2Ftracepoint-rcu.h;h=0e084853f1130148dd33a8470d075dc550b69b7a;hb=152ba2822ce0dc11947169d2fffe6e0a26a02573;hp=918837e1a162b553091441bf8e0cd02d2015f89c;hpb=9501d22f55b3a23f382f631c99b2325d1419b5da;p=lttng-ust.git

diff --git a/include/lttng/tracepoint-rcu.h b/include/lttng/tracepoint-rcu.h
index 918837e1..0e084853 100644
--- a/include/lttng/tracepoint-rcu.h
+++ b/include/lttng/tracepoint-rcu.h
@@ -13,6 +13,14 @@
  *
  * 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.
  */
 
 #include <urcu/compiler.h>
@@ -23,22 +31,19 @@
 
 #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_dereference_bp	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_bp	tracepoint_dlopen_ptr->rcu_read_lock_sym_bp
+#define tp_rcu_read_unlock_bp	tracepoint_dlopen_ptr->rcu_read_unlock_sym_bp
 
-#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_bp(p)					   \
+		URCU_FORCE_CAST(__typeof__(p),				   \
+			tracepoint_dlopen_ptr->rcu_dereference_sym_bp(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_bp)
 
 #endif	/* _LGPL_SOURCE */