Changes in / [3b10ae36:42964a7] in mainline

Location:

uspace

Files:

• Makefile (modified) (1 diff)
• Makefile.common (modified) (6 diffs)
• app/rcubench/Makefile (added)
• app/rcubench/rcubench.c (added)
• app/rcutest/rcutest.c (modified) (1 diff)
• lib/c/Makefile (modified) (6 diffs)
• lib/c/arch/abs32le/_link.ld.in (added)
• lib/c/arch/amd64/_link.ld.in (added)
• lib/c/arch/arm32/_link.ld.in (added)
• lib/c/arch/ia32/_link.ld.in (added)
• lib/c/arch/ia64/_link.ld.in (added)
• lib/c/arch/mips32/_link.ld.in (added)
• lib/c/arch/mips32eb/_link.ld.in (added)
• lib/c/arch/ppc32/_link.ld.in (added)
• lib/c/arch/riscv64/_link.ld.in (added)
• lib/c/arch/sparc64/_link.ld.in (added)
• lib/c/generic/async/ports.c (modified) (1 diff)
• lib/c/generic/async/server.c (modified) (11 diffs)
• lib/c/generic/atomic.c (added)
• lib/c/generic/fibril.c (added)
• lib/c/generic/fibril_synch.c (added)
• lib/c/generic/futex.c (added)
• lib/c/generic/io/kio.c (modified) (1 diff)
• lib/c/generic/ipc.c (modified) (1 diff)
• lib/c/generic/malloc.c (modified) (1 diff)
• lib/c/generic/private/fibril.h (modified) (2 diffs)
• lib/c/generic/private/futex.h (deleted)
• lib/c/generic/rcu.c (added)
• lib/c/generic/thread.c (added)
• lib/c/generic/thread/atomic.c (deleted)
• lib/c/generic/thread/fibril.c (deleted)
• lib/c/generic/thread/fibril_synch.c (deleted)
• lib/c/generic/thread/futex.c (deleted)
• lib/c/generic/thread/mpsc.c (deleted)
• lib/c/generic/thread/rcu.c (deleted)
• lib/c/generic/thread/thread.c (deleted)
• lib/c/generic/thread/tls.c (deleted)
• lib/c/generic/tls.c (added)
• lib/c/include/fibril.h (modified) (2 diffs)
• lib/c/include/fibril_synch.h (modified) (4 diffs)
• lib/c/include/futex.h (added)
• lib/c/include/ipc/common.h (modified) (1 diff)
• lib/drv/include/dev_iface.h (modified) (1 diff)
• lib/pcut/Makefile (modified) (1 diff)
• lib/pcut/update-from-master.sh (modified) (1 diff)
• lib/posix/Makefile (modified) (5 diffs)
• srv/hid/input/ctl/stty.c (modified) (1 diff)
• srv/loader/Makefile (modified) (1 diff)
• srv/loader/elf64_ia64_loader.x (deleted)

uspace/Makefile

@@ -67 +67 @@
         app/redir \
         app/rcutest \
+        app/rcubench \
         app/sbi \
         app/sportdmp \

uspace/Makefile.common

@@ -35 +35 @@
 #   DEFS               compiler defines
 #   EXTRA_CFLAGS       additional flags to pass to C compiler
+#   LINKER_SCRIPT      linker script
 #   PRE_DEPEND         targets required for dependency check
 #
@@ -152 +153 @@
 BASE_LIBS += $(LIBSOFTFLOAT_PREFIX)/libsoftfloat.a $(LIBSOFTINT_PREFIX)/libsoftint.a
 
-ifneq ($(LINK_DYNAMIC),y)
+ifeq ($(LINK_DYNAMIC),y)
+        LINKER_SCRIPT ?= $(LIBC_PREFIX)/arch/$(UARCH)/_link-dlexe.ld
+else
         LDFLAGS += -static
