FIX: Not being able to add timeouts while processing a timeout (#714, #816).

Author: Rene Damm

Assets/Tests/InputSystem/CoreTests_State.cs

@@ -863,6 +863,38 @@ public void State_StateChangeMonitorTimeout_CanBeAddedFromMonitorCallback()
         Assert.That(timeoutFired);
     }
 
+    [Test]
+    [Category("State")]
+    public void State_StateChangeMonitorTimeout_CanBeAddedFromTimeoutCallback()
+    {
+        var gamepad = InputSystem.AddDevice<Gamepad>();
+
+        var timeoutCount = 0;
+
+        IInputStateChangeMonitor monitor = null;
+        monitor = InputState.AddChangeMonitor(gamepad.buttonSouth,
+            (control, time, eventPtr, monitorIndex) => {},
+            timerExpiredCallback: (control, time, monitorIndex, timerIndex) =>
+            {
+                ++timeoutCount;
+                InputState.AddChangeMonitorTimeout(control, monitor, time + 1.5);
+            });
+
+        InputState.AddChangeMonitorTimeout(gamepad.buttonSouth, monitor, 1.5);
+
+        // Trigger first timeout.
+        runtime.currentTime += 2;
+        InputSystem.Update();
+
+        Assert.That(timeoutCount, Is.EqualTo(1));
+
+        // Trigger second timeout.
+        runtime.currentTime += 2;
+        InputSystem.Update();
+
+        Assert.That(timeoutCount, Is.EqualTo(2));
+    }
+
     [Test]
     [Category("State")]
     public void State_StateChangeMonitor_CanBeAddedFromMonitorCallback()
@@ -914,6 +946,25 @@ public void State_StateChangeMonitor_CanBeRemovedFromMonitorCallback()
         LogAssert.NoUnexpectedReceived();
     }
 
+    [Test]
+    [Category("State")]
+    public void State_RemovingMonitorRemovesTimeouts()
+    {
+        var gamepad = InputSystem.AddDevice<Gamepad>();
+
+        var monitor = InputState.AddChangeMonitor(gamepad.buttonWest,
+            (c, d, e, m) => {},
+            timerExpiredCallback: (control, time, monitorIndex, timerIndex) =>
+            {
+                Assert.Fail("Should not reach here");
+            });
+        InputState.AddChangeMonitorTimeout(gamepad.buttonWest, monitor, 2);
+        InputState.RemoveChangeMonitor(gamepad.buttonWest, monitor);
+
+        runtime.currentTime = 4;
+        InputSystem.Update();
+    }
+
     [Test]
     [Category("State")]
     public void State_CanThrowExceptionFromStateChangeMonitorCallback()

Packages/com.unity.inputsystem/CHANGELOG.md

@@ -10,7 +10,12 @@ however, it has to be formatted properly to pass verification tests.
 ## [0.9.6-preview] - 2099-1-1
 
 ### Fixed
+
 #### Actions
+
+- Setting timeouts from `IInputInteraction.Process` not working as expected when processing happened in response to previous timeout expiring (#714).
+- Pending timeouts on a device not being removed when device was removed.
+
 ### Changed
 ### Added
 

Packages/com.unity.inputsystem/InputSystem/InputManager.cs

@@ -1326,6 +1326,11 @@ private void RemoveStateChangeMonitors(InputDevice device)
                 return;
 
             m_StateChangeMonitors[deviceIndex].Clear();
+
+            // Clear timeouts pending on any control on the device.
+            for (var i = 0; i < m_StateChangeMonitorTimeouts.length; ++i)
+                if (m_StateChangeMonitorTimeouts[i].control?.device == device)
+                    m_StateChangeMonitorTimeouts[i] = default;
         }
 
         public void RemoveStateChangeMonitor(InputControl control, IInputStateChangeMonitor monitor, long monitorIndex)
@@ -1345,6 +1350,12 @@ public void RemoveStateChangeMonitor(InputControl control, IInputStateChangeMoni
                 return;
 
             m_StateChangeMonitors[deviceIndex].Remove(monitor, monitorIndex);
+
+            // Remove pending timeouts on the monitor.
+            for (var i = 0; i < m_StateChangeMonitorTimeouts.length; ++i)
+                if (m_StateChangeMonitorTimeouts[i].monitor == monitor &&
+                    m_StateChangeMonitorTimeouts[i].monitorIndex == monitorIndex)
+                    m_StateChangeMonitorTimeouts[i] = default;
         }
 
         public void AddStateChangeMonitorTimeout(InputControl control, IInputStateChangeMonitor monitor, double time, long monitorIndex, int timerIndex)
@@ -1370,8 +1381,7 @@ public void RemoveStateChangeMonitorTimeout(IInputStateChangeMonitor monitor, lo
                     && m_StateChangeMonitorTimeouts[i].monitorIndex == monitorIndex
                     && m_StateChangeMonitorTimeouts[i].timerIndex == timerIndex)
                 {
-                    ////TODO: leave state empty and compact array lazily on traversal
-                    m_StateChangeMonitorTimeouts.RemoveAt(i);
+                    m_StateChangeMonitorTimeouts[i] = default;
                     break;
                 }
             }
@@ -2684,16 +2694,15 @@ private unsafe void FireStateChangeNotifications(int deviceIndex, double interna
 
         private void ProcessStateChangeMonitorTimeouts()
         {
-            var timeoutCount = m_StateChangeMonitorTimeouts.length;
-            if (timeoutCount == 0)
+            if (m_StateChangeMonitorTimeouts.length == 0)
                 return;
 
             // Go through the list and both trigger expired timers and remove any irrelevant
             // ones by compacting the array.
             // NOTE: We do not actually release any memory we may have allocated.
             var currentTime = m_Runtime.currentTime - InputRuntime.s_CurrentTimeOffsetToRealtimeSinceStartup;
             var remainingTimeoutCount = 0;
-            for (var i = 0; i < timeoutCount; ++i)
+            for (var i = 0; i < m_StateChangeMonitorTimeouts.length; ++i)
             {
                 // If we have reset this entry in RemoveStateChangeMonitorTimeouts(),
                 // skip over it and let compaction get rid of it.

Packages/com.unity.inputsystem/InputSystem/State/InputState.cs

@@ -140,7 +140,9 @@ public static void AddChangeMonitor(InputControl control, IInputStateChangeMonit
             InputSystem.s_Manager.AddStateChangeMonitor(control, monitor, monitorIndex);
         }
 
-        public static IInputStateChangeMonitor AddChangeMonitor(InputControl control, NotifyControlValueChangeAction valueChangeCallback, int monitorIndex = -1, NotifyTimerExpiredAction timerExpiredCallback = null)
+        public static IInputStateChangeMonitor AddChangeMonitor(InputControl control,
+            NotifyControlValueChangeAction valueChangeCallback, int monitorIndex = -1,
+            NotifyTimerExpiredAction timerExpiredCallback = null)
         {
             if (valueChangeCallback == null)
                 throw new ArgumentNullException(nameof(valueChangeCallback));