From a2e7bf9ce5de5113c7f59c380b0087e291cd603d Mon Sep 17 00:00:00 2001 From: Mathieu Desnoyers Date: Fri, 10 Jun 2011 15:58:34 -0400 Subject: [PATCH] Headers: move uatomic_*.h to urcu/uatomic/*.h, rename uatomic_arch.h to uatomic.h Signed-off-by: Mathieu Desnoyers --- Makefile.am | 6 +++--- compat_arch_x86.c | 2 +- configure.ac | 4 ++-- tests/test_uatomic.c | 2 +- tests/urcutorture.c | 2 +- urcu-defer-impl.h | 2 +- urcu-pointer.c | 2 +- urcu-pointer.h | 2 +- urcu/static/rculfqueue.h | 2 +- urcu/static/rculfstack.h | 2 +- urcu/static/urcu-bp.h | 2 +- urcu/static/urcu-pointer.h | 2 +- urcu/static/urcu-qsbr.h | 2 +- urcu/static/urcu.h | 2 +- urcu/static/wfqueue.h | 2 +- urcu/static/wfstack.h | 2 +- urcu/{uatomic_arch_alpha.h => uatomic/alpha.h} | 2 +- urcu/{uatomic_arch_arm.h => uatomic/arm.h} | 2 +- urcu/{uatomic_arch_gcc.h => uatomic/gcc.h} | 4 ++-- urcu/{uatomic_generic.h => uatomic/generic.h} | 0 urcu/{uatomic_arch_ppc.h => uatomic/ppc.h} | 2 +- urcu/{uatomic_arch_s390.h => uatomic/s390.h} | 2 +- urcu/{uatomic_arch_sparc64.h => uatomic/sparc64.h} | 2 +- urcu/{uatomic_arch_unknown.h => uatomic/unknown.h} | 0 urcu/{uatomic_arch_x86.h => uatomic/x86.h} | 2 +- urcu/urcu_ref.h | 2 +- 26 files changed, 28 insertions(+), 28 deletions(-) rename urcu/{uatomic_arch_alpha.h => uatomic/alpha.h} (97%) rename urcu/{uatomic_arch_arm.h => uatomic/arm.h} (97%) rename urcu/{uatomic_arch_gcc.h => uatomic/gcc.h} (94%) rename urcu/{uatomic_generic.h => uatomic/generic.h} (100%) rename urcu/{uatomic_arch_ppc.h => uatomic/ppc.h} (99%) rename urcu/{uatomic_arch_s390.h => uatomic/s390.h} (99%) rename urcu/{uatomic_arch_sparc64.h => uatomic/sparc64.h} (98%) rename urcu/{uatomic_arch_unknown.h => uatomic/unknown.h} (100%) rename urcu/{uatomic_arch_x86.h => uatomic/x86.h} (99%) diff --git a/Makefile.am b/Makefile.am index e85c924..53268e5 100644 --- a/Makefile.am +++ b/Makefile.am @@ -8,12 +8,12 @@ SUBDIRS = . tests include_HEADERS = urcu.h $(top_srcdir)/urcu-*.h nobase_dist_include_HEADERS = urcu/compiler.h urcu/hlist.h urcu/list.h \ urcu/rculist.h urcu/rcuhlist.h urcu/system.h urcu/urcu-futex.h \ - urcu/uatomic_generic.h urcu/arch/generic.h urcu/wfstack.h \ + urcu/uatomic/generic.h urcu/arch/generic.h urcu/wfstack.h \ urcu/wfqueue.h urcu/rculfstack.h urcu/rculfqueue.h \ urcu/urcu_ref.h urcu/map/*.h urcu/static/*.h -nobase_nodist_include_HEADERS = urcu/arch.h urcu/uatomic_arch.h urcu/config.h +nobase_nodist_include_HEADERS = urcu/arch.h urcu/uatomic.h urcu/config.h -EXTRA_DIST = $(top_srcdir)/urcu/arch/*.h $(top_srcdir)/urcu/uatomic_arch_*.h \ +EXTRA_DIST = $(top_srcdir)/urcu/arch/*.h $(top_srcdir)/urcu/uatomic/*.h \ gpl-2.0.txt lgpl-2.1.txt lgpl-relicensing.txt \ README LICENSE compat_arch_x86.c diff --git a/compat_arch_x86.c b/compat_arch_x86.c index 692417e..9cbd3c8 100644 --- a/compat_arch_x86.c +++ b/compat_arch_x86.c @@ -24,7 +24,7 @@ #include #include #include -#include +#include /* * It does not really matter if the constructor is called before using diff --git a/configure.ac b/configure.ac index 85123a1..a885fd9 100644 --- a/configure.ac +++ b/configure.ac @@ -81,7 +81,7 @@ asm volatile("dmb":::"memory"); ) fi -UATOMICSRC=urcu/uatomic_arch_$ARCHTYPE.h +UATOMICSRC=urcu/uatomic/$ARCHTYPE.h ARCHSRC=urcu/arch/$ARCHTYPE.h if test "x$ARCHTYPE" != xx86 -a "x$ARCHTYPE" != xppc; then APISRC=tests/api_gcc.h @@ -240,7 +240,7 @@ CFLAGS=$saved_CFLAGS AC_CONFIG_LINKS([ urcu/arch.h:$ARCHSRC - urcu/uatomic_arch.h:$UATOMICSRC + urcu/uatomic.h:$UATOMICSRC tests/api.h:$APISRC ]) AC_CONFIG_FILES([ diff --git a/tests/test_uatomic.c b/tests/test_uatomic.c index 2c8c232..692060b 100644 --- a/tests/test_uatomic.c +++ b/tests/test_uatomic.c @@ -1,6 +1,6 @@ #include #include -#include +#include struct testvals { unsigned char c; diff --git a/tests/urcutorture.c b/tests/urcutorture.c index a098d87..5e9b059 100644 --- a/tests/urcutorture.c +++ b/tests/urcutorture.c @@ -24,6 +24,6 @@ #include #endif -#include +#include #include #include "rcutorture.h" diff --git a/urcu-defer-impl.h b/urcu-defer-impl.h index 0aedd53..8dcd114 100644 --- a/urcu-defer-impl.h +++ b/urcu-defer-impl.h @@ -45,7 +45,7 @@ #include #include -#include +#include #include #include diff --git a/urcu-pointer.c b/urcu-pointer.c index 7dfb53a..45dad2b 100644 --- a/urcu-pointer.c +++ b/urcu-pointer.c @@ -24,7 +24,7 @@ * IBM's contributions to this file may be relicensed under LGPLv2 or later. */ -#include +#include #include "urcu/static/urcu-pointer.h" /* Do not #define _LGPL_SOURCE to ensure we can emit the wrapper symbols */ diff --git a/urcu-pointer.h b/urcu-pointer.h index 359a99f..027a18f 100644 --- a/urcu-pointer.h +++ b/urcu-pointer.h @@ -28,7 +28,7 @@ #include #include -#include +#include #ifdef __cplusplus extern "C" { diff --git a/urcu/static/rculfqueue.h b/urcu/static/rculfqueue.h index 410a4cf..75df985 100644 --- a/urcu/static/rculfqueue.h +++ b/urcu/static/rculfqueue.h @@ -27,7 +27,7 @@ */ #include -#include +#include #include /* A urcu implementation header should be already included. */ diff --git a/urcu/static/rculfstack.h b/urcu/static/rculfstack.h index 7caf3c8..99d3d4c 100644 --- a/urcu/static/rculfstack.h +++ b/urcu/static/rculfstack.h @@ -26,7 +26,7 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -#include +#include /* A urcu implementation header should be already included. */ #ifdef __cplusplus diff --git a/urcu/static/urcu-bp.h b/urcu/static/urcu-bp.h index 14c6cfe..cca8d6a 100644 --- a/urcu/static/urcu-bp.h +++ b/urcu/static/urcu-bp.h @@ -37,7 +37,7 @@ #include #include #include -#include +#include #include /* diff --git a/urcu/static/urcu-pointer.h b/urcu/static/urcu-pointer.h index b644486..acd7cee 100644 --- a/urcu/static/urcu-pointer.h +++ b/urcu/static/urcu-pointer.h @@ -32,7 +32,7 @@ #include #include #include -#include +#include #ifdef __cplusplus extern "C" { diff --git a/urcu/static/urcu-qsbr.h b/urcu/static/urcu-qsbr.h index e0b12be..f189e31 100644 --- a/urcu/static/urcu-qsbr.h +++ b/urcu/static/urcu-qsbr.h @@ -39,7 +39,7 @@ #include #include #include -#include +#include #include #include diff --git a/urcu/static/urcu.h b/urcu/static/urcu.h index 18e4826..2898272 100644 --- a/urcu/static/urcu.h +++ b/urcu/static/urcu.h @@ -37,7 +37,7 @@ #include #include #include -#include +#include #include #include diff --git a/urcu/static/wfqueue.h b/urcu/static/wfqueue.h index 790931b..77828ca 100644 --- a/urcu/static/wfqueue.h +++ b/urcu/static/wfqueue.h @@ -30,7 +30,7 @@ #include #include #include -#include +#include #ifdef __cplusplus extern "C" { diff --git a/urcu/static/wfstack.h b/urcu/static/wfstack.h index ff18c4a..454240f 100644 --- a/urcu/static/wfstack.h +++ b/urcu/static/wfstack.h @@ -30,7 +30,7 @@ #include #include #include -#include +#include #ifdef __cplusplus extern "C" { diff --git a/urcu/uatomic_arch_alpha.h b/urcu/uatomic/alpha.h similarity index 97% rename from urcu/uatomic_arch_alpha.h rename to urcu/uatomic/alpha.h index 0f795e8..5dceb90 100644 --- a/urcu/uatomic_arch_alpha.h +++ b/urcu/uatomic/alpha.h @@ -27,6 +27,6 @@ #include #include -#include +#include #endif /* _URCU_UATOMIC_ARCH_ALPHA_H */ diff --git a/urcu/uatomic_arch_arm.h b/urcu/uatomic/arm.h similarity index 97% rename from urcu/uatomic_arch_arm.h rename to urcu/uatomic/arm.h index fee3040..e0016b8 100644 --- a/urcu/uatomic_arch_arm.h +++ b/urcu/uatomic/arm.h @@ -38,6 +38,6 @@ extern "C" { } #endif -#include +#include #endif /* _URCU_ARCH_UATOMIC_ARM_H */ diff --git a/urcu/uatomic_arch_gcc.h b/urcu/uatomic/gcc.h similarity index 94% rename from urcu/uatomic_arch_gcc.h rename to urcu/uatomic/gcc.h index 4aa32fd..47ca195 100644 --- a/urcu/uatomic_arch_gcc.h +++ b/urcu/uatomic/gcc.h @@ -32,7 +32,7 @@ extern "C" { /* * If your platform doesn't have a full set of atomics, you will need * a separate uatomic_arch_*.h file for your architecture. Otherwise, - * just rely on the definitions in uatomic_generic.h. + * just rely on the definitions in uatomic/generic.h. */ #define UATOMIC_HAS_ATOMIC_BYTE #define UATOMIC_HAS_ATOMIC_SHORT @@ -41,6 +41,6 @@ extern "C" { } #endif -#include +#include #endif /* _URCU_ARCH_UATOMIC_GCC_H */ diff --git a/urcu/uatomic_generic.h b/urcu/uatomic/generic.h similarity index 100% rename from urcu/uatomic_generic.h rename to urcu/uatomic/generic.h diff --git a/urcu/uatomic_arch_ppc.h b/urcu/uatomic/ppc.h similarity index 99% rename from urcu/uatomic_arch_ppc.h rename to urcu/uatomic/ppc.h index bb74934..3eb3d63 100644 --- a/urcu/uatomic_arch_ppc.h +++ b/urcu/uatomic/ppc.h @@ -214,6 +214,6 @@ unsigned long _uatomic_add_return(void *addr, unsigned long val, } #endif -#include +#include #endif /* _URCU_ARCH_UATOMIC_PPC_H */ diff --git a/urcu/uatomic_arch_s390.h b/urcu/uatomic/s390.h similarity index 99% rename from urcu/uatomic_arch_s390.h rename to urcu/uatomic/s390.h index 2a4fa03..b274c1c 100644 --- a/urcu/uatomic_arch_s390.h +++ b/urcu/uatomic/s390.h @@ -155,6 +155,6 @@ unsigned long _uatomic_cmpxchg(void *addr, unsigned long old, } #endif -#include +#include #endif /* _URCU_UATOMIC_ARCH_S390_H */ diff --git a/urcu/uatomic_arch_sparc64.h b/urcu/uatomic/sparc64.h similarity index 98% rename from urcu/uatomic_arch_sparc64.h rename to urcu/uatomic/sparc64.h index 082c847..d9ecada 100644 --- a/urcu/uatomic_arch_sparc64.h +++ b/urcu/uatomic/sparc64.h @@ -75,6 +75,6 @@ unsigned long _uatomic_cmpxchg(void *addr, unsigned long old, } #endif -#include +#include #endif /* _URCU_ARCH_UATOMIC_PPC_H */ diff --git a/urcu/uatomic_arch_unknown.h b/urcu/uatomic/unknown.h similarity index 100% rename from urcu/uatomic_arch_unknown.h rename to urcu/uatomic/unknown.h diff --git a/urcu/uatomic_arch_x86.h b/urcu/uatomic/x86.h similarity index 99% rename from urcu/uatomic_arch_x86.h rename to urcu/uatomic/x86.h index 9fedee6..b4c108f 100644 --- a/urcu/uatomic_arch_x86.h +++ b/urcu/uatomic/x86.h @@ -591,6 +591,6 @@ extern unsigned long _compat_uatomic_add_return(void *addr, } #endif -#include +#include #endif /* _URCU_ARCH_UATOMIC_X86_H */ diff --git a/urcu/urcu_ref.h b/urcu/urcu_ref.h index 75620d1..a422a99 100644 --- a/urcu/urcu_ref.h +++ b/urcu/urcu_ref.h @@ -15,7 +15,7 @@ */ #include -#include +#include struct urcu_ref { long refcount; /* ATOMIC */ -- 2.34.1