From 6cd23d474d3b7d3d090652d0d0b9508ab7d1f9f8 Mon Sep 17 00:00:00 2001 From: Mathieu Desnoyers Date: Fri, 30 Nov 2018 17:19:44 -0500 Subject: [PATCH] Use new header locations for includes from urcu code This also moves urcu/static/urcu-pointer.h to urcu/static/pointer.h. Considering that it is not meant to be included directly by library users, it should not cause any problem. Signed-off-by: Mathieu Desnoyers --- include/Makefile.am | 2 +- include/urcu/pointer.h | 4 ++-- include/urcu/static/{urcu-pointer.h => pointer.h} | 2 +- include/urcu/urcu-bp.h | 12 ++++++------ include/urcu/urcu-mb.h | 12 ++++++------ include/urcu/urcu-memb.h | 12 ++++++------ include/urcu/urcu-qsbr.h | 10 +++++----- include/urcu/urcu-signal.h | 12 ++++++------ src/rculfhash.c | 6 +++--- src/urcu-pointer.c | 4 ++-- src/workqueue.c | 12 ++++++------ 11 files changed, 44 insertions(+), 44 deletions(-) rename include/urcu/static/{urcu-pointer.h => pointer.h} (99%) diff --git a/include/Makefile.am b/include/Makefile.am index a567f91..34812d4 100644 --- a/include/Makefile.am +++ b/include/Makefile.am @@ -10,7 +10,7 @@ nobase_dist_include_HEADERS = urcu/compiler.h urcu/hlist.h urcu/list.h \ urcu/map/urcu-signal.h \ urcu/static/lfstack.h urcu/static/rculfqueue.h \ urcu/static/rculfstack.h urcu/static/urcu-bp.h \ - urcu/static/urcu.h urcu/static/urcu-pointer.h \ + urcu/static/urcu.h urcu/static/pointer.h \ urcu/static/urcu-qsbr.h urcu/static/wfcqueue.h \ urcu/static/wfqueue.h urcu/static/wfstack.h \ urcu/static/urcu-mb.h urcu/static/urcu-memb.h \ diff --git a/include/urcu/pointer.h b/include/urcu/pointer.h index dc1a0da..a670272 100644 --- a/include/urcu/pointer.h +++ b/include/urcu/pointer.h @@ -2,7 +2,7 @@ #define _URCU_POINTER_H /* - * urcu-pointer.h + * urcu/pointer.h * * Userspace RCU header. Operations on pointers. * @@ -36,7 +36,7 @@ extern "C" { #if defined(_LGPL_SOURCE) || defined(URCU_INLINE_SMALL_FUNCTIONS) -#include +#include /* * rcu_dereference(ptr) diff --git a/include/urcu/static/urcu-pointer.h b/include/urcu/static/pointer.h similarity index 99% rename from include/urcu/static/urcu-pointer.h rename to include/urcu/static/pointer.h index 6e120fc..732f8c0 100644 --- a/include/urcu/static/urcu-pointer.h +++ b/include/urcu/static/pointer.h @@ -2,7 +2,7 @@ #define _URCU_POINTER_STATIC_H /* - * urcu-pointer-static.h + * urcu/static/pointer.h * * Userspace RCU header. Operations on pointers. * diff --git a/include/urcu/urcu-bp.h b/include/urcu/urcu-bp.h index 7b00aaa..d3d122d 100644 --- a/include/urcu/urcu-bp.h +++ b/include/urcu/urcu-bp.h @@ -52,10 +52,10 @@ extern "C" { */ /* - * See urcu-pointer.h and urcu/static/urcu-pointer.h for pointer + * See urcu/pointer.h and urcu/static/pointer.h for pointer * publication headers. */ -#include +#include #ifdef _LGPL_SOURCE @@ -85,7 +85,7 @@ extern "C" { /* * library wrappers to be used by non-LGPL compatible source code. - * See LGPL-only urcu/static/urcu-pointer.h for documentation. + * See LGPL-only urcu/static/pointer.h for documentation. */ extern void urcu_bp_read_lock(void); @@ -184,9 +184,9 @@ static inline void urcu_bp_thread_online(void) } #endif -#include -#include -#include +#include +#include +#include #ifndef URCU_API_MAP #include diff --git a/include/urcu/urcu-mb.h b/include/urcu/urcu-mb.h index 2000375..ab485f1 100644 --- a/include/urcu/urcu-mb.h +++ b/include/urcu/urcu-mb.h @@ -35,10 +35,10 @@ #include /* - * See urcu-pointer.h and urcu/static/urcu-pointer.h for pointer + * See urcu/pointer.h and urcu/static/pointer.h for pointer * publication headers. */ -#include +#include #ifdef __cplusplus extern "C" { @@ -79,7 +79,7 @@ extern "C" { /* * library wrappers to be used by non-LGPL compatible source code. - * See LGPL-only urcu/static/urcu-pointer.h for documentation. + * See LGPL-only urcu/static/pointer.h for documentation. */ extern void urcu_mb_read_lock(void); @@ -120,9 +120,9 @@ static inline void urcu_mb_thread_online(void) } #endif -#include -#include -#include +#include +#include +#include #ifndef URCU_API_MAP #include diff --git a/include/urcu/urcu-memb.h b/include/urcu/urcu-memb.h index c0fffe8..c11c93e 100644 --- a/include/urcu/urcu-memb.h +++ b/include/urcu/urcu-memb.h @@ -35,10 +35,10 @@ #include /* - * See urcu-pointer.h and urcu/static/urcu-pointer.h for pointer + * See urcu/pointer.h and urcu/static/pointer.h for pointer * publication headers. */ -#include +#include #ifdef __cplusplus extern "C" { @@ -79,7 +79,7 @@ extern "C" { /* * library wrappers to be used by non-LGPL compatible source code. - * See LGPL-only urcu/static/urcu-pointer.h for documentation. + * See LGPL-only urcu/static/pointer.h for documentation. */ extern void urcu_memb_read_lock(void); @@ -120,9 +120,9 @@ static inline void urcu_memb_thread_online(void) } #endif -#include -#include -#include +#include +#include +#include #ifndef URCU_API_MAP #include diff --git a/include/urcu/urcu-qsbr.h b/include/urcu/urcu-qsbr.h index 041db21..28e6065 100644 --- a/include/urcu/urcu-qsbr.h +++ b/include/urcu/urcu-qsbr.h @@ -32,10 +32,10 @@ #include /* - * See urcu-pointer.h and urcu/static/urcu-pointer.h for pointer + * See urcu/pointer.h and urcu/static/pointer.h for pointer * publication headers. */ -#include +#include #ifdef __cplusplus extern "C" { @@ -133,9 +133,9 @@ extern void urcu_qsbr_unregister_thread(void); } #endif -#include -#include -#include +#include +#include +#include #ifndef URCU_API_MAP #include diff --git a/include/urcu/urcu-signal.h b/include/urcu/urcu-signal.h index 8c36450..59c5d01 100644 --- a/include/urcu/urcu-signal.h +++ b/include/urcu/urcu-signal.h @@ -35,10 +35,10 @@ #include /* - * See urcu-pointer.h and urcu/static/urcu-pointer.h for pointer + * See urcu/pointer.h and urcu/static/pointer.h for pointer * publication headers. */ -#include +#include #ifdef __cplusplus extern "C" { @@ -79,7 +79,7 @@ extern "C" { /* * library wrappers to be used by non-LGPL compatible source code. - * See LGPL-only urcu/static/urcu-pointer.h for documentation. + * See LGPL-only urcu/static/pointer.h for documentation. */ extern void urcu_signal_read_lock(void); @@ -120,9 +120,9 @@ static inline void urcu_signal_thread_online(void) } #endif -#include -#include -#include +#include +#include +#include #ifndef URCU_API_MAP #include diff --git a/src/rculfhash.c b/src/rculfhash.c index fed33e4..b63a0a6 100644 --- a/src/rculfhash.c +++ b/src/rculfhash.c @@ -266,9 +266,9 @@ #include #include "compat-getcpu.h" -#include -#include -#include +#include +#include +#include #include #include #include diff --git a/src/urcu-pointer.c b/src/urcu-pointer.c index 61e35da..d0854ac 100644 --- a/src/urcu-pointer.c +++ b/src/urcu-pointer.c @@ -26,9 +26,9 @@ #include -#include "urcu/static/urcu-pointer.h" +#include /* Do not #define _LGPL_SOURCE to ensure we can emit the wrapper symbols */ -#include "urcu-pointer.h" +#include extern void synchronize_rcu(void); diff --git a/src/workqueue.c b/src/workqueue.c index 14957a0..59eb21d 100644 --- a/src/workqueue.c +++ b/src/workqueue.c @@ -36,12 +36,12 @@ #include #include "compat-getcpu.h" -#include "urcu/wfcqueue.h" -#include "urcu-pointer.h" -#include "urcu/list.h" -#include "urcu/futex.h" -#include "urcu/tls-compat.h" -#include "urcu/ref.h" +#include +#include +#include +#include +#include +#include #include "urcu-die.h" #include "workqueue.h" -- 2.34.1