Changeset b79207d in mainline for kernel/generic/src/main/shutdown.c

Timestamp:

2019-07-18T17:19:02Z (6 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

File:

• kernel/generic/src/main/shutdown.c (modified) (3 diffs)

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) {