From d439e3e695d0258463f39e0a370c43362d8e104f Mon Sep 17 00:00:00 2001 From: John Colvin Date: Sat, 20 Jul 2024 04:03:25 +0000 Subject: [PATCH] Reduce task wait/timeout code in AsyncTCPConnector --- .../ManagedTCP/AsyncTCPConnector_AsyncWrapper.cs | 16 ++-------------- 1 file changed, 2 insertions(+), 14 deletions(-) diff --git a/src/DataStreamSuite/PubSub/ManagedTCP/AsyncTCPConnector_AsyncWrapper.cs b/src/DataStreamSuite/PubSub/ManagedTCP/AsyncTCPConnector_AsyncWrapper.cs index 984cfebf1..31a641de7 100644 --- a/src/DataStreamSuite/PubSub/ManagedTCP/AsyncTCPConnector_AsyncWrapper.cs +++ b/src/DataStreamSuite/PubSub/ManagedTCP/AsyncTCPConnector_AsyncWrapper.cs @@ -45,20 +45,8 @@ namespace bts { // wais for wait_before_retrying before trying again public static void _keep_trying_blocking_function(Action action, TimeSpan timeout, TimeSpan wait_before_retrying) { Func try_once = () => { - var cts = new CancellationTokenSource(); - var token = cts.Token; - - var task = Task.Run(action, token); - - if (Task.WaitAny(task, Task.Delay(timeout, token)) == 0) { - // Task completed within timeout - task.GetAwaiter().GetResult(); // Ensure any exceptions/cancellation are rethrown - return true; - } else { - // Timeout - cts.Cancel(); - return false; - } + var task = Task.Run(action); + return Task.WhenAny(task, Task.Delay(timeout)).GetAwaiter().GetResult() == task && task.IsCompletedSuccessfully; }; bool connected = false; while (!connected) {