Run Fuzzlyn.ExecutionServer.dll from another directory

Avoids mismatching native dependencies with the host when Fuzzlyn itself
was published as self-contained.

Author: jakobbotsch

Fuzzlyn/ExecutionServerPool.cs

@@ -5,7 +5,7 @@
 
 namespace Fuzzlyn;
 
-internal class ExecutionServerPool(string host, SpmiSetupOptions spmiOptions, LogExecutionServerRequestsOptions logRequestsOptions)
+internal class ExecutionServerPool(string host, string executorPath, SpmiSetupOptions spmiOptions, LogExecutionServerRequestsOptions logRequestsOptions)
 {
     // Stop a server once it has not been used for this duration
     private static readonly TimeSpan s_inactivityPeriod = TimeSpan.FromMinutes(3);
@@ -44,7 +44,7 @@ private RunningExecutionServer Get(bool keepNonEmptyEagerly)
 
         if (startNew)
         {
-            RunningExecutionServer created = RunningExecutionServer.Create(_serverIndex++, Host, SpmiOptions, LogExceutionServerRequestsOptions);
+            RunningExecutionServer created = RunningExecutionServer.Create(_serverIndex++, Host, executorPath, SpmiOptions, LogExceutionServerRequestsOptions);
             lock (_pool)
             {
                 _pool.Add(created);
@@ -54,7 +54,7 @@ private RunningExecutionServer Get(bool keepNonEmptyEagerly)
         if (bestServer != null)
             return bestServer;
 
-        return RunningExecutionServer.Create(_serverIndex++, Host, SpmiOptions, LogExceutionServerRequestsOptions);
+        return RunningExecutionServer.Create(_serverIndex++, Host, executorPath, SpmiOptions, LogExceutionServerRequestsOptions);
     }
 
     private void Return(RunningExecutionServer server)

Fuzzlyn/Program.cs

@@ -261,7 +261,14 @@ private static bool CreateExecutionServerPool(FuzzlynOptions options)
             }
         }
 
-        s_executionServerPool = new ExecutionServerPool(options.Host, spmiOptions, logExecServerRequestsOptions);
+        string fuzzlynDir = Path.GetDirectoryName(Assembly.GetExecutingAssembly().Location);
+        string executionServerPath = Path.Combine(fuzzlynDir, "Fuzzlyn.ExecutionServer.dll");
+        string newExecutionServerDir = Path.Combine(fuzzlynDir, "ExecutionServer");
+        string newExecutionServerPath = Path.Combine(newExecutionServerDir, "Fuzzlyn.ExecutionServer.dll");
+        Directory.CreateDirectory(newExecutionServerDir);
+        File.Copy(executionServerPath, newExecutionServerPath, true);
+
+        s_executionServerPool = new ExecutionServerPool(options.Host, newExecutionServerPath, spmiOptions, logExecServerRequestsOptions);
         return true;
     }
 

Fuzzlyn/RunningExecutionServer.cs

@@ -166,13 +166,12 @@ public void Kill()
         }
     }
 
-    public static RunningExecutionServer Create(int serverIndex, string host, SpmiSetupOptions spmiOptions, LogExecutionServerRequestsOptions logExecServerRequestsOptions)
+    public static RunningExecutionServer Create(int serverIndex, string host, string executorPath, SpmiSetupOptions spmiOptions, LogExecutionServerRequestsOptions logExecServerRequestsOptions)
     {
-        string executorPath = Path.Combine(Path.GetDirectoryName(Assembly.GetExecutingAssembly().Location), "Fuzzlyn.ExecutionServer.dll");
         ProcessStartInfo info = new()
         {
             FileName = host,
-            WorkingDirectory = Environment.CurrentDirectory,
+            WorkingDirectory = Path.GetDirectoryName(executorPath),
             RedirectStandardOutput = true,
             RedirectStandardError = true,
             RedirectStandardInput = true,