Changeset 05882233 in mainline for uspace/lib/c

Timestamp:

2018-08-11T22:29:39Z (7 years ago)

Author:

Jiří Zárevúcky <jiri.zarevucky@…>

Branches:

lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export

Children:

0abc2ae

Parents:

498ced1

Message:

Unify various barrier includes into <barrier.h>

Location:

uspace/lib/c

Files:

• generic/async/client.c (modified) (1 diff)
• generic/async/ports.c (modified) (1 diff)
• generic/smp_memory_barrier.c (modified) (1 diff)
• generic/thread/rcu.c (modified) (1 diff)
• generic/time.c (modified) (1 diff)
• include/barrier.h (moved) (moved from uspace/lib/c/include/compiler/barrier.h ) (1 diff)
• include/rcu.h (modified) (1 diff)
• include/smp_memory_barrier.h (deleted)

uspace/lib/c/generic/async/client.c

@@ -111 +111 @@
 #include <errno.h>
 #include <sys/time.h>
-#include <libarch/barrier.h>
+#include <barrier.h>
 #include <stdbool.h>
 #include <stdlib.h>

uspace/lib/c/generic/async/ports.c

@@ -42 +42 @@
 #include <errno.h>
 #include <sys/time.h>
-#include <libarch/barrier.h>
+#include <barrier.h>
 #include <stdbool.h>
 #include <stdlib.h>

uspace/lib/c/generic/smp_memory_barrier.c

@@ -33 +33 @@
  */
 
-#include <smp_memory_barrier.h>
+#include <barrier.h>
 #include <libc.h>
 

uspace/lib/c/generic/thread/rcu.c

@@ -71 +71 @@
 #include <stdio.h>
 #include <stddef.h>
-#include <compiler/barrier.h>
-#include <libarch/barrier.h>
+#include <barrier.h>
 #include <macros.h>
 #include <async.h>
 #include <adt/list.h>
-#include <smp_memory_barrier.h>
+#include <barrier.h>
 #include <assert.h>
 #include <time.h>

uspace/lib/c/generic/time.c

@@ -38 +38 @@
 #include <time.h>
 #include <stdbool.h>
-#include <libarch/barrier.h>
+#include <barrier.h>
 #include <macros.h>
 #include <errno.h>

uspace/lib/c/include/barrier.h

@@ -36 +36 @@
 #define LIBC_COMPILER_BARRIER_H_
 
+#include <libarch/barrier.h>
+
+extern void smp_memory_barrier(void);
+
 #define compiler_barrier() asm volatile ("" ::: "memory")
 

uspace/lib/c/include/rcu.h

@@ -37 +37 @@
 #define LIBURCU_RCU_H_
 
-#include <compiler/barrier.h>
-#include <libarch/barrier.h>
+#include <barrier.h>
 #include <stdbool.h>