run/bool: Use bool for threading value

diff --git a/src/runmodes.c b/src/runmodes.c
index 348adfa25d43c968bff60aef56fc4d091e4c8f90..852155332d7535df0bdeaedf24c1570ae302ef53 100644 (file)
--- a/src/runmodes.c
+++ b/src/runmodes.c
@@ -72,7 +72,7 @@
 #include "suricata-plugin.h"
 
 int debuglog_enabled = 0;
-int threading_set_cpu_affinity = FALSE;
+bool threading_set_cpu_affinity = false;
 uint64_t threading_set_stack_size = 0;
 
 /* Runmode Global Thread Names */
@@ -982,12 +982,15 @@ float threading_detect_ratio = 1;
  */
 void RunModeInitializeThreadSettings(void)
 {
-    threading_set_cpu_affinity = FALSE;
-    if ((ConfGetBool("threading.set-cpu-affinity", &threading_set_cpu_affinity)) == 0) {
-        threading_set_cpu_affinity = FALSE;
+    int affinity = 0;
+    if ((ConfGetBool("threading.set-cpu-affinity", &affinity)) == 0) {
+        threading_set_cpu_affinity = false;
+    } else {
+        threading_set_cpu_affinity = affinity == 1;
     }
+
     /* try to get custom cpu mask value if needed */
-    if (threading_set_cpu_affinity == TRUE) {
+    if (threading_set_cpu_affinity) {
         AffinitySetupLoadFromConfig();
     }
     if ((ConfGetFloat("threading.detect-thread-ratio", &threading_detect_ratio)) != 1) {

diff --git a/src/runmodes.h b/src/runmodes.h
index 57b31b6d405493d5c2bb484ef31bb49d0966fc82..668896dc17c586fa143c8a92146c497341add4fc 100644 (file)
--- a/src/runmodes.h
+++ b/src/runmodes.h
@@ -100,7 +100,7 @@ bool IsRunModeSystem(enum RunModes run_mode_to_check);
 void RunModeEnablesBypassManager(void);
 int RunModeNeedsBypassManager(void);
 
-extern int threading_set_cpu_affinity;
+extern bool threading_set_cpu_affinity;
 extern float threading_detect_ratio;
 extern uint64_t threading_set_stack_size;