Move instruction scheduling from PABotBase to CC. Add millisecond timing APIs.

Author: Mysticial

ClientSource/Connection/MessageLogger.cpp

@@ -31,11 +31,12 @@ void MessageLogger::on_send(const BotBaseMessage& message, bool is_retransmit){
         if (message.type == PABB_MSG_REQUEST_CLOCK){
             print = false;
         }
-#if 0
+#if 1
         if (message.type == PABB_MSG_CONTROLLER_STATE){
-            pabb_controller_state body;
-            memcpy(&body, message.body.c_str(), sizeof(pabb_controller_state));
-            print = body.ticks >= 5;
+//            pabb_controller_state body;
+//            memcpy(&body, message.body.c_str(), sizeof(pabb_controller_state));
+//            print = body.ticks >= 5;
+            print = false;
         }
 #endif
 

SerialPrograms/CMakeLists.txt

@@ -611,6 +611,8 @@ file(GLOB MAIN_SOURCES
     Source/Controllers/ControllerSelectorWidget.h
     Source/Controllers/NullController.cpp
     Source/Controllers/NullController.h
+    Source/Controllers/SuperscalarScheduler.cpp
+    Source/Controllers/SuperscalarScheduler.h
     Source/Controllers/SerialPABotBase/SerialPABotBase.cpp
     Source/Controllers/SerialPABotBase/SerialPABotBase.h
     Source/Controllers/SerialPABotBase/SerialPABotBase_Handle.cpp
@@ -847,7 +849,6 @@ file(GLOB MAIN_SOURCES
     Source/NintendoSwitch/Inference/NintendoSwitch_DetectHome.h
     Source/NintendoSwitch/NintendoSwitch_ConsoleHandle.cpp
     Source/NintendoSwitch/NintendoSwitch_ConsoleHandle.h
-    Source/NintendoSwitch/NintendoSwitch_FixedInterval.h
     Source/NintendoSwitch/NintendoSwitch_MultiSwitchProgram.cpp
     Source/NintendoSwitch/NintendoSwitch_MultiSwitchProgram.h
     Source/NintendoSwitch/NintendoSwitch_Panels.cpp

SerialPrograms/SerialPrograms.pro

@@ -312,6 +312,7 @@ SOURCES += \
     Source/Controllers/NullController.cpp \
     Source/Controllers/SerialPABotBase/SerialPABotBase.cpp \
     Source/Controllers/SerialPABotBase/SerialPABotBase_Handle.cpp \
+    Source/Controllers/SuperscalarScheduler.cpp \
     Source/Integrations/DiscordIntegrationSettings.cpp \
     Source/Integrations/DiscordIntegrationTable.cpp \
     Source/Integrations/DiscordSettingsOption.cpp \
@@ -1428,6 +1429,7 @@ HEADERS += \
     Source/Controllers/NullController.h \
     Source/Controllers/SerialPABotBase/SerialPABotBase.h \
     Source/Controllers/SerialPABotBase/SerialPABotBase_Handle.h \
+    Source/Controllers/SuperscalarScheduler.h \
     Source/Integrations/DiscordIntegrationSettings.h \
     Source/Integrations/DiscordIntegrationTable.h \
     Source/Integrations/DiscordSettingsOption.h \
@@ -1533,7 +1535,6 @@ HEADERS += \
     Source/NintendoSwitch/DevPrograms/TestProgramComputer.h \
     Source/NintendoSwitch/DevPrograms/TestProgramSwitch.h \
     Source/NintendoSwitch/NintendoSwitch_ConsoleHandle.h \
-    Source/NintendoSwitch/NintendoSwitch_FixedInterval.h \
     Source/NintendoSwitch/Framework/NintendoSwitch_MultiSwitchProgramOption.h \
     Source/NintendoSwitch/Framework/NintendoSwitch_MultiSwitchProgramSession.h \
     Source/NintendoSwitch/Framework/NintendoSwitch_MultiSwitchSystemOption.h \

SerialPrograms/Source/CommonFramework/Globals.cpp

@@ -24,8 +24,8 @@ namespace PokemonAutomation{
 
 const bool IS_BETA_VERSION = true;
 const int PROGRAM_VERSION_MAJOR = 0;
-const int PROGRAM_VERSION_MINOR = 50;
-const int PROGRAM_VERSION_PATCH = 19;
+const int PROGRAM_VERSION_MINOR = 51;
+const int PROGRAM_VERSION_PATCH = 1;
 
 const std::string PROGRAM_VERSION_BASE =
     "v" + std::to_string(PROGRAM_VERSION_MAJOR) +

SerialPrograms/Source/CommonFramework/Recording/StreamRecorder.cpp

@@ -18,7 +18,7 @@
 #include <QMediaRecorder>
 #include "Common/Cpp/PrettyPrint.h"
 #include "Common/Cpp/Concurrency/SpinPause.h"
-#include "Common/Qt/Redispatch.h"
+//#include "Common/Qt/Redispatch.h"
 #include "CommonFramework/GlobalSettingsPanel.h"
 #include "CommonFramework/VideoPipeline/Backends/VideoFrameQt.h"
 #include "CommonFramework/Recording/StreamHistoryOption.h"

SerialPrograms/Source/CommonTools/Async/InterruptableCommands.tpp

@@ -127,13 +127,15 @@ void AsyncCommandSession<ControllerType>::dispatch(std::function<void(Controller
 
 template <typename ControllerType>
 bool AsyncCommandSession<ControllerType>::cancel(std::exception_ptr exception) noexcept{
+//    cout << "AsyncCommandSession::cancel()" << endl;
     if (Cancellable::cancel(exception)){
         return true;
     }
     std::lock_guard<std::mutex> lg(m_lock);
     if (m_current != nullptr){
         m_current->context.cancel(std::move(exception));
     }else{
+//        cout << "AsyncCommandSession::cancel() - already cancelled" << endl;
         //  REMOVE: Check that this can actually be deleted.
 //        try{
 //            m_controller.stop_all_commands();

SerialPrograms/Source/Controllers/ControllerSession.h

@@ -38,6 +38,9 @@ class ControllerSession{
         const ControllerRequirements& requirements
     );
 
+    Logger& logger(){
+        return m_logger;
+    }
     const ControllerRequirements& requirements(){
         return m_requirements;
     }
@@ -75,21 +78,22 @@ class ControllerSession{
     //  Try to run the following lambda on the underlying controller type.
     //  Returns true if successful.
     template <typename ControllerType, typename Lambda>
-    bool try_run(Lambda&& function){
+    bool try_run(Lambda&& function) noexcept{
         std::lock_guard<std::mutex> lg(m_state_lock);
         if (!m_connection){
             return false;
         }
-
-        //  This will be a cross-cast in most cases.
-        ControllerType* child = dynamic_cast<ControllerType*>(m_connection.get());
-        if (child == nullptr){
-            throw InternalProgramError(
-                &m_logger, PA_CURRENT_FUNCTION,
-                "Incompatible controller type cast."
-            );
+        try{
+            //  This will be a cross-cast in most cases.
+            ControllerType* child = dynamic_cast<ControllerType*>(m_connection.get());
+            if (child == nullptr){
+                m_logger.log("ControllerSession::try_run(): Incompatible controller type cast.", COLOR_RED);
+                return false;
+            }
+            function(*child);
+        }catch (...){
+            return false;
         }
-        function(*child);
         return true;
     }
 

SerialPrograms/Source/Controllers/SerialPABotBase/SerialPABotBase.cpp

@@ -20,6 +20,7 @@ const char* to_string(Features feature){
     switch (feature){
     case Features::TickPrecise:             return "TickPrecise";
     case Features::NintendoSwitch_Basic:    return "NintendoSwitch_Basic";
+    case Features::NintendoSwitch_SSF:      return "NintendoSwitch_SSF";
     case Features::NintendoSwitch_Macros:   return "NintendoSwitch_Macros";
     case Features::NintendoSwitch_DateSkip: return "NintendoSwitch_DateSkip";
     }
@@ -33,7 +34,8 @@ const std::pair<std::string, std::set<std::string>> OLD_NINTENDO_SWITCH_DEFAULT_
     {
         to_string(SerialPABotBase::Features::TickPrecise),
         to_string(SerialPABotBase::Features::NintendoSwitch_Basic),
-        to_string(SerialPABotBase::Features::NintendoSwitch_Macros),
+//        to_string(SerialPABotBase::Features::NintendoSwitch_SSF),
+//        to_string(SerialPABotBase::Features::NintendoSwitch_Macros),
         to_string(SerialPABotBase::Features::NintendoSwitch_DateSkip),
     }
 };
@@ -46,13 +48,15 @@ std::set<std::string> program_id_to_features(uint8_t id){
         return {
             to_string(Features::TickPrecise),
             to_string(Features::NintendoSwitch_Basic),
+            to_string(Features::NintendoSwitch_SSF),
             to_string(Features::NintendoSwitch_Macros),
 //            to_string(Features::NintendoSwitch_DateSkip),
         };
     case PABB_PID_PABOTBASE_31KB:
         return {
             to_string(Features::TickPrecise),
             to_string(Features::NintendoSwitch_Basic),
+            to_string(Features::NintendoSwitch_SSF),
             to_string(Features::NintendoSwitch_Macros),
             to_string(Features::NintendoSwitch_DateSkip),
         };

SerialPrograms/Source/Controllers/SerialPABotBase/SerialPABotBase.h

@@ -23,6 +23,7 @@ extern const char NintendoSwitch_Basic[];
 enum class Features{
     TickPrecise,
     NintendoSwitch_Basic,
+    NintendoSwitch_SSF,
     NintendoSwitch_Macros,
     NintendoSwitch_DateSkip,
 };

SerialPrograms/Source/Controllers/SerialPABotBase/SerialPABotBase_Handle.cpp

@@ -393,7 +393,6 @@ void BotBaseHandle::thread_body(){
         }
     });
 
-    //  REMOVE
     BotBaseControllerContext context(*m_botbase);
 
     while (true){