From: Kevin Day <Kevin@kevux.org>
Date: Sat, 13 Jul 2024 04:57:20 +0000 (-0500)
Subject: Update: Add additional protection around assignment of global.thread.enabled during... 
X-Git-Tag: 0.6.11~18
X-Git-Url: https://git.kevux.org/?a=commitdiff_plain;h=7b4f55c96a9fe61104d76ce8ad4670c7c708207b;p=fll

Update: Add additional protection around assignment of global.thread.enabled during Controller exit process.

Spend some time trying to ensure that the mutex lock can be achieved and then change the enabled state to disabled.
Add a maximum retry as a fail safe but otherwise keep retrying unless certain error conditions are encountered.
---

diff --git a/level_3/controller/c/common/private-lock.h b/level_3/controller/c/common/private-lock.h
index 965e3ec41..4ddaedc21 100644
--- a/level_3/controller/c/common/private-lock.h
+++ b/level_3/controller/c/common/private-lock.h
@@ -12,6 +12,16 @@
 extern "C" {
 #endif
 
+/**
+ * Controller lock defines.
+ *
+ * controller_lock_*_d:
+ *   - mutex_max_retry: The maximum amount of times to retry the mutex lock before giving up.
+ */
+#ifndef _di_controller_lock_d_
+  #define controller_lock_mutex_max_retry_d 1000000
+#endif // _di_controller_lock_d_
+
 /**
  * A structure for sharing mutexes globally between different threads.
  *
diff --git a/level_3/controller/c/thread/private-thread_process.c b/level_3/controller/c/thread/private-thread_process.c
index 5e5c87b19..51954ab44 100644
--- a/level_3/controller/c/thread/private-thread_process.c
+++ b/level_3/controller/c/thread/private-thread_process.c
@@ -61,7 +61,6 @@ extern "C" {
     controller_entry_t *entry = 0;
     controller_process_t *process = 0;
 
-    f_status_t status = F_none;
     f_array_length_t i = 0;
     f_array_length_t j = 0;
     pid_t pid = 0;
@@ -99,13 +98,16 @@ extern "C" {
       } // for
     }
 
-    // Use the alert lock to toggle enabled (using it as if it is a write like and a signal lock).
-    status = f_thread_mutex_lock(&global->thread->lock.alert);
+    f_status_t status = F_none;
 
-    if (F_status_is_error(status)) {
-      global->thread->enabled = controller_thread_enabled_not_e;
-    }
-    else {
+    for (f_array_length_t i = 0; i < controller_lock_mutex_max_retry_d; ++i) {
+
+      status = f_thread_mutex_lock(&global->thread->lock.alert);
+
+      if (F_status_is_error_not(status) || F_status_set_fine(status) == F_parameter || F_status_set_fine(status) == F_deadlock) break;
+    } // for
+
+    if (F_status_is_error_not(status) && F_status_set_fine(status) != F_parameter && F_status_set_fine(status) != F_deadlock) {
       if (by == controller_thread_cancel_execute_e) {
         global->thread->enabled = controller_thread_enabled_execute_e;
       }