Changeset 83789ea2 in mainline for kernel/generic/src/proc/thread.c

Timestamp:

2023-02-09T16:12:24Z (2 years ago)

Author:

Jiří Zárevúcky <zarevucky.jiri@…>

Branches:

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

Children:

c0b54c9

Parents:

ba25c4b

git-author:

Jiří Zárevúcky <zarevucky.jiri@…> (2022-08-16 17:52:15)

git-committer:

Jiří Zárevúcky <zarevucky.jiri@…> (2023-02-09 16:12:24)

Message:

Simplify timeout handling

Since timeout_unregister() now waits for the handler to complete,
we can get rid of some of the bookkeeping in waitq and thread code.
We can also turn timeout_t into a local variable instead of
keeping it around in thread_t.

File:

• kernel/generic/src/proc/thread.c (modified) (2 diffs)

kernel/generic/src/proc/thread.c

@@ -360 +360 @@
         thread->state = Entering;
 
-        timeout_initialize(&thread->sleep_timeout);
         thread->sleep_interruptible = false;
         thread->sleep_composable = false;
         thread->sleep_queue = NULL;
-        thread->timeout_pending = false;
 
         thread->in_copy_from_uspace = false;
@@ -500 +498 @@
         }
 
-restart:
         irq_spinlock_lock(&THREAD->lock, true);
-        if (THREAD->timeout_pending) {
-                /* Busy waiting for timeouts in progress */
-                irq_spinlock_unlock(&THREAD->lock, true);
-                goto restart;
-        }
-
         THREAD->state = Exiting;
         irq_spinlock_unlock(&THREAD->lock, true);