replace TimeSpan.FromMilliseconds(-1) with Timeout.InfiniteTimeSpan

afifi-ins · mconnew · commit c7b4036b7f10 · 2024-08-07T10:24:42.000-07:00
diff --git a/src/System.ServiceModel.NetFramingBase/src/System/ServiceModel/Channels/IdlingCommunicationPool.cs b/src/System.ServiceModel.NetFramingBase/src/System/ServiceModel/Channels/IdlingCommunicationPool.cs
@@ -165,7 +165,7 @@ private void CancelTimer()
                 {
                     if (_idleTimer != null)
                     {
-                        _idleTimer.Change(TimeSpan.FromMilliseconds(-1), TimeSpan.FromMilliseconds(-1));
+                        _idleTimer.Change(Timeout.InfiniteTimeSpan, Timeout.InfiniteTimeSpan);
                     }
                 }
 
@@ -180,11 +180,11 @@ private void StartTimerIfNecessary()
                                 s_onIdle = new Action<object>(OnIdle);
                             }
 
-                            _idleTimer = new Timer(new TimerCallback(new Action<object>(s_onIdle)), this, _idleTimeout, TimeSpan.FromMilliseconds(-1));
+                            _idleTimer = new Timer(new TimerCallback(new Action<object>(s_onIdle)), this, _idleTimeout, Timeout.InfiniteTimeSpan);
                         }
                         else
                         {
-                            _idleTimer.Change(_idleTimeout, TimeSpan.FromMilliseconds(-1));
+                            _idleTimer.Change(_idleTimeout, Timeout.InfiniteTimeSpan);
                         }
                     }
                 }
@@ -267,7 +267,7 @@ public void Prune(List<TItem> itemsToClose, bool calledFromTimer)
 
                     if (calledFromTimer && setTimer)
                     {
-                        _idleTimer.Change(_idleTimeout, TimeSpan.FromMilliseconds(-1));
+                        _idleTimer.Change(_idleTimeout, Timeout.InfiniteTimeSpan);
                     }
                 }
 
diff --git a/src/System.ServiceModel.Primitives/src/Internals/System/Runtime/InputQueue.cs b/src/System.ServiceModel.Primitives/src/Internals/System/Runtime/InputQueue.cs
@@ -907,7 +907,7 @@ public AsyncQueueReader(InputQueue<T> inputQueue, TimeSpan timeout, AsyncCallbac
                 _inputQueue = inputQueue;
                 if (timeout != TimeSpan.MaxValue)
                 {
-                    _timer = new Timer(new TimerCallback(s_timerCallback), this, timeout, TimeSpan.FromMilliseconds(-1));
+                    _timer = new Timer(new TimerCallback(s_timerCallback), this, timeout, Timeout.InfiniteTimeSpan);
                 }
             }
 
@@ -932,7 +932,7 @@ public void Set(Item item)
                 _item = item.Value;
                 if (_timer != null)
                 {
-                    _timer.Change(TimeSpan.FromMilliseconds(-1), TimeSpan.FromMilliseconds(-1));
+                    _timer.Change(Timeout.InfiniteTimeSpan, Timeout.InfiniteTimeSpan);
                 }
                 Complete(false, item.Exception);
             }
@@ -958,7 +958,7 @@ public AsyncQueueWaiter(TimeSpan timeout, AsyncCallback callback, object state)
             {
                 if (timeout != TimeSpan.MaxValue)
                 {
-                    _timer = new Timer(new TimerCallback(s_timerCallback), this, timeout, TimeSpan.FromMilliseconds(-1));
+                    _timer = new Timer(new TimerCallback(s_timerCallback), this, timeout, Timeout.InfiniteTimeSpan);
                 }
             }
 
@@ -976,7 +976,7 @@ public void Set(bool itemAvailable)
 
                 lock (ThisLock)
                 {
-                    timely = (_timer == null) || _timer.Change(TimeSpan.FromMilliseconds(-1), TimeSpan.FromMilliseconds(-1));
+                    timely = (_timer == null) || _timer.Change(Timeout.InfiniteTimeSpan, Timeout.InfiniteTimeSpan);
                     _itemAvailable = itemAvailable;
                 }
 
diff --git a/src/System.ServiceModel.Primitives/src/System/ServiceModel/Channels/ServiceChannel.cs b/src/System.ServiceModel.Primitives/src/System/ServiceModel/Channels/ServiceChannel.cs
@@ -2339,7 +2339,7 @@ internal AsyncWaiter(CallOnceManager manager, TimeSpan timeout,
 
                     if (timeout != TimeSpan.MaxValue)
                     {
-                        _timer = new Timer(s_timeoutCallback, this, timeout, TimeSpan.FromMilliseconds(-1));
+                        _timer = new Timer(s_timeoutCallback, this, timeout, Timeout.InfiniteTimeSpan);
                     }
                 }
 
