From: Kevin Day Date: Mon, 15 Dec 2025 00:47:04 +0000 (-0600) Subject: Update: Use the f_thread defines. X-Git-Tag: 0.7.4~8 X-Git-Url: https://www.git.kevux.org/?a=commitdiff_plain;h=2eafb6543f2e90837b3d37f7c2b81933b9fbde69;p=controller Update: Use the f_thread defines. Do not directly use the `PTHEAD_*` defines. Instead use the ones provided by `f_thread`. --- diff --git a/sources/c/program/controller/init/signal.c b/sources/c/program/controller/init/signal.c index b39f15e..77b5ec5 100644 --- a/sources/c/program/controller/init/signal.c +++ b/sources/c/program/controller/init/signal.c @@ -31,7 +31,7 @@ extern "C" { if (f_signal_wait_until(&main->program.signal.set, &time, &information) == F_time_out) continue; // Prevent thread from being interrupted and auto-cancelled. - f_thread_cancel_state_set(PTHREAD_CANCEL_DEFERRED, 0); + f_thread_cancel_state_set(f_thread_cancel_defer_d, 0); state = 0; diff --git a/sources/c/program/controller/main/thread/cleanup.c b/sources/c/program/controller/main/thread/cleanup.c index b076590..5394258 100644 --- a/sources/c/program/controller/main/thread/cleanup.c +++ b/sources/c/program/controller/main/thread/cleanup.c @@ -9,7 +9,7 @@ extern "C" { if (!argument) return 0; - f_thread_cancel_state_set(PTHREAD_CANCEL_DEFERRED, 0); + f_thread_cancel_state_set(f_thread_cancel_defer_d, 0); f_thread_name_set(f_thread_caller(), controller_thread_cleanup_s); controller_main_t * const main = (controller_main_t *) argument; @@ -39,7 +39,7 @@ extern "C" { status = controller_mutex_condition_or_sleep(&main->thread.lock.reap, &main->thread.lock.reap_condition, &delay); // Prevent thread from being interrupted and auto-cancelled. - f_thread_cancel_state_set(PTHREAD_CANCEL_DEFERRED, 0); + f_thread_cancel_state_set(f_thread_cancel_defer_d, 0); // Reaping child processes is not critical, so don't care if the reap flag cannot be unset. if (!controller_thread_signal_get(&main->thread) && F_status_is_error_not(status)) { diff --git a/sources/c/program/controller/main/thread/control.c b/sources/c/program/controller/main/thread/control.c index e8f39ee..93628b5 100644 --- a/sources/c/program/controller/main/thread/control.c +++ b/sources/c/program/controller/main/thread/control.c @@ -9,7 +9,7 @@ extern "C" { if (!argument) return 0; - f_thread_cancel_state_set(PTHREAD_CANCEL_DEFERRED, 0); + f_thread_cancel_state_set(f_thread_cancel_defer_d, 0); f_thread_name_set(f_thread_caller(), controller_thread_control_s); controller_main_t * const main = (controller_main_t *) argument; diff --git a/sources/c/program/controller/main/thread/entry.c b/sources/c/program/controller/main/thread/entry.c index 1525271..9e55d65 100644 --- a/sources/c/program/controller/main/thread/entry.c +++ b/sources/c/program/controller/main/thread/entry.c @@ -9,7 +9,7 @@ extern "C" { if (!argument) return 0; - f_thread_cancel_state_set(PTHREAD_CANCEL_DEFERRED, 0); + f_thread_cancel_state_set(f_thread_cancel_defer_d, 0); f_thread_name_set(f_thread_caller(), controller_thread_entry_s); controller_main_t * const main = (controller_main_t *) argument; @@ -117,7 +117,7 @@ extern "C" { if (!argument) return 0; - f_thread_cancel_state_set(PTHREAD_CANCEL_DEFERRED, 0); + f_thread_cancel_state_set(f_thread_cancel_defer_d, 0); controller_main_t * const main = (controller_main_t *) argument; f_status_t * const status = &main->thread.status; diff --git a/sources/c/program/controller/main/thread/instance.c b/sources/c/program/controller/main/thread/instance.c index fe6ba7b..dc1d250 100644 --- a/sources/c/program/controller/main/thread/instance.c +++ b/sources/c/program/controller/main/thread/instance.c @@ -491,7 +491,7 @@ extern "C" { if (!argument) return 0; - f_thread_cancel_state_set(PTHREAD_CANCEL_DEFERRED, 0); + f_thread_cancel_state_set(f_thread_cancel_defer_d, 0); f_thread_name_set(f_thread_caller(), controller_thread_instance_s); controller_thread_instance((controller_instance_t * const) argument, F_true); @@ -505,7 +505,7 @@ extern "C" { if (!argument) return 0; - f_thread_cancel_state_set(PTHREAD_CANCEL_DEFERRED, 0); + f_thread_cancel_state_set(f_thread_cancel_defer_d, 0); f_thread_name_set(f_thread_caller(), controller_thread_instance_s); controller_thread_instance((controller_instance_t * const) argument, F_false); diff --git a/sources/c/program/controller/main/thread/rule.c b/sources/c/program/controller/main/thread/rule.c index e64c2c7..a1d903f 100644 --- a/sources/c/program/controller/main/thread/rule.c +++ b/sources/c/program/controller/main/thread/rule.c @@ -9,7 +9,7 @@ extern "C" { if (!argument) return 0; - f_thread_cancel_state_set(PTHREAD_CANCEL_DEFERRED, 0); + f_thread_cancel_state_set(f_thread_cancel_defer_d, 0); f_thread_name_set(f_thread_caller(), controller_thread_rule_s); controller_main_t * const main = (controller_main_t *) argument; diff --git a/sources/c/program/controller/main/thread/signal.c b/sources/c/program/controller/main/thread/signal.c index b6bedfe..1d9772b 100644 --- a/sources/c/program/controller/main/thread/signal.c +++ b/sources/c/program/controller/main/thread/signal.c @@ -31,7 +31,7 @@ extern "C" { if (f_signal_wait_until(&main->program.signal.set, &time, &information) == F_time_out) continue; // Prevent thread from being interrupted and auto-cancelled. - f_thread_cancel_state_set(PTHREAD_CANCEL_DEFERRED, 0); + f_thread_cancel_state_set(f_thread_cancel_defer_d, 0); state = 0; @@ -197,7 +197,7 @@ extern "C" { #ifndef _di_controller_thread_signal_normal_ void * controller_thread_signal_normal(void * const argument) { - f_thread_cancel_state_set(PTHREAD_CANCEL_DEFERRED, 0); + f_thread_cancel_state_set(f_thread_cancel_defer_d, 0); f_thread_name_set(f_thread_caller(), controller_thread_signal_s); if (argument) { @@ -215,7 +215,7 @@ extern "C" { #ifndef _di_controller_thread_signal_other_ void * controller_thread_signal_other(void * const argument) { - f_thread_cancel_state_set(PTHREAD_CANCEL_DEFERRED, 0); + f_thread_cancel_state_set(f_thread_cancel_defer_d, 0); f_thread_name_set(f_thread_caller(), controller_thread_signal_s); if (argument) {