Changeset 0dc2fec in mainline for uspace/lib/c

Timestamp:

2016-05-22T19:19:43Z (9 years ago)

Author:

Jiri Svoboda <jiri@…>

Branches:

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

Children:

b272c67a

Parents:

153c7a29 (diff), af2254ec (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Merge mainline changes

Location:

uspace/lib/c

Files:

• Makefile (modified) (2 diffs)
• generic/double_to_str.c (modified) (2 diffs)
• generic/fibril.c (modified) (1 diff)
• generic/ieee_double.c (modified) (1 diff)
• generic/rcu.c (moved) (moved from uspace/lib/urcu/rcu.c )
• include/assert.h (modified) (1 diff)
• include/rcu.h (moved) (moved from uspace/lib/urcu/rcu.h )

uspace/lib/c/Makefile

@@ -46 +46 @@
 SLIBRARY = libc.so.0.0
 LSONAME = libc.so.0
-
-LIBS = $(LIBURCU_PREFIX)/liburcu.a
-EXTRA_CFLAGS += -I$(LIBURCU_PREFIX)
 
 -include $(CONFIG_MAKEFILE)
@@ -150 +147 @@
         generic/vfs/vfs.c \
         generic/vfs/canonify.c \
+        generic/rcu.c \
         generic/setjmp.c \
         generic/stack.c \

uspace/lib/c/generic/double_to_str.c

@@ -505 +505 @@
 {
         /* The whole computation assumes 64bit significand. */
-        assert(sizeof(ieee_val.pos_val.significand) == sizeof(uint64_t));
+        static_assert(sizeof(ieee_val.pos_val.significand) == sizeof(uint64_t));
 
         if (ieee_val.is_special) {
@@ -753 +753 @@
 {
         /* The whole computation assumes 64bit significand. */
-        assert(sizeof(ieee_val.pos_val.significand) == sizeof(uint64_t));
+        static_assert(sizeof(ieee_val.pos_val.significand) == sizeof(uint64_t));
 
         if (ieee_val.is_special) {

uspace/lib/c/generic/fibril.c

@@ -114 +114 @@
         fibril->waits_for = NULL;
 
-        futex_lock(&fibril_futex);
+        /*
+         * We are called before __tcb_set(), so we need to use
+         * futex_down/up() instead of futex_lock/unlock() that
+         * may attempt to access TLS.
+         */
+        futex_down(&fibril_futex);
         list_append(&fibril->all_link, &fibril_list);
-        futex_unlock(&fibril_futex);
+        futex_up(&fibril_futex);
         
         return fibril;

uspace/lib/c/generic/ieee_double.c

@@ -45 +45 @@
         const int exponent_bias = 1075;
 
-        assert(sizeof(val) == sizeof(uint64_t));
+        static_assert(sizeof(val) == sizeof(uint64_t));
 
         union {

uspace/lib/c/include/assert.h

@@ -37 +37 @@
 #define LIBC_ASSERT_H_
 
+#define static_assert(expr)     _Static_assert(expr, "")
+
 /** Debugging assert macro
  *