-endif
+        LINKER_SCRIPT ?= $(LIBC_PREFIX)/arch/$(UARCH)/_link.ld
+endif
+
+LIB_LINKER_SCRIPT = $(LIBC_PREFIX)/arch/$(UARCH)/_link-shlib.ld
 
 INCLUDES_FLAGS = $(LIBC_INCLUDES_FLAGS)
@@ -255 +261 @@
 endif
 
-COMMON_CXXFLAGS = $(COMMON_CFLAGS) -fno-exceptions
+COMMON_CXXFLAGS = $(COMMON_CFLAGS)
 HELENOS_CXXFLAGS = \
         -std=c++17 -frtti \
@@ -345 +351 @@
 
 ifneq ($(filter %.cpp %.cc %.cxx, $(SOURCES)),)
-$(BINARY): $(OBJECTS) $(LIBTAGS)
-        $(CXX) $(CXXFLAGS) $(LDFLAGS) $(EXTRA_LDFLAGS) -Wl,-Map,$@.map -o $@ $(START_FILES) $(OBJECTS) $(LIBARGS) $(CXX_BASE_LIBS)
-else
-$(BINARY): $(OBJECTS) $(LIBTAGS)
-        $(CC) $(CFLAGS) $(LDFLAGS) $(EXTRA_LDFLAGS) -Wl,-Map,$@.map -o $@ $(START_FILES) $(OBJECTS) $(LIBARGS) $(BASE_LIBS)
+$(BINARY): $(LINKER_SCRIPT) $(OBJECTS) $(LIBTAGS)
+        $(CXX) $(CXXFLAGS) $(LDFLAGS) $(EXTRA_LDFLAGS) -T $(LINKER_SCRIPT) -Wl,-Map,$@.map -o $@ $(START_FILES) $(OBJECTS) $(LIBARGS) $(CXX_BASE_LIBS)
+else
+$(BINARY): $(LINKER_SCRIPT) $(OBJECTS) $(LIBTAGS)
+        $(CC) $(CFLAGS) $(LDFLAGS) $(EXTRA_LDFLAGS) -T $(LINKER_SCRIPT) -Wl,-Map,$@.map -o $@ $(START_FILES) $(OBJECTS) $(LIBARGS) $(BASE_LIBS)
 endif
 
@@ -355 +361 @@
 
 ifneq ($(TEST_BINARY),)
-$(TEST_BINARY): $(TEST_OBJECTS) $(TEST_BINARY_LIBS) $(LIBTAGS)
-        $(CC) $(CFLAGS) $(LDFLAGS) $(EXTRA_LDFLAGS) -Wl,-Map,$@.map -o $@ $(START_FILES) $(TEST_OBJECTS) $(TEST_BINARY_LIBS) $(LIBARGS) $(BASE_LIBS)
+$(TEST_BINARY): $(LINKER_SCRIPT) $(TEST_OBJECTS) $(TEST_BINARY_LIBS) $(LIBTAGS)
+        $(CC) $(CFLAGS) $(LDFLAGS) $(EXTRA_LDFLAGS) -T $(LINKER_SCRIPT) -Wl,-Map,$@.map -o $@ $(START_FILES) $(TEST_OBJECTS) $(TEST_BINARY_LIBS) $(LIBARGS) $(BASE_LIBS)
 endif
 
@@ -372 +378 @@
         $(AR) rc $@ $(LOBJECTS)
 
-$(SLIBRARY): $(LIBRARY).la
-        $(CC) $(CFLAGS) $(LIB_LDFLAGS) $(EXTRA_LDFLAGS) -Wl,-Map,$@.map -o $@ -Wl,--whole-archive $(LIBRARY).la -Wl,--no-whole-archive $(LIBARGS) $(BASE_LIBS)
+$(SLIBRARY): $(LIB_LINKER_SCRIPT) $(LIBRARY).la
+        $(CC) $(CFLAGS) $(LIB_LDFLAGS) $(EXTRA_LDFLAGS) -T $(LIB_LINKER_SCRIPT) -Wl,-Map,$@.map -o $@ -Wl,--whole-archive $(LIBRARY).la -Wl,--no-whole-archive $(LIBARGS) $(BASE_LIBS)
 
 $(LSONAME):

