Async: Fix expired timers invocation when they're being cancelled

Author: Pagghiu

Libraries/Async/Async.cpp

@@ -582,6 +582,15 @@ void SC::AsyncEventLoop::Internal::invokeExpiredTimers(Time::HighResolutionCount
                 submissions.queueBack(*current);
                 numberOfSubmissions += 1;
             }
+            if (async != nullptr and not async->isActive())
+            {
+                // Our "next" timeout to check could have been Cancelled during the callback
+                // and it could be in the submission queue now.
+                // It's possible detecting this case by checking the active state.
+                // In this case it makes sense to re-check the entire active timers list.
+                async = activeLoopTimeouts.front;
+                SC_ASSERT_DEBUG(async == nullptr or async->isActive()); // Should not be possible
+            }
         }
     }
 }

Libraries/Async/Tests/AsyncTestLoopTimeout.inl

@@ -11,7 +11,7 @@ void SC::AsyncTest::loopTimeout()
     int timeout2Called = 0;
     timeout1.callback  = [&](AsyncLoopTimeout::Result& res)
     {
-        SC_TEST_EXPECT(res.getAsync().relativeTimeout.ms == 1);
+        SC_TEST_EXPECT(res.getAsync().relativeTimeout == 1_ms);
         SC_TEST_EXPECT(res.getAsync().isFree());
         SC_TEST_EXPECT(not res.getAsync().isActive());
         SC_TEST_EXPECT(not res.getAsync().isCancelling());
@@ -27,11 +27,11 @@ void SC::AsyncTest::loopTimeout()
             SC_TEST_EXPECT(not res.getAsync().isActive());
             res.reactivateRequest(true);
             SC_TEST_EXPECT(res.getAsync().isActive());
-            res.getAsync().relativeTimeout = Time::Milliseconds(1);
+            res.getAsync().relativeTimeout = 1_ms;
         }
         timeout2Called++;
     };
-    SC_TEST_EXPECT(timeout2.start(eventLoop, Time::Milliseconds(100)));
+    SC_TEST_EXPECT(timeout2.start(eventLoop, 100_ms));
     SC_TEST_EXPECT(eventLoop.runOnce());
     SC_TEST_EXPECT(timeout1Called == 1 and timeout2Called == 0); // timeout1 fires after 1 ms
     SC_TEST_EXPECT(eventLoop.runOnce());