Fix #779: NRE on Dispose in ExecutionTimer

src/PowerShellEditorServices/Utility/ExecutionTimer.cs

@@ -20,8 +20,9 @@ namespace Microsoft.PowerShell.EditorServices.Utility
     /// </example>
     public struct ExecutionTimer : IDisposable
     {
-        [ThreadStatic]
-        private static Stopwatch t_stopwatch;
+        private static readonly ObjectPool<Stopwatch> s_stopwatchPool = new ObjectPool<Stopwatch>();
+
+        private Stopwatch _stopwatch;
 
         private readonly ILogger _logger;
 
@@ -50,7 +51,7 @@ public static ExecutionTimer Start(
             [CallerLineNumber] int callerLineNumber = -1)
         {
             var timer = new ExecutionTimer(logger, message, callerMemberName, callerFilePath, callerLineNumber);
-            Stopwatch.Start();
+            timer._stopwatch.Start();
             return timer;
         }
 
@@ -66,6 +67,7 @@ internal ExecutionTimer(
             _callerMemberName = callerMemberName;
             _callerFilePath = callerFilePath;
             _callerLineNumber = callerLineNumber;
+            _stopwatch = s_stopwatchPool.Rent();
         }
 
         /// <summary>
@@ -74,16 +76,18 @@ internal ExecutionTimer(
         /// </summary>
         public void Dispose()
         {
-            t_stopwatch.Stop();
+            _stopwatch.Stop();
 
             string logMessage = new StringBuilder()
                 .Append(_message)
                 .Append(" [")
-                .Append(t_stopwatch.ElapsedMilliseconds)
+                .Append(_stopwatch.ElapsedMilliseconds)
                 .Append("ms]")
                 .ToString();
 
-            t_stopwatch.Reset();
+            _stopwatch.Reset();
+
+            s_stopwatchPool.Return(_stopwatch);
 
             _logger.Write(
                 LogLevel.Verbose,
@@ -92,7 +96,5 @@ public void Dispose()
                 callerSourceFile: _callerFilePath,
                 callerLineNumber: _callerLineNumber);
         }
-
-        private static Stopwatch Stopwatch => t_stopwatch ?? (t_stopwatch = new Stopwatch());
     }
 }

src/PowerShellEditorServices/Utility/ObjectPool.cs

@@ -0,0 +1,19 @@
+//
+// Copyright (c) Microsoft. All rights reserved.
+// Licensed under the MIT license. See LICENSE file in the project root for full license information.
+//
+
+using System.Collections.Concurrent;
+
+namespace Microsoft.PowerShell.EditorServices.Utility
+{
+    public class ObjectPool<T>
+        where T : new()
+    {
+        private ConcurrentBag<T> _pool = new ConcurrentBag<T>();
+
+        public T Rent() => _pool.TryTake(out var obj) ? obj : new T();
+
+        public void Return(T obj) => _pool.Add(obj);
+    }
+}

test/PowerShellEditorServices.Test/Utility/ExecutionTimerTests.cs

@@ -0,0 +1,25 @@
+//
+// Copyright (c) Microsoft. All rights reserved.
+// Licensed under the MIT license. See LICENSE file in the project root for full license information.
+//
+
+using Microsoft.PowerShell.EditorServices.Utility;
+using System;
+using System.IO;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+using Xunit;
+
+namespace Microsoft.PowerShell.EditorServices.Test.Utility
+{
+    public class ExecutionTimerTests
+    {
+        [Fact]
+        public async void DoesNotThrowExceptionWhenDisposedOnAnotherThread()
+        {
+            var timer = ExecutionTimer.Start(Logging.CreateLogger().Build(), "Message");
+            await Task.Run(() => timer.Dispose());
+        }
+    }
+}

test/PowerShellEditorServices.Test/Utility/ObjectPoolTests.cs

@@ -0,0 +1,23 @@
+//
+// Copyright (c) Microsoft. All rights reserved.
+// Licensed under the MIT license. See LICENSE file in the project root for full license information.
+//
+
+using Microsoft.PowerShell.EditorServices.Utility;
+using Xunit;
+
+namespace Microsoft.PowerShell.EditorServices.Test.Utility
+{
+    public class ObjectPoolTests
+    {
+        [Fact]
+        public void DoesNotCreateNewObjects()
+        {
+            var pool = new ObjectPool<object>();
+            var obj = pool.Rent();
+            pool.Return(obj);
+
+            Assert.Same(obj, pool.Rent());
+        }
+    }
+}