uspace/app/rcutest/rcutest.c

@@ -46 +46 @@
 #include <fibril_synch.h>
 #include <compiler/barrier.h>
+#include <futex.h>
 #include <str.h>
 

uspace/lib/c/Makefile

@@ -33 +33 @@
 CONFIG_MAKEFILE = $(ROOT_PATH)/Makefile.config
 
-EXTRA_OUTPUT = $(START_FILES)
+LINKER_SCRIPTS = \
+        $(LIBC_PREFIX)/arch/$(UARCH)/_link.ld \
+        $(LIBC_PREFIX)/arch/$(UARCH)/_link-shlib.ld \
+        $(LIBC_PREFIX)/arch/$(UARCH)/_link-dlexe.ld
+
+PRE_DEPEND =
+EXTRA_OUTPUT = $(LINKER_SCRIPTS) $(START_FILES)
+EXTRA_CLEAN = $(LINKER_SCRIPTS)
 EXTRA_TEST_CFLAGS = -Wno-deprecated-declarations
 LIBRARY = libc
@@ -44 +51 @@
         generic/libc.c \
         generic/ddi.c \
+        generic/atomic.c \
         generic/as.c \
         generic/bd.c \
@@ -77 +85 @@
         generic/strtol.c \
         generic/l18n/langs.c \
+        generic/fibril.c \
+        generic/fibril_synch.c \
         generic/pcb.c \
         generic/smc.c \
         generic/smp_memory_barrier.c \
+        generic/thread.c \
+        generic/tls.c \
         generic/task.c \
+        generic/futex.c \
         generic/imath.c \
         generic/inet/addr.c \
@@ -129 +142 @@
         generic/stdio/sstream.c \
         generic/stdio/vsprintf.c \
-        generic/thread/atomic.c \
-        generic/thread/fibril.c \
-        generic/thread/fibril_synch.c \
-        generic/thread/thread.c \
-        generic/thread/tls.c \
-        generic/thread/futex.c \
-        generic/thread/rcu.c \
-        generic/thread/mpsc.c \
         generic/sysinfo.c \
         generic/ipc.c \
@@ -160 +165 @@
         generic/vfs/mtab.c \
         generic/vfs/vfs.c \
+        generic/rcu.c \
         generic/setjmp.c \
         generic/stack.c \
@@ -212 +218 @@
         cp $< $@
 
+$(LIBC_PREFIX)/arch/$(UARCH)/_link.ld: $(LIBC_PREFIX)/arch/$(UARCH)/_link.ld.in
+        $(CC) $(DEFS) $(CFLAGS) -DLIBC_PATH=$(CURDIR) -E -x c $< | grep -v "^\#" > $@
+
+$(LIBC_PREFIX)/arch/$(UARCH)/_link-shlib.ld: $(LIBC_PREFIX)/arch/$(UARCH)/_link.ld.in
+        $(CC) $(DEFS) $(CFLAGS) -DLIBC_PATH=$(CURDIR) -DSHLIB -E -x c $< | grep -v "^\#" > $@
+
+$(LIBC_PREFIX)/arch/$(UARCH)/_link-dlexe.ld: $(LIBC_PREFIX)/arch/$(UARCH)/_link.ld.in
+        $(CC) $(DEFS) $(CFLAGS) -DLIBC_PATH=$(CURDIR) -DDLEXE -E -x c $< | grep -v "^\#" > $@
+
 AUTOCHECK = $(realpath $(ROOT_PATH)/tools/autocheck.awk)
 

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

@@ -51 +51 @@
 #include <abi/mm/as.h>
 #include "../private/libc.h"
-#include "../private/fibril.h"
 
 /** Interface data */

uspace/lib/c/generic/async/server.c

@@ -124 +124 @@
 #define DPRINTF(...)  ((void) 0)
 
