Changeset 0dc2fec in mainline for uspace/lib

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

Files:

• c/Makefile (modified) (2 diffs)
• c/generic/double_to_str.c (modified) (2 diffs)
• c/generic/fibril.c (modified) (1 diff)
• c/generic/ieee_double.c (modified) (1 diff)
• c/generic/rcu.c (moved) (moved from uspace/lib/urcu/rcu.c )
• c/include/assert.h (modified) (1 diff)
• c/include/rcu.h (moved) (moved from uspace/lib/urcu/rcu.h )
• ext4/Makefile (modified) (1 diff)
• nic/Makefile (modified) (1 diff)
• pcut/Makefile (modified) (3 diffs)
• pcut/update-from-master.sh (modified) (3 diffs)
• posix/source/fnmatch.c (modified) (1 diff)
• usb/include/usb/usb.h (modified) (1 diff)
• usbdev/include/usb/dev/request.h (modified) (1 diff)
• usbdev/src/pipesinit.c (modified) (1 diff)
• usbdev/src/request.c (modified) (1 diff)

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
  *

uspace/lib/ext4/Makefile

@@ -30 +30 @@
 LIBRARY = libext4
 EXTRA_CFLAGS = -I$(LIBBLOCK_PREFIX) -I$(LIBCRYPTO_PREFIX)
-LIBS = $(LIBBLOCK_PREFIX)/libblock.a $(LIBCRYPTO_PREFIX)/libcrypto.a
 
 SOURCES = \

uspace/lib/nic/Makefile

@@ -30 +30 @@
 LIBRARY = libnic
 EXTRA_CFLAGS += -DLIBNIC_INTERNAL -Iinclude -I$(LIBDRV_PREFIX)/include
-LIBS = $(LIBDRV_PREFIX)/libdrv.a
 
 SOURCES = \

uspace/lib/pcut/Makefile

@@ -6 +6 @@
 PCUT_TEST_PREFIX = test-libpcut-
 
-EXTRA_OUTPUT = \
+SELF_TESTS = \
         $(PCUT_TEST_PREFIX)abort$(PCUT_TEST_SUFFIX) \
         $(PCUT_TEST_PREFIX)asserts$(PCUT_TEST_SUFFIX) \
@@ -25 +25 @@
         $(PCUT_TEST_PREFIX)xmlreport$(PCUT_TEST_SUFFIX) 
 
+EXTRA_CLEAN = $(SELF_TESTS)
+
 include helenos.mak
 
@@ -31 +33 @@
 include helenos.test.mak
 
+all-test: $(SELF_TESTS)
+
 test-libpcut-%: $(OUTPUT)
         $(LD) -n $(LFLAGS) -T $(LINKER_SCRIPT) -o $@ $^ $(OUTPUT) $(BASE_LIBS)

uspace/lib/pcut/update-from-master.sh

@@ -59 +59 @@
 PCUT_TEST_PREFIX = test-libpcut-
 
-EXTRA_OUTPUT = \
+SELF_TESTS = \
 EOF_MAKEFILE_HEAD
 
@@ -69 +69 @@
 cat >>Makefile <<'EOF_MAKEFILE_TAIL'
 
+EXTRA_CLEAN = $(SELF_TESTS)
+
 include helenos.mak
 
@@ -75 +77 @@
 include helenos.test.mak
 
+all-test: $(SELF_TESTS)
+
 test-libpcut-%: $(OUTPUT)
         $(LD) -n $(LFLAGS) -T $(LINKER_SCRIPT) -o $@ $^ $(OUTPUT) $(BASE_LIBS)

uspace/lib/posix/source/fnmatch.c

@@ -640 +640 @@
         #define nomatch(s1, s2, flags) assert(posix_fnmatch(s1, s2, flags) == FNM_NOMATCH)
 
-        assert(FNM_PATHNAME == FNM_FILE_NAME);
+        static_assert(FNM_PATHNAME == FNM_FILE_NAME);
         match("", "", 0);
         match("*", "hello", 0);

uspace/lib/usb/include/usb/usb.h

@@ -168 +168 @@
         ( \
             _MAKE_PID_NIBBLE(tag, type) \
-            | ((~_MAKE_PID_NIBBLE(tag, type)) << 4) \
+            | (((~_MAKE_PID_NIBBLE(tag, type)) & 0xf) << 4) \
         )
         USB_PID_OUT = _MAKE_PID(0, 1),

uspace/lib/usbdev/include/usb/dev/request.h

@@ -109 +109 @@
 } __attribute__ ((packed)) usb_device_request_setup_packet_t;
 
-int assert[(sizeof(usb_device_request_setup_packet_t) == 8) ? 1: -1];
-
 int usb_control_request_set(usb_pipe_t *,
     usb_request_type_t, usb_request_recipient_t, uint8_t,

uspace/lib/usbdev/src/pipesinit.c

@@ -340 +340 @@
 {
         assert(pipe);
-        assert(DEV_DESCR_MAX_PACKET_SIZE_OFFSET < CTRL_PIPE_MIN_PACKET_SIZE);
+        static_assert(DEV_DESCR_MAX_PACKET_SIZE_OFFSET < CTRL_PIPE_MIN_PACKET_SIZE);
 
         if ((pipe->direction != USB_DIRECTION_BOTH) ||

uspace/lib/usbdev/src/request.c

@@ -39 +39 @@
 
 #define MAX_DATA_LENGTH ((size_t)(0xFFFF))
+
+static_assert(sizeof(usb_device_request_setup_packet_t) == 8);
 
 /** Generic wrapper for SET requests using standard control request format.