Automatically stall if not ready.

Author: Mysticial

SerialPrograms/Source/Controllers/SuperscalarScheduler.cpp

@@ -4,7 +4,7 @@
  *
  */
 
-#include "Common/Cpp/Exceptions.h"
+//#include "Common/Cpp/Exceptions.h"
 #include "Common/Cpp/Time.h"
 #include "SuperscalarScheduler.h"
 
@@ -211,21 +211,13 @@ void SuperscalarScheduler::issue_wait_for_resource(
 //         << ", sent_time = " << std::chrono::duration_cast<Milliseconds>((m_device_sent_time - m_local_start)).count()
 //         << ", free_time = " << std::chrono::duration_cast<Milliseconds>((resource.m_free_time - m_local_start)).count()
 //         << endl;
-    //  Resource is not ready yet. Stall until it is.
 
-#if 1
+    //  Resource is not ready yet. Stall until it is.
     auto iter = m_live_commands.find(resource_id);
-    if (iter != m_live_commands.end() && iter->second.free_time > m_device_sent_time){
+    if (iter != m_live_commands.end() && m_device_sent_time < iter->second.free_time){
         m_device_issue_time = iter->second.free_time;
         m_local_last_activity = current_time();
     }
-#else
-    if (resource.m_free_time > m_device_sent_time){
-//        cout << "stall = " << std::chrono::duration_cast<Milliseconds>(resource.m_free_time - m_device_sent_time).count() << endl;
-        m_device_issue_time = resource.m_free_time;
-        m_local_last_activity = current_time();
-    }
-#endif
 
     process_schedule(cancellable);
 }
@@ -238,14 +230,11 @@ void SuperscalarScheduler::issue_to_resource(
         clear();
     }
 
-    //  Resource is busy.
+    //  Resource is busy. Stall until it is free.
     auto ret = m_live_commands.try_emplace(resource->id);
-    if (!ret.second && m_device_sent_time < ret.first->second.free_time){
+    if (!ret.second){
 //        cout << m_device_sent_time << " : " << ret.first->second.free_time << endl;
-        throw InternalProgramError(
-            nullptr, PA_CURRENT_FUNCTION,
-            "Attempted to issue resource that isn't ready."
-        );
+        m_device_issue_time = std::max(m_device_issue_time, ret.first->second.free_time);
     }
     Command& command = ret.first->second;
 

SerialPrograms/Source/Controllers/SuperscalarScheduler.h

@@ -49,13 +49,6 @@ class SuperscalarScheduler{
         m_pending_clear.store(true, std::memory_order_release);
     }
 
-    WallClock busy_until(size_t resource_id) const{
-        auto iter = m_live_commands.find(resource_id);
-        return iter != m_live_commands.end()
-            ? iter->second.free_time
-            : WallClock::min();
-    }
-
 
 public:
     //  These are the standard "issue" commands.
@@ -64,6 +57,13 @@ class SuperscalarScheduler{
     //  These are not thread-safe with each other.
     //
 
+    WallClock busy_until(size_t resource_id) const{
+        auto iter = m_live_commands.find(resource_id);
+        return iter != m_live_commands.end()
+            ? iter->second.free_time
+            : WallClock::min();
+    }
+
     //  Wait until the pipeline has completely cleared and all resources have
     //  returned to the ready state.
     void issue_wait_for_all(const Cancellable* cancellable);
@@ -80,7 +80,6 @@ class SuperscalarScheduler{
     );
 
     //  Issue a resource with the specified timing parameters.
-    //  The resource must be ready to be used.
     void issue_to_resource(
         const Cancellable* cancellable,
         std::shared_ptr<const SchedulerResource> resource,
@@ -138,7 +137,7 @@ class SuperscalarScheduler{
     //  The current timestamp of what has been sent to the device.
     WallClock m_device_sent_time;
 
-    //  Maximum of: m_resources[]->m_free_time
+    //  Maximum of: m_live_commands[]->second.free_time
     WallClock m_max_free_time;
 
     //  A set of all the scheduled state changes that will happen. Between

SerialPrograms/Source/NintendoSwitch/Controllers/NintendoSwitch_ControllerWithScheduler.cpp

@@ -58,12 +58,6 @@ void ControllerWithScheduler::issue_buttons(
         cancellable->throw_if_cancelled();
     }
 
-    for (size_t c = 0; c < TOTAL_BUTTONS; c++){
-        ButtonFlagType mask = (ButtonFlagType)1 << c;
-        if (button & mask){
-            this->issue_wait_for_resource(cancellable, c);
-        }
-    }
     for (size_t c = 0; c < TOTAL_BUTTONS; c++){
         ButtonFlagType mask = (ButtonFlagType)1 << c;
         if (button & mask){
@@ -97,7 +91,6 @@ void ControllerWithScheduler::issue_dpad(
         cancellable->throw_if_cancelled();
     }
 
-    this->issue_wait_for_resource(cancellable, (size_t)SwitchResource::DPAD);
     this->issue_to_resource(
         cancellable,
         std::make_unique<SwitchCommand_Dpad>(position),
@@ -126,7 +119,6 @@ void ControllerWithScheduler::issue_left_joystick(
         cancellable->throw_if_cancelled();
     }
 
-    this->issue_wait_for_resource(cancellable, (size_t)SwitchResource::JOYSTICK_LEFT);
     this->issue_to_resource(
         cancellable,
         std::make_unique<SwitchCommand_LeftJoystick>(x, y),
@@ -154,7 +146,6 @@ void ControllerWithScheduler::issue_right_joystick(
         cancellable->throw_if_cancelled();
     }
 
-    this->issue_wait_for_resource(cancellable, (size_t)SwitchResource::JOYSTICK_RIGHT);
     this->issue_to_resource(
         cancellable,
         std::make_unique<SwitchCommand_RightJoystick>(x, y),
@@ -186,7 +177,6 @@ void ControllerWithScheduler::issue_gyro(
         cancellable->throw_if_cancelled();
     }
 
-    this->issue_wait_for_resource(cancellable, (size_t)id);
     this->issue_to_resource(
         cancellable,
         std::make_unique<SwitchCommand_Gyro>(id, value),
@@ -220,6 +210,7 @@ void ControllerWithScheduler::issue_full_controller_state(
         cancellable->throw_if_cancelled();
     }
 
+#if 0
     for (size_t c = 0; c < TOTAL_BUTTONS; c++){
         ButtonFlagType mask = (ButtonFlagType)1 << c;
         if (button & mask){
@@ -229,6 +220,9 @@ void ControllerWithScheduler::issue_full_controller_state(
     this->issue_wait_for_resource(cancellable, (size_t)SwitchResource::DPAD);
     this->issue_wait_for_resource(cancellable, (size_t)SwitchResource::JOYSTICK_LEFT);
     this->issue_wait_for_resource(cancellable, (size_t)SwitchResource::JOYSTICK_RIGHT);
+#else
+    this->issue_wait_for_all(cancellable);
+#endif
 
     for (size_t c = 0; c < TOTAL_BUTTONS; c++){
         ButtonFlagType mask = (ButtonFlagType)1 << c;

SerialPrograms/Source/NintendoSwitch/Controllers/SerialPABotBase/NintendoSwitch_SerialPABotBase_WiredController.cpp

@@ -209,6 +209,7 @@ void SerialPABotBase_WiredController::push_state(
 }
 
 
+#if 0
 //
 //  Given a regularly reported 32-bit counter that wraps around, infer its true
 //  64-bit value.
@@ -232,6 +233,7 @@ class ExtendedLengthCounter{
     uint32_t m_high_bits;
     uint32_t m_last_received;
 };
+#endif
 
 
 
@@ -270,7 +272,7 @@ void SerialPABotBase_WiredController::status_thread(){
     });
 
 
-    ExtendedLengthCounter clock_tracker;
+//    ExtendedLengthCounter clock_tracker;
 //    TickRateTracker tick_rate_tracker(m_use_milliseconds ? 1000 : TICKS_PER_SECOND);
     WallClock next_ping = current_time();
     while (true){