Skip to contentSkip to conversation

fix: explicitly include urcu/config.h in files using CONFIG_RCU_ defines

PATCH Applied Michael Jeanson via lttng-dev 1 participant 2 messages Nov 17, 2020

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 fix: explicitly include urcu/config.h in files using CONFIG_RCU_ defines

---
 include/urcu/debug.h       | 2 ++
 include/urcu/uatomic/x86.h | 1 +
 include/urcu/urcu-qsbr.h   | 2 ++
 src/urcu-bp.c              | 1 +
 src/urcu-utils.h           | 2 ++
 src/urcu.c                 | 1 +
 6 files changed, 9 insertions(+)
include/urcu/debug.h +2 -0
index 14b50b6..4a7eac9 100644
@@ -21,6 +21,8 @@
 
 #include <assert.h>
 
+#include <urcu/config.h>
+
 #if defined(DEBUG_RCU) || defined(CONFIG_RCU_DEBUG)
 #define urcu_assert(...)	assert(__VA_ARGS__)
 #else
include/urcu/uatomic/x86.h +1 -0
index 129a2f5..2a4ea1c 100644
@@ -20,6 +20,7 @@
  * Boehm-Demers-Weiser conservative garbage collector.
  */
 
+#include <urcu/config.h>
 #include <urcu/compiler.h>
 #include <urcu/system.h>
 
include/urcu/urcu-qsbr.h +2 -0
index 28e6065..fd6cbda 100644
@@ -31,6 +31,8 @@
 #include <stdlib.h>
 #include <pthread.h>
 
+#include <urcu/config.h>
+
 /*
  * See urcu/pointer.h and urcu/static/pointer.h for pointer
  * publication headers.
src/urcu-bp.c +1 -0
index 05efd97..c2ac792 100644
@@ -37,6 +37,7 @@
 #include <stdbool.h>
 #include <sys/mman.h>
 
+#include <urcu/config.h>
 #include <urcu/arch.h>
 #include <urcu/wfcqueue.h>
 #include <urcu/map/urcu-bp.h>
src/urcu-utils.h +2 -0
index 407f42e..69e37bd 100644
@@ -23,6 +23,8 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
  */
 
+#include <urcu/config.h>
+
 #define urcu_stringify(a) _urcu_stringify(a)
 #define _urcu_stringify(a) #a
 
src/urcu.c +1 -0
index f6ca5f8..2ebe993 100644
@@ -38,6 +38,7 @@
 #include <stdbool.h>
 #include <poll.h>
 
+#include <urcu/config.h>
 #include <urcu/arch.h>
 #include <urcu/wfcqueue.h>
 #include <urcu/map/urcu.h>
Signature · 6 lines
2.29.2

_______________________________________________
lttng-dev mailing list
[email protected]
https://lists.lttng.org/cgi-bin/mailman/listinfo/lttng-dev
#1 lore raw

Merged into master, stable-0.11, stable-0.12, thanks!

Mathieu

Quoted 87 lines · ----- On Nov 17, 2020, at 3:22 PM, Michael Jeanson [email protected] wrote:

---

include/urcu/debug.h       | 2 ++
include/urcu/uatomic/x86.h | 1 +
include/urcu/urcu-qsbr.h   | 2 ++
src/urcu-bp.c              | 1 +
src/urcu-utils.h           | 2 ++
src/urcu.c                 | 1 +
6 files changed, 9 insertions(+)
include/urcu/debug.h +2 -0
index 14b50b6..4a7eac9 100644
@@ -21,6 +21,8 @@
 
 #include <assert.h>
 
+#include <urcu/config.h>
+
 #if defined(DEBUG_RCU) || defined(CONFIG_RCU_DEBUG)
 #define urcu_assert(...)	assert(__VA_ARGS__)
 #else
include/urcu/uatomic/x86.h +1 -0
index 129a2f5..2a4ea1c 100644
@@ -20,6 +20,7 @@
 * Boehm-Demers-Weiser conservative garbage collector.
 */
 
+#include <urcu/config.h>
 #include <urcu/compiler.h>
 #include <urcu/system.h>
 
include/urcu/urcu-qsbr.h +2 -0
index 28e6065..fd6cbda 100644
@@ -31,6 +31,8 @@
 #include <stdlib.h>
 #include <pthread.h>
 
+#include <urcu/config.h>
+
 /*
 * See urcu/pointer.h and urcu/static/pointer.h for pointer
 * publication headers.
src/urcu-bp.c +1 -0
index 05efd97..c2ac792 100644
@@ -37,6 +37,7 @@
 #include <stdbool.h>
 #include <sys/mman.h>
 
+#include <urcu/config.h>
 #include <urcu/arch.h>
 #include <urcu/wfcqueue.h>
 #include <urcu/map/urcu-bp.h>
src/urcu-utils.h +2 -0
index 407f42e..69e37bd 100644
@@ -23,6 +23,8 @@
 * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
 */
 
+#include <urcu/config.h>
+
 #define urcu_stringify(a) _urcu_stringify(a)
 #define _urcu_stringify(a) #a
 
src/urcu.c +1 -1
index f6ca5f8..2ebe993 100644
@@ -38,6 +38,7 @@
 #include <stdbool.h>
 #include <poll.h>
 
+#include <urcu/config.h>
 #include <urcu/arch.h>
 #include <urcu/wfcqueue.h>
 #include <urcu/map/urcu.h>
--

2.29.2

Signature · 7 lines
Mathieu Desnoyers
EfficiOS Inc.
http://www.efficios.com
_______________________________________________
lttng-dev mailing list
[email protected]
https://lists.lttng.org/cgi-bin/mailman/listinfo/lttng-dev