+/** Call data */
+typedef struct {
+        link_t link;
+        ipc_call_t call;
+} msg_t;
+
 /* Client connection data */
 typedef struct {
@@ -150 +156 @@
         client_t *client;
 
-        /** Channel for messages that should be delivered to this fibril. */
-        mpsc_t *msg_channel;
+        /** Message event. */
+        fibril_event_t msg_arrived;
+
+        /** Messages that should be delivered to this fibril. */
+        list_t msg_queue;
 
         /** Call data of the opening call. */
         ipc_call_t call;
+
+        /** Identification of the closing call. */
+        cap_call_handle_t close_chandle;
 
         /** Fibril function that will be used to handle the connection. */
@@ -411 +423 @@
         async_client_put(client);
 
-        fibril_rmutex_lock(&conn_mutex);
-
         /*
          * Remove myself from the connection hash table.
          */
+        fibril_rmutex_lock(&conn_mutex);
         hash_table_remove(&conn_hash_table, &(conn_key_t){
                 .task_id = fibril_connection->in_task_id,
                 .phone_hash = fibril_connection->in_phone_hash
         });
-
-        /*
-         * Close the channel, if it isn't closed already.
-         */
-        mpsc_t *c = fibril_connection->msg_channel;
-        mpsc_close(c);
-
         fibril_rmutex_unlock(&conn_mutex);
 
@@ -432 +436 @@
          * Answer all remaining messages with EHANGUP.
          */
-        ipc_call_t call;
-        while (mpsc_receive(c, &call, NULL) == EOK)
-                ipc_answer_0(call.cap_handle, EHANGUP);
+        while (!list_empty(&fibril_connection->msg_queue)) {
+                msg_t *msg =
+                    list_get_instance(list_first(&fibril_connection->msg_queue),
+                    msg_t, link);
+
+                list_remove(&msg->link);
+                ipc_answer_0(msg->call.cap_handle, EHANGUP);
+                free(msg);
+        }
 
         /*
-         * Clean up memory.
+         * If the connection was hung-up, answer the last call,
+         * i.e. IPC_M_PHONE_HUNGUP.
          */
-        mpsc_destroy(c);
+        if (fibril_connection->close_chandle)
+                ipc_answer_0(fibril_connection->close_chandle, EOK);
+
         free(fibril_connection);
         return EOK;
@@ -475 +488 @@
         conn->in_task_id = in_task_id;
         conn->in_phone_hash = in_phone_hash;
-        conn->msg_channel = mpsc_create(sizeof(ipc_call_t));
+        conn->msg_arrived = FIBRIL_EVENT_INIT;
+        list_initialize(&conn->msg_queue);
+        conn->close_chandle = CAP_NIL;
         conn->handler = handler;
         conn->data = data;
@@ -488 +503 @@
 
         if (conn->fid == 0) {
-                mpsc_destroy(conn->msg_channel);
                 free(conn);
 
@@ -592 +606 @@
  * @param call Data of the incoming call.
  *
- * @return EOK if the call was successfully passed to the respective fibril.
- * @return ENOENT if the call doesn't match any connection.
- * @return Other error code if routing failed for other reasons.
- *
- */
-static errno_t route_call(ipc_call_t *call)
+ * @return False if the call doesn't match any connection.
+ * @return True if the call was passed to the respective connection fibril.
+ *
+ */
+static bool route_call(ipc_call_t *call)
 {
         assert(call);
@@ -609 +622 @@
         if (!link) {
                 fibril_rmutex_unlock(&conn_mutex);
-                return ENOENT;
+                return false;
         }
 
         connection_t *conn = hash_table_get_inst(link, connection_t, link);
 
-        errno_t rc = mpsc_send(conn->msg_channel, call);
-
-        if (IPC_GET_IMETHOD(*call) == IPC_M_PHONE_HUNGUP) {
-                /* Close the channel, but let the connection fibril answer. */
-                mpsc_close(conn->msg_channel);
-                // FIXME: Ideally, we should be able to discard/answer the
-                //        hungup message here and just close the channel without
-                //        passing it out. Unfortunatelly, somehow that breaks
-                //        handling of CPU exceptions.
-        }
+        // FIXME: malloc in critical section
+        msg_t *msg = malloc(sizeof(*msg));
+        if (!msg) {
+                fibril_rmutex_unlock(&conn_mutex);
+                return false;
+        }
+
+        msg->call = *call;
+        list_append(&msg->link, &conn->msg_queue);
+
+        if (IPC_GET_IMETHOD(*call) == IPC_M_PHONE_HUNGUP)
+                conn->close_chandle = call->cap_handle;
 
         fibril_rmutex_unlock(&conn_mutex);
-        return rc;
+
+        /* If the connection fibril is waiting for an event, activate it */
+        fibril_notify(&conn->msg_arrived);
+        return true;
 }
 
@@ -921 +939 @@
         assert(fibril_connection);
 
+        /*
+         * Why doing this?
+         * GCC 4.1.0 coughs on fibril_connection-> dereference.
+         * GCC 4.1.1 happilly puts the rdhwr instruction in delay slot.
+         *           I would never expect to find so many errors in
+         *           a compiler.
+         */
+        connection_t *conn = fibril_connection;
+
         struct timeval tv;
         struct timeval *expires = NULL;
@@ -929 +956 @@
         }
 
-        errno_t rc = mpsc_receive(fibril_connection->msg_channel,
-            call, expires);
-
-        if (rc == ETIMEOUT)
-                return false;
-
-        if (rc != EOK) {
-                /*
-                 * The async_get_call_timeout() interface doesn't support
-                 * propagating errors. Return a null call instead.
-                 */
-
-                memset(call, 0, sizeof(ipc_call_t));
-        }
-
+        fibril_rmutex_lock(&conn_mutex);
+
+        /* If nothing in queue, wait until something arrives */
+        while (list_empty(&conn->msg_queue)) {
+                if (conn->close_chandle) {
+                        /*
+                         * Handle the case when the connection was already
+                         * closed by the client but the server did not notice
+                         * the first IPC_M_PHONE_HUNGUP call and continues to
+                         * call async_get_call_timeout(). Repeat
+                         * IPC_M_PHONE_HUNGUP until the caller notices.
+                         */
+                        memset(call, 0, sizeof(ipc_call_t));
+                        IPC_SET_IMETHOD(*call, IPC_M_PHONE_HUNGUP);
+                        fibril_rmutex_unlock(&conn_mutex);
+                        return true;
+                }
+
+                // TODO: replace with cvar
+                fibril_rmutex_unlock(&conn_mutex);
+
+                errno_t rc = fibril_wait_timeout(&conn->msg_arrived, expires);
+                if (rc == ETIMEOUT)
+                        return false;
+
+                fibril_rmutex_lock(&conn_mutex);
+        }
+
+        msg_t *msg = list_get_instance(list_first(&conn->msg_queue),
+            msg_t, link);
+        list_remove(&msg->link);
+
+        *call = msg->call;
+        free(msg);
+
+        fibril_rmutex_unlock(&conn_mutex);
         return true;
 }
