Changeset 78acbc72 in mainline

Timestamp:

2023-02-07T18:43:26Z (15 months ago)

Author:

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

Branches:

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

Children:

ba25c4b

Parents:

0366d09d

Message:

Remove unused thread_interrupted(), make thread_interrupt() useful

Location:

kernel/generic

Files:

• include/proc/thread.h (modified) (1 diff)
• src/proc/task.c (modified) (1 diff)
• src/proc/thread.c (modified) (1 diff)

kernel/generic/include/proc/thread.h

@@ -221 +221 @@
 extern void thread_ready(thread_t *);
 extern void thread_exit(void) __attribute__((noreturn));
-extern void thread_interrupt(thread_t *);
-extern bool thread_interrupted(thread_t *);
+extern void thread_interrupt(thread_t *, bool);
 
 #ifndef thread_create_arch

kernel/generic/src/proc/task.c

@@ -536 +536 @@
 
         list_foreach(task->threads, th_link, thread_t, thread) {
-                bool sleeping = false;
-
-                irq_spinlock_lock(&thread->lock, false);
-
-                thread->interrupted = true;
-                if (thread->state == Sleeping)
-                        sleeping = true;
-
-                irq_spinlock_unlock(&thread->lock, false);
-
-                if (sleeping)
-                        waitq_interrupt_sleep(thread);
+                thread_interrupt(thread, false);
         }
 

kernel/generic/src/proc/thread.c

@@ -530 +530 @@
  *               will remain valid until thread_interrupt() exits.
  */
-void thread_interrupt(thread_t *thread)
+void thread_interrupt(thread_t *thread, bool irq_dis)
 {
         assert(thread != NULL);
 
-        irq_spinlock_lock(&thread->lock, true);
+        irq_spinlock_lock(&thread->lock, irq_dis);
 
         thread->interrupted = true;
         bool sleeping = (thread->state == Sleeping);
 
-        irq_spinlock_unlock(&thread->lock, true);
+        irq_spinlock_unlock(&thread->lock, irq_dis);
 
         if (sleeping)
                 waitq_interrupt_sleep(thread);
-}
-
-/** Returns true if the thread was interrupted.
- *
- * @param thread A valid thread object. User must guarantee it will
- *               be alive during the entire call.
- * @return true if the thread was already interrupted via thread_interrupt().
- */
-bool thread_interrupted(thread_t *thread)
-{
-        assert(thread != NULL);
-
-        bool interrupted;
-
-        irq_spinlock_lock(&thread->lock, true);
-        interrupted = thread->interrupted;
-        irq_spinlock_unlock(&thread->lock, true);
-
-        return interrupted;
 }