Merge pull request #2 from tgodzik/process-handle

use ProcessHandle instead of graalvm substitutions
scalacenter · Jul 3, 2024 · cf59ced · cf59ced
2 parents a128065 + ffff810
commit cf59ced
Show file tree

Hide file tree

Showing 7 changed files with 6 additions and 101 deletions.
diff --git a/build.sc b/build.sc
@@ -26,9 +26,6 @@ def tmpDirBase =
 
 class Library(val crossScalaVersion: String) extends CrossScalaModule with LibDaemonPublish {
   def artifactName = "libdaemon"
-  def compileIvyDeps = super.compileIvyDeps() ++ Seq(
-    ivy"org.graalvm.nativeimage:svm:21.2.0"
-  )
   def javacOptions = super.javacOptions() ++ Seq(
     "--release",
     "16"

diff --git a/library/src/libdaemonjvm/internal/IsRunning.java b/library/src/libdaemonjvm/internal/IsRunning.java
diff --git a/library/src/libdaemonjvm/internal/IsRunningSubst.java b/library/src/libdaemonjvm/internal/IsRunningSubst.java
diff --git a/library/src/libdaemonjvm/internal/LockProcess.scala b/library/src/libdaemonjvm/internal/LockProcess.scala
@@ -8,13 +8,12 @@ trait LockProcess {
 object LockProcess {
   class Default extends LockProcess {
     def pid(): Int =
-      Option((new Pid).get()).map(n => (n: Int)).getOrElse {
-        sys.error("Cannot get PID")
-      }
-    def isRunning(pid: Int): Boolean =
-      Option((new IsRunning).isRunning(pid)).map(b => (b: Boolean)).getOrElse {
-        Processes.isRunning(pid)
-      }
+      ProcessHandle.current().pid().toInt
+    def isRunning(pid: Int): Boolean = {
+      val maybeHandle = ProcessHandle.of(pid)
+      if (maybeHandle.isEmpty) false
+      else maybeHandle.get.isAlive
+    }
   }
 
   def default: LockProcess =

diff --git a/library/src/libdaemonjvm/internal/Pid.java b/library/src/libdaemonjvm/internal/Pid.java
diff --git a/library/src/libdaemonjvm/internal/PidSubst.java b/library/src/libdaemonjvm/internal/PidSubst.java
diff --git a/library/src/libdaemonjvm/internal/Processes.scala b/library/src/libdaemonjvm/internal/Processes.scala