@@ -1023 +1071 @@
 
         /* Try to route the call through the connection hash table */
-        errno_t rc = route_call(call);
-        if (rc == EOK)
+        if (route_call(call))
                 return;
 
-        // TODO: Log the error.
-
-        if (call->cap_handle != CAP_NIL)
-                /* Unknown call from unknown phone - hang it up */
-                ipc_answer_0(call->cap_handle, EHANGUP);
+        /* Unknown call from unknown phone - hang it up */
+        ipc_answer_0(call->cap_handle, EHANGUP);
 }
 

uspace/lib/c/generic/io/kio.c

@@ -44 +44 @@
 #include <macros.h>
 #include <libarch/config.h>
-
-#include "../private/futex.h"
+#include <futex.h>
 
 #define KIO_BUFFER_SIZE PAGE_SIZE

uspace/lib/c/generic/ipc.c

@@ -46 +46 @@
 #include <errno.h>
 #include <adt/list.h>
+#include <futex.h>
 #include <fibril.h>
 #include <macros.h>

uspace/lib/c/generic/malloc.c

@@ -44 +44 @@
 #include <bitops.h>
 #include <mem.h>
+#include <fibril_synch.h>
 #include <stdlib.h>
 #include <adt/gcdlcm.h>
-
 #include "private/malloc.h"
