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

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/include

Files:

• fibril.h (modified) (2 diffs)
• fibril_synch.h (modified) (2 diffs)
• ipc/common.h (modified) (1 diff)

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
@@ -82 +76 @@
 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, 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)
 
 typedef struct {
@@ -204 +164 @@
         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 *);
 extern void fibril_mutex_lock(fibril_mutex_t *);

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