@@ -2350,7 +2350,7 @@ internal static void End(IAsyncResult result)
 
                 void IWaiter.Signal()
                 {
-                    if ((_timer == null) || _timer.Change(TimeSpan.FromMilliseconds(-1), TimeSpan.FromMilliseconds(-1)))
+                    if ((_timer == null) || _timer.Change(Timeout.InfiniteTimeSpan, Timeout.InfiniteTimeSpan))
                     {
                         Complete(false);
                         _manager._channel.Closed -= OnClosed;
@@ -2363,7 +2363,7 @@ void IWaiter.Signal()
 
                 private void OnClosed(object sender, EventArgs e)
                 {
-                    if ((_timer == null) || _timer.Change(TimeSpan.FromMilliseconds(-1), TimeSpan.FromMilliseconds(-1)))
+                    if ((_timer == null) || _timer.Change(Timeout.InfiniteTimeSpan, Timeout.InfiniteTimeSpan))
                     {
                         Complete(false, _manager._channel.CreateClosedException());
                     }
@@ -2406,7 +2406,7 @@ internal class SessionIdleManager
             private SessionIdleManager(IChannelBinder binder, TimeSpan idle)
             {
                 _binder = binder;
-                _timer = new Timer(new TimerCallback(GetTimerCallback()), this, idle, TimeSpan.FromMilliseconds(-1));
+                _timer = new Timer(new TimerCallback(GetTimerCallback()), this, idle, Timeout.InfiniteTimeSpan);
                 _idleTicks = Ticks.FromTimeSpan(idle);
                 _thisLock = new Object();
             }
@@ -2439,7 +2439,7 @@ internal void CancelTimer()
                 lock (_thisLock)
                 {
                     _isTimerCancelled = true;
-                    _timer.Change(TimeSpan.FromMilliseconds(-1), TimeSpan.FromMilliseconds(-1));
+                    _timer.Change(Timeout.InfiniteTimeSpan, Timeout.InfiniteTimeSpan);
                 }
             }
 
@@ -2508,7 +2508,7 @@ private void TimerCallback()
                     {
                         if (!_isTimerCancelled && _binder.Channel.State != CommunicationState.Faulted && _binder.Channel.State != CommunicationState.Closed)
                         {
-                            _timer.Change(Ticks.ToTimeSpan(abortTime - ticksNow), TimeSpan.FromMilliseconds(-1));
+                            _timer.Change(Ticks.ToTimeSpan(abortTime - ticksNow), Timeout.InfiniteTimeSpan);
                         }
                     }
                 }
diff --git a/src/System.ServiceModel.Primitives/src/System/ServiceModel/Dispatcher/DuplexChannelBinder.cs b/src/System.ServiceModel.Primitives/src/System/ServiceModel/Dispatcher/DuplexChannelBinder.cs
@@ -822,7 +822,7 @@ internal AsyncDuplexRequest(Message message, DuplexChannelBinder parent, TimeSpa
 
                 if (timeout != TimeSpan.MaxValue)
                 {
-                    _timer = new Timer(new TimerCallback(AsyncDuplexRequest.s_timerCallback), this, timeout, TimeSpan.FromMilliseconds(-1));
+                    _timer = new Timer(new TimerCallback(AsyncDuplexRequest.s_timerCallback), this, timeout, Timeout.InfiniteTimeSpan);
                 }
                 if (DiagnosticUtility.ShouldUseActivity)
                 {
diff --git a/src/System.ServiceModel.Primitives/src/System/ServiceModel/Dispatcher/TerminatingOperationBehavior.cs b/src/System.ServiceModel.Primitives/src/System/ServiceModel/Dispatcher/TerminatingOperationBehavior.cs
@@ -49,7 +49,7 @@ internal void AfterReply(ref MessageRpc rpc)
         {
             if (rpc.Operation.IsTerminating && rpc.Channel.HasSession)
             {
-                var timer = new Timer(s_abortChannelTimerCallback, rpc.Channel.Binder.Channel, rpc.Channel.CloseTimeout, TimeSpan.FromMilliseconds(-1));
+                var timer = new Timer(s_abortChannelTimerCallback, rpc.Channel.Binder.Channel, rpc.Channel.CloseTimeout, Timeout.InfiniteTimeSpan);
             }
         }
 
diff --git a/src/System.ServiceModel.Primitives/src/System/ServiceModel/Security/TimeBoundedCache.cs b/src/System.ServiceModel.Primitives/src/System/ServiceModel/Security/TimeBoundedCache.cs
@@ -76,7 +76,7 @@ private void CancelTimerIfNeeded()
         {
             if (Count == 0 && _purgingTimer != null)
             {
-                _purgingTimer.Change(TimeSpan.FromMilliseconds(-1), TimeSpan.FromMilliseconds(-1));
+                _purgingTimer.Change(Timeout.InfiniteTimeSpan, Timeout.InfiniteTimeSpan);
                 _purgingTimer.Dispose();
                 _purgingTimer = null;
             }
@@ -90,7 +90,7 @@ private void StartTimerIfNeeded()
             }
             if (_purgingTimer == null)
             {
-                _purgingTimer = new Timer(new TimerCallback(PurgeCallback), this, _purgeInterval, TimeSpan.FromMilliseconds(-1));
+                _purgingTimer = new Timer(new TimerCallback(PurgeCallback), this, _purgeInterval, Timeout.InfiniteTimeSpan);
             }
         }
 
@@ -420,7 +420,7 @@ private static void PurgeCallbackStatic(object state)
                 self.PurgeStaleItems();
                 if (self.Count > 0 && self._purgingTimer != null)
                 {
-                    self._purgingTimer.Change(self._purgeInterval, TimeSpan.FromMilliseconds(-1));
+                    self._purgingTimer.Change(self._purgeInterval, Timeout.InfiniteTimeSpan);
                 }
             }
             finally

Original file line number	Diff line number	Diff line change
`@@ -165,7 +165,7 @@ private void CancelTimer()`
`165`	`165`	`{`
`166`	`166`	`if (_idleTimer != null)`
`167`	`167`	`{`
`168`		`- _idleTimer.Change(TimeSpan.FromMilliseconds(-1), TimeSpan.FromMilliseconds(-1));`
	`168`	`+ _idleTimer.Change(Timeout.InfiniteTimeSpan, Timeout.InfiniteTimeSpan);`
`169`	`169`	`}`
`170`	`170`	`}`
`171`	`171`
`@@ -180,11 +180,11 @@ private void StartTimerIfNecessary()`
`180`	`180`	`s_onIdle = new Action<object>(OnIdle);`
`181`	`181`	`}`
`182`	`182`
`183`		`- _idleTimer = new Timer(new TimerCallback(new Action<object>(s_onIdle)), this, _idleTimeout, TimeSpan.FromMilliseconds(-1));`
	`183`	`+ _idleTimer = new Timer(new TimerCallback(new Action<object>(s_onIdle)), this, _idleTimeout, Timeout.InfiniteTimeSpan);`
`184`	`184`	`}`
`185`	`185`	`else`
`186`	`186`	`{`
`187`		`- _idleTimer.Change(_idleTimeout, TimeSpan.FromMilliseconds(-1));`
	`187`	`+ _idleTimer.Change(_idleTimeout, Timeout.InfiniteTimeSpan);`
`188`	`188`	`}`
`189`	`189`	`}`
`190`	`190`	`}`
`@@ -267,7 +267,7 @@ public void Prune(List<TItem> itemsToClose, bool calledFromTimer)`
`267`	`267`
`268`	`268`	`if (calledFromTimer && setTimer)`
`269`	`269`	`{`
`270`		`- _idleTimer.Change(_idleTimeout, TimeSpan.FromMilliseconds(-1));`
	`270`	`+ _idleTimer.Change(_idleTimeout, Timeout.InfiniteTimeSpan);`
`271`	`271`	`}`
`272`	`272`	`}`
`273`	`273`
Original file line number	Diff line number	Diff line change
`@@ -907,7 +907,7 @@ public AsyncQueueReader(InputQueue<T> inputQueue, TimeSpan timeout, AsyncCallbac`
`907`	`907`	`_inputQueue = inputQueue;`
`908`	`908`	`if (timeout != TimeSpan.MaxValue)`
`909`	`909`	`{`
`910`		`- _timer = new Timer(new TimerCallback(s_timerCallback), this, timeout, TimeSpan.FromMilliseconds(-1));`
	`910`	`+ _timer = new Timer(new TimerCallback(s_timerCallback), this, timeout, Timeout.InfiniteTimeSpan);`
`911`	`911`	`}`
`912`	`912`	`}`
`913`	`913`
`@@ -932,7 +932,7 @@ public void Set(Item item)`
`932`	`932`	`_item = item.Value;`
`933`	`933`	`if (_timer != null)`
`934`	`934`	`{`
`935`		`- _timer.Change(TimeSpan.FromMilliseconds(-1), TimeSpan.FromMilliseconds(-1));`
	`935`	`+ _timer.Change(Timeout.InfiniteTimeSpan, Timeout.InfiniteTimeSpan);`
`936`	`936`	`}`
`937`	`937`	`Complete(false, item.Exception);`
`938`	`938`	`}`
`@@ -958,7 +958,7 @@ public AsyncQueueWaiter(TimeSpan timeout, AsyncCallback callback, object state)`
`958`	`958`	`{`
`959`	`959`	`if (timeout != TimeSpan.MaxValue)`
`960`	`960`	`{`
`961`		`- _timer = new Timer(new TimerCallback(s_timerCallback), this, timeout, TimeSpan.FromMilliseconds(-1));`
	`961`	`+ _timer = new Timer(new TimerCallback(s_timerCallback), this, timeout, Timeout.InfiniteTimeSpan);`
`962`	`962`	`}`
`963`	`963`	`}`
`964`	`964`
`@@ -976,7 +976,7 @@ public void Set(bool itemAvailable)`
`976`	`976`
`977`	`977`	`lock (ThisLock)`
`978`	`978`	`{`
`979`		`- timely = (_timer == null) \|\| _timer.Change(TimeSpan.FromMilliseconds(-1), TimeSpan.FromMilliseconds(-1));`
	`979`	`+ timely = (_timer == null) \|\| _timer.Change(Timeout.InfiniteTimeSpan, Timeout.InfiniteTimeSpan);`
`980`	`980`	`_itemAvailable = itemAvailable;`
`981`	`981`	`}`
`982`	`982`
Original file line number	Diff line number	Diff line change
`@@ -2339,7 +2339,7 @@ internal AsyncWaiter(CallOnceManager manager, TimeSpan timeout,`
`2339`	`2339`
`2340`	`2340`	`if (timeout != TimeSpan.MaxValue)`
`2341`	`2341`	`{`
`2342`		`- _timer = new Timer(s_timeoutCallback, this, timeout, TimeSpan.FromMilliseconds(-1));`
	`2342`	`+ _timer = new Timer(s_timeoutCallback, this, timeout, Timeout.InfiniteTimeSpan);`
`2343`	`2343`	`}`
`2344`	`2344`	`}`
`2345`	`2345`
`@@ -2350,7 +2350,7 @@ internal static void End(IAsyncResult result)`
`2350`	`2350`
`2351`	`2351`	`void IWaiter.Signal()`
`2352`	`2352`	`{`
`2353`		`- if ((_timer == null) \|\| _timer.Change(TimeSpan.FromMilliseconds(-1), TimeSpan.FromMilliseconds(-1)))`
	`2353`	`+ if ((_timer == null) \|\| _timer.Change(Timeout.InfiniteTimeSpan, Timeout.InfiniteTimeSpan))`
`2354`	`2354`	`{`
`2355`	`2355`	`Complete(false);`
`2356`	`2356`	`_manager._channel.Closed -= OnClosed;`
`@@ -2363,7 +2363,7 @@ void IWaiter.Signal()`
`2363`	`2363`
`2364`	`2364`	`private void OnClosed(object sender, EventArgs e)`
`2365`	`2365`	`{`
`2366`		`- if ((_timer == null) \|\| _timer.Change(TimeSpan.FromMilliseconds(-1), TimeSpan.FromMilliseconds(-1)))`
	`2366`	`+ if ((_timer == null) \|\| _timer.Change(Timeout.InfiniteTimeSpan, Timeout.InfiniteTimeSpan))`
`2367`	`2367`	`{`
`2368`	`2368`	`Complete(false, _manager._channel.CreateClosedException());`
`2369`	`2369`	`}`
`@@ -2406,7 +2406,7 @@ internal class SessionIdleManager`
`2406`	`2406`	`private SessionIdleManager(IChannelBinder binder, TimeSpan idle)`
`2407`	`2407`	`{`
`2408`	`2408`	`_binder = binder;`
`2409`		`- _timer = new Timer(new TimerCallback(GetTimerCallback()), this, idle, TimeSpan.FromMilliseconds(-1));`
	`2409`	`+ _timer = new Timer(new TimerCallback(GetTimerCallback()), this, idle, Timeout.InfiniteTimeSpan);`
`2410`	`2410`	`_idleTicks = Ticks.FromTimeSpan(idle);`
`2411`	`2411`	`_thisLock = new Object();`
`2412`	`2412`	`}`
`@@ -2439,7 +2439,7 @@ internal void CancelTimer()`
`2439`	`2439`	`lock (_thisLock)`
`2440`	`2440`	`{`
`2441`	`2441`	`_isTimerCancelled = true;`
`2442`		`- _timer.Change(TimeSpan.FromMilliseconds(-1), TimeSpan.FromMilliseconds(-1));`
	`2442`	`+ _timer.Change(Timeout.InfiniteTimeSpan, Timeout.InfiniteTimeSpan);`
`2443`	`2443`	`}`
`2444`	`2444`	`}`
`2445`	`2445`
`@@ -2508,7 +2508,7 @@ private void TimerCallback()`
`2508`	`2508`	`{`
`2509`	`2509`	`if (!_isTimerCancelled && _binder.Channel.State != CommunicationState.Faulted && _binder.Channel.State != CommunicationState.Closed)`
`2510`	`2510`	`{`
`2511`		`- _timer.Change(Ticks.ToTimeSpan(abortTime - ticksNow), TimeSpan.FromMilliseconds(-1));`
	`2511`	`+ _timer.Change(Ticks.ToTimeSpan(abortTime - ticksNow), Timeout.InfiniteTimeSpan);`
`2512`	`2512`	`}`
`2513`	`2513`	`}`
`2514`	`2514`	`}`
Original file line number	Diff line number	Diff line change
`@@ -822,7 +822,7 @@ internal AsyncDuplexRequest(Message message, DuplexChannelBinder parent, TimeSpa`
`822`	`822`
`823`	`823`	`if (timeout != TimeSpan.MaxValue)`
`824`	`824`	`{`
`825`		`- _timer = new Timer(new TimerCallback(AsyncDuplexRequest.s_timerCallback), this, timeout, TimeSpan.FromMilliseconds(-1));`
	`825`	`+ _timer = new Timer(new TimerCallback(AsyncDuplexRequest.s_timerCallback), this, timeout, Timeout.InfiniteTimeSpan);`
`826`	`826`	`}`
`827`	`827`	`if (DiagnosticUtility.ShouldUseActivity)`
`828`	`828`	`{`
Original file line number	Diff line number	Diff line change
`@@ -49,7 +49,7 @@ internal void AfterReply(ref MessageRpc rpc)`
`49`	`49`	`{`
`50`	`50`	`if (rpc.Operation.IsTerminating && rpc.Channel.HasSession)`
`51`	`51`	`{`
`52`		`- var timer = new Timer(s_abortChannelTimerCallback, rpc.Channel.Binder.Channel, rpc.Channel.CloseTimeout, TimeSpan.FromMilliseconds(-1));`
	`52`	`+ var timer = new Timer(s_abortChannelTimerCallback, rpc.Channel.Binder.Channel, rpc.Channel.CloseTimeout, Timeout.InfiniteTimeSpan);`
`53`	`53`	`}`
`54`	`54`	`}`
`55`	`55`
Original file line number	Diff line number	Diff line change
`@@ -76,7 +76,7 @@ private void CancelTimerIfNeeded()`
`76`	`76`	`{`
`77`	`77`	`if (Count == 0 && _purgingTimer != null)`
`78`	`78`	`{`
`79`		`- _purgingTimer.Change(TimeSpan.FromMilliseconds(-1), TimeSpan.FromMilliseconds(-1));`
	`79`	`+ _purgingTimer.Change(Timeout.InfiniteTimeSpan, Timeout.InfiniteTimeSpan);`
`80`	`80`	`_purgingTimer.Dispose();`
`81`	`81`	`_purgingTimer = null;`
`82`	`82`	`}`
`@@ -90,7 +90,7 @@ private void StartTimerIfNeeded()`
`90`	`90`	`}`
`91`	`91`	`if (_purgingTimer == null)`
`92`	`92`	`{`
`93`		`- _purgingTimer = new Timer(new TimerCallback(PurgeCallback), this, _purgeInterval, TimeSpan.FromMilliseconds(-1));`
	`93`	`+ _purgingTimer = new Timer(new TimerCallback(PurgeCallback), this, _purgeInterval, Timeout.InfiniteTimeSpan);`
`94`	`94`	`}`
`95`	`95`	`}`
`96`	`96`
`@@ -420,7 +420,7 @@ private static void PurgeCallbackStatic(object state)`
`420`	`420`	`self.PurgeStaleItems();`
`421`	`421`	`if (self.Count > 0 && self._purgingTimer != null)`
`422`	`422`	`{`
`423`		`- self._purgingTimer.Change(self._purgeInterval, TimeSpan.FromMilliseconds(-1));`
	`423`	`+ self._purgingTimer.Change(self._purgeInterval, Timeout.InfiniteTimeSpan);`
`424`	`424`	`}`
`425`	`425`	`}`
`426`	`426`	`finally`