-#include "private/fibril.h"
 
 /** Magic used in heap headers. */

uspace/lib/c/generic/private/fibril.h

@@ -35 +35 @@
 #include <abi/proc/uarg.h>
 #include <atomic.h>
-#include <fibril.h>
-
-#include "./futex.h"
-
-typedef struct {
-        fibril_t *fibril;
-} fibril_event_t;
-
-#define FIBRIL_EVENT_INIT ((fibril_event_t) {0})
+#include <futex.h>
 
 struct fibril {
@@ -81 +73 @@
 extern void __fibrils_init(void);
 
-extern void fibril_wait_for(fibril_event_t *);
-extern errno_t fibril_wait_timeout(fibril_event_t *, const struct timeval *);
-extern void fibril_notify(fibril_event_t *);
-
-extern errno_t fibril_ipc_wait(ipc_call_t *, const struct timeval *);
-extern void fibril_ipc_poke(void);
-
-/**
- * "Restricted" fibril mutex.
- *
- * Similar to `fibril_mutex_t`, but has a set of restrictions placed on its
- * use. Within a rmutex critical section, you
- *         - may not use any other synchronization primitive,
- *           save for another `fibril_rmutex_t`. This includes nonblocking
- *           operations like cvar signal and mutex unlock, unless otherwise
- *           specified.
- *         - may not read IPC messages
- *         - may not start a new thread/fibril
- *           (creating fibril without starting is fine)
- *
- * Additionally, locking with a timeout is not possible on this mutex,
- * and there is no associated condition variable type.
- * This is a design constraint, not a lack of implementation effort.
- */
-typedef struct {
-        // TODO: At this point, this is just silly handwaving to hide current
-        //       futex use behind a fibril based abstraction. Later, the imple-
-        //       mentation will change, but the restrictions placed on this type
-        //       will allow it to be simpler and faster than a regular mutex.
-        //       There might also be optional debug checking of the assumptions.
-        //
-        //       Note that a consequence of the restrictions is that if we are
-        //       running on a single thread, no other fibril can ever get to run
-        //       while a fibril has a rmutex locked. That means that for
-        //       single-threaded programs, we can reduce all rmutex locks and
-        //       unlocks to simple branches on a global bool variable.
-
-        futex_t futex;
-} fibril_rmutex_t;
-
-#define FIBRIL_RMUTEX_INITIALIZER(name) \
-        { .futex = FUTEX_INITIALIZE(1) }
-
-#define FIBRIL_RMUTEX_INITIALIZE(name) \
-        fibril_rmutex_t name = FIBRIL_RMUTEX_INITIALIZER(name)
-
-extern void fibril_rmutex_initialize(fibril_rmutex_t *);
-extern void fibril_rmutex_lock(fibril_rmutex_t *);
-extern bool fibril_rmutex_trylock(fibril_rmutex_t *);
-extern void fibril_rmutex_unlock(fibril_rmutex_t *);
-
-
 #endif

uspace/lib/c/include/fibril.h

@@ -49 +49 @@
 typedef fibril_t *fid_t;
 
+typedef struct {
+        fibril_t *fibril;
+} fibril_event_t;
+
+#define FIBRIL_EVENT_INIT ((fibril_event_t) {0})
+
 /** Fibril-local variable specifier */
 #define fibril_local __thread
@@ -76 +82 @@
 extern __noreturn void fibril_exit(long);
 
+extern void fibril_wait_for(fibril_event_t *);
+extern errno_t fibril_wait_timeout(fibril_event_t *, const struct timeval *);
+extern void fibril_notify(fibril_event_t *);
+
+extern errno_t fibril_ipc_wait(ipc_call_t *, const struct timeval *);
+extern void fibril_ipc_poke(void);
+
 #endif
 

uspace/lib/c/include/fibril_synch.h

@@ -41 +41 @@
 #include <sys/time.h>
 #include <stdbool.h>
+#include <futex.h>
+
+/**
+ * "Restricted" fibril mutex.
+ *
+ * Similar to `fibril_mutex_t`, but has a set of restrictions placed on its
+ * use. Within a rmutex critical section, you
+ *         - may not use any other synchronization primitive,
+ *           save for another `fibril_rmutex_t`. This includes nonblocking
+ *           operations like cvar signal and mutex unlock.
+ *         - may not read IPC messages
+ *         - may not start a new thread/fibril
+ *           (creating fibril without starting is fine)
+ *
+ * Additionally, locking with a timeout is not possible on this mutex,
+ * and there is no associated condition variable type.
+ * This is a design constraint, not a lack of implementation effort.
+ */
+typedef struct {
+        // TODO: At this point, this is just silly handwaving to hide current
+        //       futex use behind a fibril based abstraction. Later, the imple-
+        //       mentation will change, but the restrictions placed on this type
+        //       will allow it to be simpler and faster than a regular mutex.
+        //       There might also be optional debug checking of the assumptions.
+        //
+        //       Note that a consequence of the restrictions is that if we are
+        //       running on a single thread, no other fibril can ever get to run
+        //       while a fibril has a rmutex locked. That means that for
+        //       single-threaded programs, we can reduce all rmutex locks and
+        //       unlocks to simple branches on a global bool variable.
+
+        futex_t futex;
+} fibril_rmutex_t;
+
+#define FIBRIL_RMUTEX_INITIALIZER(name) \
+        { .futex = FUTEX_INITIALIZE(1) }
+
+#define FIBRIL_RMUTEX_INITIALIZE(name) \
+        fibril_rmutex_t name = FIBRIL_RMUTEX_INITIALIZER(name)
 
 typedef struct {
@@ -147 +186 @@
         long int count;
         list_t waiters;
-        bool closed;
 } fibril_semaphore_t;
 
@@ -163 +201 @@
 #define FIBRIL_SEMAPHORE_INITIALIZE(name, cnt) \
         fibril_semaphore_t name = FIBRIL_SEMAPHORE_INITIALIZER(name, cnt)
+
+extern void fibril_rmutex_initialize(fibril_rmutex_t *);
+extern void fibril_rmutex_lock(fibril_rmutex_t *);
+extern bool fibril_rmutex_trylock(fibril_rmutex_t *);
+extern void fibril_rmutex_unlock(fibril_rmutex_t *);
 
 extern void fibril_mutex_initialize(fibril_mutex_t *);
@@ -198 +241 @@
 extern void fibril_semaphore_up(fibril_semaphore_t *);
 extern void fibril_semaphore_down(fibril_semaphore_t *);
-extern errno_t fibril_semaphore_down_timeout(fibril_semaphore_t *, suseconds_t);
-extern void fibril_semaphore_close(fibril_semaphore_t *);
-
-typedef struct mpsc mpsc_t;
-extern mpsc_t *mpsc_create(size_t);
-extern void mpsc_destroy(mpsc_t *);
-extern errno_t mpsc_send(mpsc_t *, const void *);
-extern errno_t mpsc_receive(mpsc_t *, void *, const struct timeval *);
-extern void mpsc_close(mpsc_t *);
 
 #endif

uspace/lib/c/include/ipc/common.h

@@ -37 +37 @@
 
 #include <abi/ipc/ipc.h>
+#include <atomic.h>
 #include <abi/proc/task.h>
+#include <futex.h>
 #include <abi/cap.h>
-#include <types/common.h>
 
 #define IPC_FLAG_BLOCKING  0x01

uspace/lib/drv/include/dev_iface.h

@@ -38 +38 @@
 #include <ipc/common.h>
 #include <ipc/dev_iface.h>
-#include <stdbool.h>
 
 /*

uspace/lib/pcut/Makefile

@@ -36 +36 @@
 
 test-libpcut-%: $(LIBRARY).a
-        $(CC) $(CFLAGS) $(LDFLAGS) -o $@ $(START_FILES) $^ $(LIBRARY).a $(BASE_LIBS)
+        $(CC) $(CFLAGS) $(LDFLAGS) -T $(LINKER_SCRIPT) -o $@ $(START_FILES) $^ $(LIBRARY).a $(BASE_LIBS)
 

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

@@ -80 +80 @@
 
 test-libpcut-%: $(LIBRARY).a
-        $(CC) $(CFLAGS) $(LDFLAGS) -o $@ $(START_FILES) $^ $(LIBRARY).a $(BASE_LIBS)
+        $(CC) $(CFLAGS) $(LDFLAGS) -T $(LINKER_SCRIPT) -o $@ $(START_FILES) $^ $(LIBRARY).a $(BASE_LIBS)
 
 EOF_MAKEFILE_TAIL

uspace/lib/posix/Makefile

@@ -36 +36 @@
 
 SPECS = gcc.specs
+LIBC_LINKER_SCRIPT = $(LIBC_PREFIX)/arch/$(UARCH)/_link.ld
+EXPORT_LINKER_SCRIPT = link.ld
 
 EXPORT_FILES = \
@@ -46 +48 @@
         $(LIBC_PREFIX)/crt1.o \
         $(LIBRARY).a \
+        $(EXPORT_LINKER_SCRIPT) \
         $(SPECS)
 
@@ -51 +54 @@
 EXTRA_CLEAN = $(INCLUDE_LIBC)
 
-EXTRA_OUTPUT = $(SPECS)
+EXTRA_OUTPUT = $(SPECS) $(EXPORT_LINKER_SCRIPT) $(EXPORT_STARTUP_FILE)
 
 SOURCES = \
@@ -89 +92 @@
 EXPORT_LDFLAGS = \
         -L$$(HELENOS_EXPORT_ROOT)/lib \
+        -T link.ld \
         $$(HELENOS_EXPORT_ROOT)/lib/crt0.o \
         $$(HELENOS_EXPORT_ROOT)/lib/crt1.o
@@ -110 +114 @@
         echo '$(EXPORT_LDLIBS)' >> $@.new
         mv $@.new $@
+
+$(EXPORT_LINKER_SCRIPT): $(LIBC_LINKER_SCRIPT)
+        cp $< $@
+
+$(EXPORT_STARTUP_FILE): $(LIBC_STARTUP_FILE)
+        cp $< $@
 
 $(INCLUDE_LIBC): $(shell find ../c/include -name '*.h')

uspace/srv/hid/input/ctl/stty.c

@@ -38 +38 @@
  */
 
-#include <errno.h>
 #include <io/keycode.h>
 #include "../stroke.h"

uspace/srv/loader/Makefile

@@ -29 +29 @@
 
 USPACE_PREFIX = ../..
-ROOT_PATH = $(USPACE_PREFIX)/..
-CONFIG_MAKEFILE = $(ROOT_PATH)/Makefile.config
 
-include $(CONFIG_MAKEFILE)
-
-ifeq ($(UARCH),ia64)
-        # IA64 has a peculiar linker script with a fixed data segment address.
-        # Because the loader is a separate nonrelocatable binary in the same
-        # address space as the application, we provide a modified copy of
-        # the default linker script to work around that.
-        EXTRA_LDFLAGS = -T elf64_ia64_loader.x
-else
-        # On all other architectures, we can simply move the text segment.
-        EXTRA_LDFLAGS = -Wl,-Ttext-segment=0x70000000
-endif
+EXTRA_LDFLAGS = -Wl,-Ttext-segment=0x70000000
 
 BINARY = loader