Changeset 8119363 in mainline for kernel/generic/include

Timestamp:

2018-06-26T17:35:40Z (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:

6e569bf

Parents:

fbfe59d (diff), e768aea (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 some preliminary async/fibril framework changes.

Location:

kernel/generic/include

Files:

• proc/thread.h (modified) (1 diff)
• synch/futex.h (modified) (1 diff)
• synch/waitq.h (modified) (1 diff)

kernel/generic/include/proc/thread.h

@@ -112 +112 @@
         /** If true, the thread can be interrupted from sleep. */
         bool sleep_interruptible;
+
+        /**
+         * If true, and this thread's sleep returns without a wakeup
+         * (timed out or interrupted), waitq ignores the next wakeup.
+         * This is necessary for futex to be able to handle those conditions.
+         */
+        bool sleep_composable;
+
         /** Wait queue in which this thread sleeps. */
         waitq_t *sleep_queue;

kernel/generic/include/synch/futex.h

@@ -53 +53 @@
 
 extern void futex_init(void);
-extern sys_errno_t sys_futex_sleep(uintptr_t);
+extern sys_errno_t sys_futex_sleep(uintptr_t, uintptr_t);
 extern sys_errno_t sys_futex_wakeup(uintptr_t);
 

kernel/generic/include/synch/waitq.h

@@ -62 +62 @@
         int missed_wakeups;
 
+        /** Number of wakeups that need to be ignored due to futex timeout. */
+        int ignore_wakeups;
+
         /** List of sleeping threads for which there was no missed_wakeup. */
         list_t sleepers;