[Xenomai-git] Philippe Gerum : boilerplate, copperplate: rename barrier() -> compiler_barrier()

[git repository hosting]

Module: xenomai-3
Branch: stable-3.0.x
Commit: cd8815510e4ea53218a36518be09276bab21750d
URL:    
http://git.xenomai.org/?p=xenomai-3.git;a=commit;h=cd8815510e4ea53218a36518be09276bab21750d

Author: Philippe Gerum <r...@xenomai.org>
Date:   Sun Sep 24 17:08:41 2017 +0200

boilerplate, copperplate: rename barrier() -> compiler_barrier()

Boost (and maybe other frameworks) defines barrier() as a
synchonization method. Get away from further conflicts by referring
explicitly to a compiler barrier.

---

 include/boilerplate/atomic.h |    2 +-
 lib/copperplate/registry.c   |    2 +-
 lib/copperplate/threadobj.c  |    2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/include/boilerplate/atomic.h b/include/boilerplate/atomic.h
index e1c8aa5..731961e 100644
--- a/include/boilerplate/atomic.h
+++ b/include/boilerplate/atomic.h
@@ -80,7 +80,7 @@ static inline void atomic_set(atomic_t *ptr, long v)
 
 #define ACCESS_ONCE(x) (*(volatile typeof(x) *)&(x))
 
-#define barrier()      __asm__ __volatile__("": : :"memory")
+#define compiler_barrier()     __asm__ __volatile__("": : :"memory")
 
 #ifndef cpu_relax
 #define cpu_relax() __sync_synchronize()
diff --git a/lib/copperplate/registry.c b/lib/copperplate/registry.c
index 1df7d6e..5f139a6 100644
--- a/lib/copperplate/registry.c
+++ b/lib/copperplate/registry.c
@@ -684,7 +684,7 @@ static int spawn_daemon(const char *sessdir, int flags)
                 */
                while (usleep(200000) > 0) ;
                regd_pid = pid;
-               barrier();
+               compiler_barrier();
                sa.sa_handler = sigchld_handler;
                sa.sa_flags = SA_RESTART;
                sigaction(SIGCHLD, &sa, NULL);
diff --git a/lib/copperplate/threadobj.c b/lib/copperplate/threadobj.c
index e52984b..1e7f9f5 100644
--- a/lib/copperplate/threadobj.c
+++ b/lib/copperplate/threadobj.c
@@ -933,7 +933,7 @@ static void __threadobj_boost(void)
                current->core.policy_unboosted = current->policy;
                current->core.schedparam_unboosted = current->schedparam;
        }
-       barrier();
+       compiler_barrier();
 
        ret = pthread_setschedparam(current->ptid, SCHED_FIFO, &param);
        if (ret) {


_______________________________________________
Xenomai-git mailing list
Xenomai-git@xenomai.org
https://xenomai.org/mailman/listinfo/xenomai-git