Makes path resolution thread-safe

DevTeam · Aug 18, 2024 · 3692155 · 3692155
1 parent 6f02db6
commit 3692155
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 3 deletions.
diff --git a/CSharpInteractive.HostApi/DockerRun.cs b/CSharpInteractive.HostApi/DockerRun.cs
@@ -118,9 +118,13 @@ public IStartInfo GetStartInfo(IHost host)
         if (host == null) throw new ArgumentNullException(nameof(host));
         var directoryMap = new Dictionary<string, string>();
         var pathResolver = new PathResolver(Platform, directoryMap);
-        using var pathResolverToken = host.GetService<HostComponents>().PathResolverContext.Register(pathResolver);
+        IStartInfo startInfo;
+        using (host.GetService<HostComponents>().PathResolverContext.Register(pathResolver))
+        {
+            startInfo = CommandLine.GetStartInfo(host);
+        }
+
         var settings = host.GetService<HostComponents>().DockerSettings;
-        var startInfo = CommandLine.GetStartInfo(host);
         var cmd = new CommandLine(string.IsNullOrWhiteSpace(ExecutablePath) ? settings.DockerExecutablePath : ExecutablePath)
             .WithShortName(!string.IsNullOrWhiteSpace(ShortName) ? ShortName : $"{startInfo.ShortName} in the docker container {Image}")
             .WithWorkingDirectory(WorkingDirectory)

diff --git a/CSharpInteractive/Core/PathResolverContext.cs b/CSharpInteractive/Core/PathResolverContext.cs
@@ -6,20 +6,22 @@ namespace CSharpInteractive.Core;
 
 internal class PathResolverContext(IHost host) : IPathResolverContext, IVirtualContext
 {
+    private readonly object _lockObject = new();
     private IPathResolver _currentResolver = EmptyResolver.Shared;
     private IPathResolver _prevResolver = EmptyResolver.Shared;
-
     public bool IsActive => _currentResolver != EmptyResolver.Shared;
 
     public IDisposable Register(IPathResolver resolver)
     {
+        Monitor.Enter(_lockObject);
         var prevResolver = _prevResolver;
         _prevResolver = _currentResolver;
         _currentResolver = resolver;
         return Disposable.Create(() =>
         {
             _currentResolver = _prevResolver;
             _prevResolver = prevResolver;
+            Monitor.Exit(_lockObject);
         });
     }