.

Author: lihaoyi

core/exec/src/mill/exec/Execution.scala

@@ -45,7 +45,7 @@ case class Execution(
 ) extends GroupExecution with AutoCloseable {
 
   // Track nesting depth of executeTasks calls to only show final status on outermost call
-  val executionNestingDepth = new AtomicInteger(0)
+  private val executionNestingDepth = new AtomicInteger(0)
 
   // Lazily computed worker dependency graph, cached for the duration of the execution. It's
   // ok to take a snapshot of the cache, since the workerCache entries we may want to remove
@@ -187,7 +187,6 @@ case class Execution(
       ExecutionLogs.logDependencyTree(
         interGroupDeps,
         indexToTerminal,
-        outPath,
         runArtifacts
       )
       // Prepare a lookup tables up front of all the method names that each class owns,
@@ -410,7 +409,6 @@ case class Execution(
 
         ExecutionLogs.logInvalidationTree(
           interGroupDeps = interGroupDeps,
-          outPath = outPath,
           runArtifacts = runArtifacts,
           uncached = uncached,
           changedValueHash = changedValueHash,

core/exec/src/mill/exec/ExecutionLogs.scala

@@ -5,14 +5,12 @@ import mill.api.Task
 import mill.internal.{InvalidationForest, SpanningForest}
 
 import java.util.concurrent.ConcurrentHashMap
-import scala.annotation.unused
 import scala.jdk.CollectionConverters.EnumerationHasAsScala
 
 private object ExecutionLogs {
   def logDependencyTree(
       interGroupDeps: Map[Task[?], Seq[Task[?]]],
       indexToTerminal: Array[Task[?]],
-      @unused outPath: os.Path,
       runArtifacts: LauncherOutFiles
   ): Unit = {
     val dependencyTreePath = os.Path(runArtifacts.dependencyTree)
@@ -28,7 +26,6 @@ private object ExecutionLogs {
   }
   def logInvalidationTree(
       interGroupDeps: Map[Task[?], Seq[Task[?]]],
-      @unused outPath: os.Path,
       runArtifacts: LauncherOutFiles,
       uncached: ConcurrentHashMap[Task[?], Unit],
       changedValueHash: ConcurrentHashMap[Task[?], Unit],

core/exec/src/mill/exec/GroupExecution.scala

@@ -57,7 +57,6 @@ trait GroupExecution {
   def env: Map[String, String]
   def failFast: Boolean
   def ec: Option[ThreadPoolExecutor]
-  def isFinalDepth: Boolean
   def codeSignatures: Map[String, Int]
   def systemExit: ( /* reason */ String, /* exitCode */ Int) => Nothing
   def exclusiveSystemStreams: SystemStreams
@@ -287,12 +286,6 @@ trait GroupExecution {
             kind
           )
 
-        def withTaskWriteLock[T](t: LauncherLocking.Lease => T): T = {
-          val lease = acquireTaskLock(LauncherLocking.LockKind.Write)
-          try t(lease)
-          finally lease.close()
-        }
-
         // Helper to evaluate the task with full caching support
         def evaluateTaskWithCaching(): GroupExecution.Results = {
           case class CacheProbe(
@@ -438,7 +431,8 @@ trait GroupExecution {
         // Helper to evaluate build override only (no task evaluation)
         def evaluateBuildOverrideOnly(located: Located[Appendable[BufferedValue]])
             : GroupExecution.Results = {
-          withTaskWriteLock { _ =>
+          val lease = acquireTaskLock(LauncherLocking.LockKind.Write)
+          try {
             val (execRes, serializedPaths) =
               if (os.Path(labelled.ctx.fileName).endsWith("mill-build/build.mill")) {
                 val msg =
@@ -465,7 +459,7 @@ trait GroupExecution {
                 }
               }
             cachedResult(execRes, serializedPaths)
-          }
+          } finally lease.close()
         }
 
         // Three-way conditional:

core/internal/src/mill/internal/LauncherRecordStore.scala

@@ -28,15 +28,7 @@ private[mill] object LauncherRecordStore {
       ))
     catch { case _: Throwable => () }
 
-  def sweepActive(out: os.Path): Seq[Record] = {
-    val dir = out / os.RelPath(DaemonFiles.millLauncherFiles)
-    if (!os.exists(dir)) Nil
-    else
-      os.list(dir)
-        .filter(os.isFile(_))
-        .flatMap(readActiveRecord(_, removeStale = true))
-        .sortBy(record => runIdSortKey(record.runId))
-  }
+  def sweepActive(out: os.Path): Seq[Record] = scanActive(out, removeStale = true)
 
   def mostRecentActive(out: os.Path): Option[Record] =
     scanActive(out, removeStale = false).lastOption

core/internal/src/mill/internal/OutputDirectoryLayout.scala

@@ -22,7 +22,7 @@ private[mill] object OutputDirectoryLayout {
       }.flatten
     }
 
-  def effectiveEnvForOutMode(
+  private def effectiveEnvForOutMode(
       outMode: OutFolderMode,
       workDir: os.Path,
       env: Map[String, String]

integration/bsp-util/src/BspServerTestUtil.scala

@@ -284,22 +284,9 @@ object BspServerTestUtil {
   }
 
   private def waitForProcessExit(proc: os.SubProcess, timeoutMillis: Long): Unit = {
-    val waitIntervalMillis = 50L
-    val deadlineNanos = System.nanoTime() + timeoutMillis * 1000000L
-
-    while (proc.isAlive() && System.nanoTime() < deadlineNanos) {
-      Thread.sleep(waitIntervalMillis)
-    }
-
-    if (proc.isAlive()) {
+    if (!proc.waitFor(timeoutMillis)) {
       proc.destroy(recursive = false)
-
-      val shutdownDeadlineNanos = System.nanoTime() + 5000L * 1000000L
-      while (proc.isAlive() && System.nanoTime() < shutdownDeadlineNanos) {
-        Thread.sleep(waitIntervalMillis)
-      }
-
-      if (proc.isAlive()) {
+      if (!proc.waitFor(5000L)) {
         throw new RuntimeException("BSP server did not exit within the expected timeout")
       }
     }

integration/dedicated/bsp-server-error/src/BspServerErrorTests.scala

@@ -45,10 +45,7 @@ object BspServerErrorTests extends UtestIntegrationTestSuite {
         bspLog = Some((bytes, len) => stderr.write(bytes, 0, len))
       ) { (buildServer, initRes) =>
 
-        val firstServerDeadline = System.nanoTime() + 5000L * 1000000L
-        while (firstServerProc.isAlive() && System.nanoTime() < firstServerDeadline) {
-          Thread.sleep(50L)
-        }
+        firstServerProc.waitFor(5000L)
         assert(!firstServerProc.isAlive())
 
         val firstServerStderrStr = new String(firstServerStderr.toByteArray)

integration/dedicated/bsp-server-reload/src/BspServerReloadTests.scala

@@ -93,10 +93,7 @@ object BspServerReloadTests extends UtestIntegrationTestSuite {
         def eventData(event: b.BuildTargetEvent): (String, b.BuildTargetEventKind) =
           (event.getTarget.getUri.split("/").last, event.getKind)
 
-        // `lib` is not in this set: its bspBuildTarget snapshot (displayName,
-        // baseDirectory, tags, languageIds, capabilities, plus its
-        // dependencyUris) is unchanged across the build.mill edit, so the
-        // ChangeNotifier correctly does not fire a CHANGED event for it.
+        // `lib`'s target snapshot is unchanged across the build.mill edit.
         val expectedChanges = Set(
           "thing" -> b.BuildTargetEventKind.DELETED,
           "app" -> b.BuildTargetEventKind.DELETED,

runner/bsp/worker/src/mill/bsp/worker/BspEvaluators.scala

@@ -11,7 +11,6 @@ import mill.api.daemon.internal.{
   TaskApi
 }
 import mill.api.daemon.internal.bsp.BspJavaModuleApi
-import mill.api.daemon.Watchable
 
 /**
  * Manages BSP module discovery and lookup for a Mill build.
@@ -20,8 +19,7 @@ import mill.api.daemon.Watchable
 class BspEvaluators(
     workspaceDir: os.Path,
     val evaluators: Seq[EvaluatorApi],
-    debug: (() => String) => Unit,
-    val watched: Seq[Watchable]
+    debug: (() => String) => Unit
 ) {
   import BspEvaluators.*
 

runner/bsp/worker/src/mill/bsp/worker/BspSessionCoordinator.scala

@@ -47,15 +47,6 @@ private[worker] class BspSessionCoordinator(
         case NonFatal(_) => None
       }
 
-    def waitForFileLock(): Locked = {
-      while (true) {
-        val tryLocked = fileLock.tryLock()
-        if (tryLocked.isLocked) return tryLocked
-        Thread.sleep(10L)
-      }
-      throw new IllegalStateException("unreachable")
-    }
-
     def terminateOther(pidOpt: Option[Long]): Unit =
       pidOpt match {
         case Some(pid) if pid == sessionProcessPid =>
@@ -128,7 +119,7 @@ private[worker] class BspSessionCoordinator(
               s"Another Mill BSP server is running with PID ${pidOpt.fold("<unknown>")(_.toString)} waiting for it to be done..."
             )
 
-          waitForFileLock()
+          fileLock.lock()
         }
 
       val daemonPid = ProcessHandle.current().pid()