X-Git-Url: https://git.lttng.org/?a=blobdiff_plain;f=src%2Fcommon%2Fmacros.h;h=3e175735083a9df7d390cdad5cc5fa43a20c4c26;hb=942003e52b8fe43bfb8f28a1884d3bda7e6d1e0b;hp=6ac24fa01157b79cbf1debc58fbcb49438288af2;hpb=d50d200af8d01f4b58a14e384cabd46b1afb4817;p=lttng-tools.git

diff --git a/src/common/macros.h b/src/common/macros.h
index 6ac24fa01..3e1757350 100644
--- a/src/common/macros.h
+++ b/src/common/macros.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2011 David Goulet <david.goulet@polymtl.ca>
+ * Copyright (C) 2011 EfficiOS Inc.
  * Copyright (C) 2011 Mathieu Desnoyers <mathieu.desnoyers@efficios.com>
  *
  * SPDX-License-Identifier: GPL-2.0-only
@@ -74,6 +74,7 @@ void *zmalloc(size_t len)
 #define member_sizeof(type, field)	sizeof(((type *) 0)->field)
 
 #define ASSERT_LOCKED(lock) LTTNG_ASSERT(pthread_mutex_trylock(&lock))
+#define ASSERT_RCU_READ_LOCKED(lock) LTTNG_ASSERT(rcu_read_ongoing())
 
 /* Attribute suitable to tag functions as having printf()-like arguments. */
 #define ATTR_FORMAT_PRINTF(_string_index, _first_to_check) \
@@ -93,12 +94,15 @@ void *zmalloc(size_t len)
 # define DIAGNOSTIC_IGNORE_SUGGEST_ATTRIBUTE_FORMAT
 # define DIAGNOSTIC_IGNORE_FORMAT_NONLITERAL \
 	_Pragma("GCC diagnostic ignored \"-Wformat-nonliteral\"")
+# define DIAGNOSTIC_IGNORE_LOGICAL_OP
 #else
   /* GCC */
 # define DIAGNOSTIC_IGNORE_SUGGEST_ATTRIBUTE_FORMAT \
 	_Pragma("GCC diagnostic ignored \"-Wsuggest-attribute=format\"")
 # define DIAGNOSTIC_IGNORE_FORMAT_NONLITERAL \
 	_Pragma("GCC diagnostic ignored \"-Wformat-nonliteral\"")
+# define DIAGNOSTIC_IGNORE_LOGICAL_OP \
+	_Pragma("GCC diagnostic ignored \"-Wlogical-op\"")
 #endif
 
 /* Used to make specific C++ functions to C code. */