Refactor priority options. Fix incorrect priority setting.

Author: Mysticial

SerialPrograms/Source/CommonFramework/Environment/Environment_Windows.tpp

@@ -67,7 +67,7 @@ bool set_thread_priority(Logger& logger, ThreadPriority priority){
     default:
         throw InternalProgramError(nullptr, PA_CURRENT_FUNCTION, "Invalid Priority: " + std::to_string((int)priority));
     }
-    if (SetPriorityClass(GetCurrentProcess(), native_priority)){
+    if (SetPriorityClass(GetCurrentThread(), native_priority)){
 //        cout << "Thread priority set to: " + PRIORITY_DATABASE().find(priority)->display << endl;
         logger.log("Thread priority set to: " + PRIORITY_DATABASE().find(priority)->display, COLOR_BLUE);
         return true;

SerialPrograms/Source/CommonFramework/Options/Environment/PerformanceOptions.h

@@ -24,76 +24,73 @@ class PerformanceOptions : public GroupOption{
             LockMode::LOCK_WHILE_RUNNING,
             GroupOption::EnableMode::ALWAYS_ENABLED, true
         )
-        , PRECISE_WAKE_MARGIN(
-            "<b>Precise Wake Time Margin:</b><br>"
-            "Some operations require a thread to wake up at a very precise time - "
-            "more precise than what the operating system's scheduler can provide. "
-            "This option will force such operations to wake up this many "
-            "microseconds earlier, then busy wait until the time is reached. "
-            "The sys-botbase controller is an example of something that requires "
-            "extremely precise wake times.",
-            LockMode::UNLOCK_WHILE_RUNNING,
-            "2000 us"
-        )
         , REALTIME_THREAD_PRIORITY(
             "<b>Realtime Thread Priority:</b><br>"
             "Thread priority of real-time threads. (UI thread, audio threads)<br>"
             "Restart the program for this to fully take effect.",
             DEFAULT_PRIORITY_REALTIME
         )
-        , REALTIME_INFERENCE_PRIORITY(
-            "<b>Inference Priority:</b><br>"
-            "Thread priority of realtime inference threads that must run fast "
-            "enough to keep a program working properly.",
+        , INFERENCE_PIVOT_PRIORITY(
+            "<b>Inference Pivot Priority:</b><br>"
+            "Thread priority of inference dispatcher threads.",
             DEFAULT_PRIORITY_REALTIME_INFERENCE
         )
-        , NORMAL_INFERENCE_PRIORITY(
-            "<b>Normal Inference Priority:</b><br>"
-            "Thread priority of non-realtime inference threads that can be slow "
-            "without negatively affecting a program.",
-            DEFAULT_PRIORITY_NORMAL_INFERENCE
-        )
         , COMPUTE_PRIORITY(
             "<b>Compute Priority:</b><br>"
             "Thread priority of computation threads.",
             DEFAULT_PRIORITY_COMPUTE
         )
-        , THREAD_POOL_REALTIME_INFERENCE(
-            "Thread Pool: Real-time Inference",
+        , REALTIME_THREAD_POOL(
+            "Real-time Thread Pool",
+            "Thread pool for tasks that must run fast enough to keep a "
+            "program running properly.<br>"
+            "Restart program for changes to take full effect.",
             DEFAULT_PRIORITY_REALTIME_INFERENCE,
             0.5
         )
-        , THREAD_POOL_NORMAL_INFERENCE(
-            "Thread Pool: Normal Inference",
+        , NORMAL_THREAD_POOL(
+            "Normal Thread Pool",
+            "Thread pool for tasks that can be slow without negatively "
+            "affecting a program.<br>"
+            "Restart program for changes to take full effect.",
             DEFAULT_PRIORITY_NORMAL_INFERENCE,
             1.0
         )
+        , PRECISE_WAKE_MARGIN(
+            "<b>Precise Wake Time Margin:</b><br>"
+            "Some operations require a thread to wake up at a very precise time - "
+            "more precise than what the operating system's scheduler can provide. "
+            "This option will force such operations to wake up this many "
+            "microseconds earlier, then busy wait until the time is reached. "
+            "The sys-botbase controller is an example of something that requires "
+            "extremely precise wake times.",
+            LockMode::UNLOCK_WHILE_RUNNING,
+            "2000 us"
+        )
     {
-        PA_ADD_OPTION(PRECISE_WAKE_MARGIN);
+        PA_ADD_OPTION(PROCESSOR_LEVEL);
 
         PA_ADD_OPTION(REALTIME_THREAD_PRIORITY);
-        PA_ADD_OPTION(REALTIME_INFERENCE_PRIORITY);
-        PA_ADD_OPTION(NORMAL_INFERENCE_PRIORITY);
+        PA_ADD_OPTION(INFERENCE_PIVOT_PRIORITY);
         PA_ADD_OPTION(COMPUTE_PRIORITY);
 
-        PA_ADD_OPTION(THREAD_POOL_REALTIME_INFERENCE);
-        PA_ADD_OPTION(THREAD_POOL_NORMAL_INFERENCE);
+        PA_ADD_OPTION(REALTIME_THREAD_POOL);
+        PA_ADD_OPTION(NORMAL_THREAD_POOL);
 
-        PA_ADD_OPTION(PROCESSOR_LEVEL);
+        PA_ADD_OPTION(PRECISE_WAKE_MARGIN);
     }
 
 public:
-    MicrosecondsOption PRECISE_WAKE_MARGIN;
+    ProcessorLevelOption PROCESSOR_LEVEL;
 
     ThreadPriorityOption REALTIME_THREAD_PRIORITY;
-    ThreadPriorityOption REALTIME_INFERENCE_PRIORITY;
-    ThreadPriorityOption NORMAL_INFERENCE_PRIORITY;
+    ThreadPriorityOption INFERENCE_PIVOT_PRIORITY;
     ThreadPriorityOption COMPUTE_PRIORITY;
 
-    ThreadPoolOption THREAD_POOL_REALTIME_INFERENCE;
-    ThreadPoolOption THREAD_POOL_NORMAL_INFERENCE;
+    ThreadPoolOption REALTIME_THREAD_POOL;
+    ThreadPoolOption NORMAL_THREAD_POOL;
 
-    ProcessorLevelOption PROCESSOR_LEVEL;
+    MicrosecondsOption PRECISE_WAKE_MARGIN;
 };
 
 

SerialPrograms/Source/CommonFramework/Options/ThreadPoolOption.cpp

@@ -12,6 +12,7 @@ namespace PokemonAutomation{
 
 ThreadPoolOption::ThreadPoolOption(
     std::string label,
+    std::string description,
     ThreadPriority default_priority,
     double default_max_thread_ratio
 )
@@ -32,7 +33,7 @@ ThreadPoolOption::ThreadPoolOption(
         LockMode::UNLOCK_WHILE_RUNNING,
         std::thread::hardware_concurrency()
     )
-    , m_description("Restart program for changes to take full effect.")
+    , m_description(std::move(description))
     , PRIORITY("<b>Thread Priority:</b>", default_priority)
     , MAX_THREADS(
         "<b>Maximum Threads:</b>",

SerialPrograms/Source/CommonFramework/Options/ThreadPoolOption.h

@@ -19,6 +19,7 @@ class ThreadPoolOption : public GroupOption{
 public:
     ThreadPoolOption(
         std::string label,
+        std::string description,
         ThreadPriority default_priority,
         double default_max_thread_ratio = 1.0
     );

SerialPrograms/Source/CommonFramework/Tools/GlobalThreadPools.cpp

@@ -17,18 +17,18 @@ namespace GlobalThreadPools{
 ComputationThreadPool& realtime_inference(){
     static ComputationThreadPool runner(
         [](){
-            GlobalSettings::instance().PERFORMANCE->THREAD_POOL_REALTIME_INFERENCE.PRIORITY.set_on_this_thread(global_logger_tagged());
+            GlobalSettings::instance().PERFORMANCE->REALTIME_THREAD_POOL.PRIORITY.set_on_this_thread(global_logger_tagged());
         },
-        0, GlobalSettings::instance().PERFORMANCE->THREAD_POOL_REALTIME_INFERENCE.MAX_THREADS
+        0, GlobalSettings::instance().PERFORMANCE->REALTIME_THREAD_POOL.MAX_THREADS
     );
     return runner;
 }
 ComputationThreadPool& normal_inference(){
     static ComputationThreadPool runner(
         [](){
-            GlobalSettings::instance().PERFORMANCE->THREAD_POOL_NORMAL_INFERENCE.PRIORITY.set_on_this_thread(global_logger_tagged());
+            GlobalSettings::instance().PERFORMANCE->NORMAL_THREAD_POOL.PRIORITY.set_on_this_thread(global_logger_tagged());
         },
-        0, GlobalSettings::instance().PERFORMANCE->THREAD_POOL_NORMAL_INFERENCE.MAX_THREADS
+        0, GlobalSettings::instance().PERFORMANCE->NORMAL_THREAD_POOL.MAX_THREADS
     );
     return runner;
 }

SerialPrograms/Source/CommonFramework/Tools/ProgramEnvironment.cpp

@@ -35,7 +35,7 @@ struct ProgramEnvironmentData{
         )
         , m_realtime_inference_dispatcher(
             [](){
-                GlobalSettings::instance().PERFORMANCE->REALTIME_INFERENCE_PRIORITY.set_on_this_thread(global_logger_tagged());
+                GlobalSettings::instance().PERFORMANCE->INFERENCE_PIVOT_PRIORITY.set_on_this_thread(global_logger_tagged());
             },
             0
         )