Changeset 04803bf in mainline for uspace/lib/c/include/fibril.h

Timestamp:

2011-03-21T22:00:17Z (15 years ago)

Author:

Jiri Svoboda <jiri@…>

Branches:

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

Children:

143932e3

Parents:

b50b5af2 (diff), 7308e84 (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 (needs fixes).

File:

• uspace/lib/c/include/fibril.h (moved) (moved from uspace/lib/libc/include/fibril.h ) (4 diffs)

uspace/lib/c/include/fibril.h

@@ -40 +40 @@
 #include <libarch/tls.h>
 
-#ifndef context_set
-#define context_set(c, _pc, stack, size, ptls) \
+#define context_set_generic(c, _pc, stack, size, ptls) \
         (c)->pc = (sysarg_t) (_pc); \
         (c)->sp = ((sysarg_t) (stack)) + (size) - SP_DELTA; \
         (c)->tls = (sysarg_t) (ptls);
-#endif /* context_set */
 
-#define FIBRIL_SERIALIZED       1
-#define FIBRIL_WRITER           2
+#define FIBRIL_SERIALIZED  1
+#define FIBRIL_WRITER      2
+
+struct fibril;
+
+typedef struct {
+        struct fibril *owned_by;
+} fibril_owner_info_t;
 
 typedef enum {
@@ -59 +63 @@
 typedef sysarg_t fid_t;
 
-struct fibril {
+typedef struct fibril {
         link_t link;
         context_t ctx;
@@ -70 +74 @@
         int retval;
         int flags;
-};
-typedef struct fibril fibril_t;
+
+        fibril_owner_info_t *waits_for;
+} fibril_t;
 
 /** Fibril-local variable specifier */
 #define fibril_local __thread
 
-extern int context_save(context_t *c) __attribute__ ((returns_twice));
-extern void context_restore(context_t *c) __attribute__ ((noreturn));
+extern int context_save(context_t *ctx) __attribute__((returns_twice));
+extern void context_restore(context_t *ctx) __attribute__((noreturn));
 
 extern fid_t fibril_create(int (*func)(void *), void *arg);
@@ -89 +94 @@
 extern void fibril_inc_sercount(void);
 extern void fibril_dec_sercount(void);
+extern int fibril_get_sercount(void);
 
-static inline int fibril_yield(void) {
+static inline int fibril_yield(void)
+{
         return fibril_switch(FIBRIL_PREEMPT);
 }