Merge branch 'com-lihaoyi:main' into groovylib

Author: lostiniceland

libs/daemon/client/src/mill/client/LaunchedServer.java

@@ -3,8 +3,6 @@
 public abstract class LaunchedServer {
   public abstract boolean isAlive();
 
-  public abstract void kill();
-
   /// An operating system process was launched.
   public static class OsProcess extends LaunchedServer {
     public final ProcessHandle process;
@@ -22,13 +20,6 @@ public String toString() {
     public boolean isAlive() {
       return process.isAlive();
     }
-
-    @Override
-    public void kill() {
-      if (!process.destroy())
-        throw new IllegalStateException(
-            "Asked " + process + " to terminate, but the termination request failed.");
-    }
   }
 
   /// Code running in the same process.
@@ -50,10 +41,5 @@ public String toString() {
     public boolean isAlive() {
       return thread.isAlive();
     }
-
-    @Override
-    public void kill() {
-      _kill.run();
-    }
   }
 }

libs/daemon/client/src/mill/client/ServerLauncher.java

@@ -37,16 +37,6 @@
 ///   - Wait for `ProxyStream.END` packet or `clientSocket.close()`,
 ///     indicating server has finished execution and all data has been received
 public abstract class ServerLauncher {
-  public static class RunWithConnectionResult<A> {
-    public final A result;
-
-    public final int exitCode;
-
-    public RunWithConnectionResult(A result, int exitCode) {
-      this.result = result;
-      this.exitCode = exitCode;
-    }
-  }
 
   /// Run a client logic with a connection established to a Mill server (via [#connectToServer]).
   ///
@@ -56,13 +46,13 @@ public RunWithConnectionResult(A result, int exitCode) {
   // client logic
   /// @param runClientLogic the client logic to run
   /// @return the exit code that the server sent back
-  public static <A> RunWithConnectionResult<A> runWithConnection(
-      String debugName,
+  public static int runWithConnection(
       Socket connection,
       Streams streams,
       boolean closeConnectionAfterClientLogic,
       Consumer<OutputStream> sendInitData,
-      RunClientLogic<A> runClientLogic)
+      Runnable runClientLogic,
+      String debugName)
       throws Exception {
     // According to
     // https://pzemtsov.github.io/2015/01/19/on-the-benefits-of-stream-buffering-in-Java.html it
@@ -76,10 +66,10 @@ public static <A> RunWithConnectionResult<A> runWithConnection(
     socketOutputStream.flush();
     var pumperThread =
         startStreamPumpers(socketInputStream, socketOutputStream, streams, debugName);
-    var result = runClientLogic.run();
+    runClientLogic.run();
     if (closeConnectionAfterClientLogic) socketInputStream.close();
     pumperThread.join();
-    return new RunWithConnectionResult<>(result, pumperThread.exitCode());
+    return pumperThread.exitCode();
   }
 
   /// Run a client logic with a connection established to a Mill server (via [#connectToServer]).
@@ -90,7 +80,6 @@ public static <A> RunWithConnectionResult<A> runWithConnection(
   /// @param runClientLogic the client logic to run
   /// @return the exit code that the server sent back
   public static <A> A runWithConnection(
-      String debugName,
       Socket connection,
       boolean closeConnectionAfterClientLogic,
       Consumer<OutputStream> sendInitData,
@@ -266,11 +255,6 @@ public static ServerLaunchResult ensureServerIsRunning(
                       public boolean isAlive() {
                         throw new RuntimeException("not implemented, this should never happen");
                       }
-
-                      @Override
-                      public void kill() {
-                        throw new RuntimeException("not implemented, this should never happen");
-                      }
                     };
             return Optional.of(new ServerLaunchResult.AlreadyRunning(launchedServer));
           } catch (IOException | NumberFormatException e) {
@@ -353,26 +337,11 @@ public interface InitServer {
     LaunchedServer init() throws Exception;
   }
 
-  public interface RunClientLogic<A> {
-    /// Runs the client logic.
-    A run() throws Exception;
-  }
-
   public interface RunClientLogicWithStreams<A> {
     /// Runs the client logic.
     A run(BufferedInputStream inStream, BufferedOutputStream outStream) throws Exception;
   }
 
-  public static class Result {
-    public final int exitCode;
-    public final Path daemonDir;
-
-    public Result(int exitCode, Path daemonDir) {
-      this.exitCode = exitCode;
-      this.daemonDir = daemonDir;
-    }
-  }
-
   public static class Streams {
     /// The input stream to send to the server as the stdin.
     public final InputStream stdin;

libs/javalib/worker/src/mill/javalib/worker/JvmWorkerImpl.scala

@@ -340,7 +340,6 @@ class JvmWorkerImpl(args: JvmWorkerArgs) extends JvmWorkerApi with AutoCloseable
           val debugName =
             s"ZincWorker,TCP ${socket.getRemoteSocketAddress} -> ${socket.getLocalSocketAddress}"
           ServerLauncher.runWithConnection(
-            debugName,
             socket,
             /* closeConnectionAfterCommand */ true,
             /* sendInitData */ _ => {},

libs/scalajslib/api/src/mill/scalajslib/worker/api/ScalaJSWorkerApi.scala

@@ -3,7 +3,7 @@ package mill.scalajslib.worker.api
 import java.io.File
 import java.nio.file.Path
 
-private[scalajslib] trait ScalaJSWorkerApi {
+private[scalajslib] trait ScalaJSWorkerApi extends AutoCloseable {
   def link(
       runClasspath: Seq[Path],
       dest: File,

libs/scalajslib/package.mill

@@ -49,7 +49,7 @@ object `package` extends MillStableScalaModule with BuildInfo {
     def scalajsWorkerVersion = crossValue
     def moduleDir: os.Path = super.moduleDir / scalajsWorkerVersion
     def compileModuleDeps =
-      Seq(build.libs.scalajslib.api, build.core.constants, build.core.api.daemon)
+      Seq(build.libs.scalajslib.api, build.libs.util, build.core.constants, build.core.api.daemon)
     def mandatoryMvnDeps = Seq.empty[Dep]
     def mvnDeps = Seq(Deps.scalafmtDynamic)
     def compileMvnDeps = super.mandatoryMvnDeps() ++ Seq(

libs/scalajslib/src/mill/scalajslib/worker/ScalaJSWorker.scala

@@ -24,8 +24,8 @@ private[scalajslib] class ScalaJSWorker(jobs: Int)
     )
     val bridge = cl
       .loadClass("mill.scalajslib.worker.ScalaJSWorkerImpl")
-      .getDeclaredConstructor()
-      .newInstance()
+      .getDeclaredConstructor(classOf[Int])
+      .newInstance(jobs)
       .asInstanceOf[workerApi.ScalaJSWorkerApi]
 
     (cl, bridge)
@@ -35,7 +35,9 @@ private[scalajslib] class ScalaJSWorker(jobs: Int)
       key: Seq[PathRef],
       value: (URLClassLoader, workerApi.ScalaJSWorkerApi)
   ): Unit = {
-    value._1.close()
+    val (classloader, workerApi) = value
+    workerApi.close()
+    classloader.close()
   }
 
   override def maxCacheSize: Int = jobs

libs/scalajslib/worker/1/src/mill/scalajslib/worker/ScalaJSWorkerImpl.scala

@@ -1,11 +1,15 @@
 package mill.scalajslib.worker
 
-import scala.concurrent.Await
-import scala.concurrent.duration.Duration
 import java.io.File
 import java.nio.file.Path
+import scala.concurrent.Await
+import scala.concurrent.duration.Duration
+
+import com.armanbilge.sjsimportmap.ImportMappedIRFile
+import mill.constants.InputPumper
 import mill.scalajslib.worker.api.*
 import mill.scalajslib.worker.jsenv.*
+import mill.util.CachedFactory
 import org.scalajs.ir.ScalaJSVersions
 import org.scalajs.linker.{PathIRContainer, PathOutputDirectory, PathOutputFile, StandardImpl}
 import org.scalajs.linker.interface.{
@@ -22,12 +26,7 @@ import org.scalajs.jsenv.{Input, JSEnv, RunConfig}
 import org.scalajs.testing.adapter.TestAdapter
 import org.scalajs.testing.adapter.TestAdapterInitializer as TAI
 
-import scala.collection.mutable
-import scala.ref.SoftReference
-import com.armanbilge.sjsimportmap.ImportMappedIRFile
-import mill.constants.InputPumper
-
-class ScalaJSWorkerImpl extends ScalaJSWorkerApi {
+class ScalaJSWorkerImpl(jobs: Int) extends ScalaJSWorkerApi {
   private case class LinkerInput(
       isFullLinkJS: Boolean,
       optimizer: Boolean,
@@ -44,15 +43,12 @@ class ScalaJSWorkerImpl extends ScalaJSWorkerApi {
     case s"1.$n.$_" if n.toIntOption.exists(_ < number) => false
     case _ => true
   }
-  private object ScalaJSLinker {
+  private object ScalaJSLinker extends CachedFactory[LinkerInput, (Linker, IRFileCache.Cache)] {
     private val irFileCache = StandardImpl.irFileCache()
-    private val cache = mutable.Map.empty[LinkerInput, SoftReference[(Linker, IRFileCache.Cache)]]
-    def reuseOrCreate(input: LinkerInput): (Linker, IRFileCache.Cache) = cache.get(input) match {
-      case Some(SoftReference((linker, irFileCacheCache))) => (linker, irFileCacheCache)
-      case _ =>
-        val newResult = createLinker(input)
-        cache.update(input, SoftReference(newResult))
-        newResult
+    override def maxCacheSize: Int = jobs
+    override def setup(key: LinkerInput): (Linker, IRFileCache.Cache) = createLinker(key)
+    override def teardown(key: LinkerInput, value: (Linker, IRFileCache.Cache)): Unit = {
+      value._2.free()
     }
     private def createLinker(input: LinkerInput): (Linker, IRFileCache.Cache) = {
       val semantics = input.isFullLinkJS match {
@@ -197,23 +193,22 @@ class ScalaJSWorkerImpl extends ScalaJSWorkerApi {
       minify: Boolean,
       importMap: Seq[ESModuleImportMapping],
       experimentalUseWebAssembly: Boolean
-  ): Either[String, Report] = {
+  ): Either[String, Report] = ScalaJSLinker.withValue(LinkerInput(
+    isFullLinkJS = isFullLinkJS,
+    optimizer = optimizer,
+    sourceMap = sourceMap,
+    moduleKind = moduleKind,
+    esFeatures = esFeatures,
+    moduleSplitStyle = moduleSplitStyle,
+    outputPatterns = outputPatterns,
+    minify = minify,
+    dest = dest,
+    experimentalUseWebAssembly = experimentalUseWebAssembly
+  )) { (linker, irFileCacheCache) =>
     // On Scala.js 1.2- we want to use the legacy mode either way since
     // the new mode is not supported and in tests we always use legacy = false
     val useLegacy = forceOutJs || !minorIsGreaterThanOrEqual(3)
     import scala.concurrent.ExecutionContext.Implicits.global
-    val (linker, irFileCacheCache) = ScalaJSLinker.reuseOrCreate(LinkerInput(
-      isFullLinkJS = isFullLinkJS,
-      optimizer = optimizer,
-      sourceMap = sourceMap,
-      moduleKind = moduleKind,
-      esFeatures = esFeatures,
-      moduleSplitStyle = moduleSplitStyle,
-      outputPatterns = outputPatterns,
-      minify = minify,
-      dest = dest,
-      experimentalUseWebAssembly = experimentalUseWebAssembly
-    ))
     val irContainersAndPathsFuture = PathIRContainer.fromClasspath(runClasspath)
     val testInitializer =
       if (testBridgeInit)
@@ -390,4 +385,6 @@ class ScalaJSWorkerImpl extends ScalaJSWorkerApi {
     }
     Seq(input)
   }
+
+  override def close(): Unit = ScalaJSLinker.close()
 }

runner/client/src/mill/client/MillServerLauncher.java

@@ -43,7 +43,7 @@ public MillServerLauncher(
    */
   public abstract LaunchedServer initServer(Path daemonDir, Locks locks) throws Exception;
 
-  public Result run(Path daemonDir, String javaHome, Consumer<String> log) throws Exception {
+  public int run(Path daemonDir, String javaHome, Consumer<String> log) throws Exception {
     Files.createDirectories(daemonDir);
 
     var initData = new ClientInitData(
@@ -76,8 +76,6 @@ public Result run(Path daemonDir, String javaHome, Consumer<String> log) throws
         true /*openSocket*/)) {
       log.accept("runWithConnection: " + launched);
       var result = runWithConnection(
-          "MillServerLauncher[" + launched.socket.getLocalSocketAddress() + " -> "
-              + launched.socket.getRemoteSocketAddress() + "]",
           launched.socket,
           streams,
           false,
@@ -93,19 +91,24 @@ public Result run(Path daemonDir, String javaHome, Consumer<String> log) throws
           () -> {
             log.accept("running client logic");
             forceTestFailure(daemonDir, log);
-            return 0;
-          });
-      log.accept("runWithConnection exit code: " + result.exitCode);
-      return new Result(result.exitCode, daemonDir);
+          },
+          "MillServerLauncher[" + launched.socket.getLocalSocketAddress() + " -> "
+              + launched.socket.getRemoteSocketAddress() + "]");
+      log.accept("runWithConnection exit code: " + result);
+      return result;
     }
   }
 
-  private void forceTestFailure(Path daemonDir, Consumer<String> log) throws Exception {
+  private void forceTestFailure(Path daemonDir, Consumer<String> log) {
     if (forceFailureForTestingMillisDelay > 0) {
       log.accept(
           "Force failure for testing in " + forceFailureForTestingMillisDelay + "ms: " + daemonDir);
-      Thread.sleep(forceFailureForTestingMillisDelay);
-      throw new Exception("Force failure for testing: " + daemonDir);
+      try {
+        Thread.sleep(forceFailureForTestingMillisDelay);
+      } catch (InterruptedException e) {
+        throw new RuntimeException(e);
+      }
+      throw new RuntimeException("Force failure for testing: " + daemonDir);
     } else {
       log.accept("No force failure for testing: " + daemonDir);
     }

runner/launcher/src/mill/launcher/MillLauncherMain.java

@@ -48,12 +48,9 @@ public static void main(String[] args) throws Exception {
     // Ensure that if we're running in BSP mode we don't start a daemon.
     //
     // This is needed because when Metals/Idea closes, they only kill the BSP client and the BSP
-    // server lurks around
-    // waiting for the next client to connect.
-    //
+    // server lurks around waiting for the next client to connect.
     // This is unintuitive from the user's perspective and wastes resources, as most people expect
-    // everything related
-    // to the BSP server to be killed when closing the editor.
+    // everything related to the BSP server to be killed when closing the editor.
     if (bspMode) runNoDaemon = true;
 
     var outMode = bspMode ? OutFolderMode.BSP : OutFolderMode.REGULAR;
@@ -116,12 +113,13 @@ public LaunchedServer initServer(Path daemonDir, Locks locks) throws Exception {
               }
             };
 
-        var daemonDir0 = Paths.get(outDir, OutFiles.millDaemon);
+        var daemonDir = Paths.get(outDir, OutFiles.millDaemon);
         String javaHome = MillProcessLauncher.javaHome(outMode);
 
-        var exitCode = launcher.run(daemonDir0, javaHome, log).exitCode;
+        MillProcessLauncher.prepareMillRunFolder(daemonDir);
+        var exitCode = launcher.run(daemonDir, javaHome, log);
         if (exitCode == ClientUtil.ExitServerCodeWhenVersionMismatch()) {
-          exitCode = launcher.run(daemonDir0, javaHome, log).exitCode;
+          exitCode = launcher.run(daemonDir, javaHome, log);
         }
         System.exit(exitCode);
       } catch (Exception e) {

runner/launcher/src/mill/launcher/MillProcessLauncher.java

@@ -26,6 +26,8 @@ static int launchMillNoDaemon(
     final Path processDir =
         Paths.get(".").resolve(outFor(outMode)).resolve(millNoDaemon).resolve(sig);
 
+    MillProcessLauncher.prepareMillRunFolder(processDir);
+
     final List<String> l = new ArrayList<>();
     l.addAll(millLaunchJvmCommand(outMode, runnerClasspath));
     Map<String, String> propsMap = ClientUtil.getUserSetProperties();
@@ -77,7 +79,7 @@ static Process configureRunMillProcess(ProcessBuilder builder, Path daemonDir) t
 
     Path sandbox = daemonDir.resolve(DaemonFiles.sandbox);
     Files.createDirectories(sandbox);
-    MillProcessLauncher.prepareMillRunFolder(daemonDir);
+
     builder.environment().put(EnvVars.MILL_WORKSPACE_ROOT, new File("").getCanonicalPath());
     if (System.getenv(EnvVars.MILL_EXECUTABLE_PATH) == null)
       builder.environment().put(EnvVars.MILL_EXECUTABLE_PATH, getExecutablePath());