Changeset f787c8e in mainline for uspace/lib/c/generic

Timestamp:

2018-08-01T18:37:54Z (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:

82d9087

Parents:

1de92fb0

Message:

Move some internal interfaces to private headers.

Location:

uspace/lib/c/generic

Files:

• async/ports.c (modified) (1 diff)
• io/kio.c (modified) (1 diff)
• ipc.c (modified) (1 diff)
• malloc.c (modified) (1 diff)
• private/fibril.h (modified) (2 diffs)
• private/futex.h (moved) (moved from uspace/lib/c/include/futex.h )
• thread/fibril.c (modified) (2 diffs)
• thread/fibril_synch.c (modified) (2 diffs)
• thread/futex.c (modified) (2 diffs)
• thread/mpsc.c (modified) (1 diff)
• thread/rcu.c (modified) (1 diff)

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/io/kio.c

@@ -44 +44 @@
 #include <macros.h>
 #include <libarch/config.h>
-#include <futex.h>
+
+#include "../private/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 <futex.h>
+#include <fibril.h>
+
+#include "./futex.h"
+
+typedef struct {
+        fibril_t *fibril;
+} fibril_event_t;
+
+#define FIBRIL_EVENT_INIT ((fibril_event_t) {0})
 
 struct fibril {
@@ -73 +81 @@
 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/generic/thread/fibril.c

@@ -42 +42 @@
 #include <as.h>
 #include <context.h>
-#include <futex.h>
 #include <assert.h>
 
@@ -51 +50 @@
 
 #include "../private/thread.h"
+#include "../private/futex.h"
 #include "../private/fibril.h"
 #include "../private/libc.h"

uspace/lib/c/generic/thread/fibril_synch.c

@@ -37 +37 @@
 #include <async.h>
 #include <adt/list.h>
-#include <futex.h>
 #include <sys/time.h>
 #include <errno.h>
@@ -50 +49 @@
 #include "../private/async.h"
 #include "../private/fibril.h"
+#include "../private/futex.h"
 
 void fibril_rmutex_initialize(fibril_rmutex_t *m)

uspace/lib/c/generic/thread/futex.c

@@ -33 +33 @@
  */
 
-#include <futex.h>
-
 #include <assert.h>
 #include <atomic.h>
@@ -41 +39 @@
 
 #include "../private/fibril.h"
+#include "../private/futex.h"
 
 //#define DPRINTF(...) kio_printf(__VA_ARGS__)

uspace/lib/c/generic/thread/mpsc.c

@@ -36 +36 @@
 #include <mem.h>
 #include <stdlib.h>
+
+#include "../private/fibril.h"
 
 /*

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

@@ -73 +73 @@
 #include <compiler/barrier.h>
 #include <libarch/barrier.h>
-#include <futex.h>
 #include <macros.h>
 #include <async.h>