Changeset b79207d in mainline

Timestamp:

2019-07-18T17:19:02Z (5 years ago)

Author:

Matthieu Riolo <matthieu.riolo@…>

Parents:

bb580548

Message:

Create abort_shutdown function

The piece of code which destroyed the thread used
by shutdown has been refractoried to it's own function.
This method will be called in the kernel console to ensure
that there is no weird threading behaviour

Location:

kernel/generic

Files:

• include/shutdown.h (modified) (1 diff)
• src/console/cmd.c (modified) (2 diffs)
• src/main/shutdown.c (modified) (3 diffs)

kernel/generic/include/shutdown.h

@@ -47 +47 @@
 extern void reboot(void);
 extern void arch_reboot(void);
+extern void abort_shutdown(void);
 extern sys_errno_t sys_shutdown(sysarg_t mode, sysarg_t delay, sysarg_t kconsole);
 

kernel/generic/src/console/cmd.c

@@ -880 +880 @@
 int cmd_reboot(cmd_arg_t *argv)
 {
+        abort_shutdown();
         reboot();
 
@@ -1125 +1126 @@
 int cmd_halt(cmd_arg_t *argv)
 {
+        abort_shutdown();
         halt();
         return 1;

kernel/generic/src/main/shutdown.c

@@ -98 +98 @@
 }
 
+void abort_shutdown()
+{
+        irq_spinlock_lock(&threads_lock, true);
+        thread_t *thread = atomic_load(&shutdown_thread);
+        if (thread != NULL) {
+                thread_interrupt(thread);
+                atomic_store(&shutdown_thread, NULL);
+        }
+        irq_spinlock_unlock(&threads_lock, true);
+}
+
 /* argument structure for the shutdown thread */
 typedef struct {
@@ -135 +146 @@
 #endif
 
-        irq_spinlock_lock(&threads_lock, true);
-        thread_t *thread = atomic_load(&shutdown_thread);
-        if (thread != NULL) {
-                thread_interrupt(thread);
-                atomic_store(&shutdown_thread, NULL);
-        }
-        irq_spinlock_unlock(&threads_lock, true);
+        abort_shutdown();
 
         /* `cancel` or default has been called */
@@ -165 +170 @@
         arg->delay = delay;
 
-        thread = thread_create(sys_shutdown_function, arg, kernel_task, THREAD_FLAG_NONE, "shutdown");
+        thread_t *thread = thread_create(sys_shutdown_function, arg, kernel_task, THREAD_FLAG_NONE, "shutdown");
 
         if (thread == NULL) {