Skip to content

Commit cf59ced

Browse files
authored
Merge pull request #2 from tgodzik/process-handle
use ProcessHandle instead of graalvm substitutions
2 parents a128065 + ffff810 commit cf59ced

File tree

7 files changed

+6
-101
lines changed

7 files changed

+6
-101
lines changed

build.sc

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -26,9 +26,6 @@ def tmpDirBase =
2626

2727
class Library(val crossScalaVersion: String) extends CrossScalaModule with LibDaemonPublish {
2828
def artifactName = "libdaemon"
29-
def compileIvyDeps = super.compileIvyDeps() ++ Seq(
30-
ivy"org.graalvm.nativeimage:svm:21.2.0"
31-
)
3229
def javacOptions = super.javacOptions() ++ Seq(
3330
"--release",
3431
"16"

library/src/libdaemonjvm/internal/IsRunning.java

Lines changed: 0 additions & 7 deletions
This file was deleted.

library/src/libdaemonjvm/internal/IsRunningSubst.java

Lines changed: 0 additions & 18 deletions
This file was deleted.

library/src/libdaemonjvm/internal/LockProcess.scala

Lines changed: 6 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -8,13 +8,12 @@ trait LockProcess {
88
object LockProcess {
99
class Default extends LockProcess {
1010
def pid(): Int =
11-
Option((new Pid).get()).map(n => (n: Int)).getOrElse {
12-
sys.error("Cannot get PID")
13-
}
14-
def isRunning(pid: Int): Boolean =
15-
Option((new IsRunning).isRunning(pid)).map(b => (b: Boolean)).getOrElse {
16-
Processes.isRunning(pid)
17-
}
11+
ProcessHandle.current().pid().toInt
12+
def isRunning(pid: Int): Boolean = {
13+
val maybeHandle = ProcessHandle.of(pid)
14+
if (maybeHandle.isEmpty) false
15+
else maybeHandle.get.isAlive
16+
}
1817
}
1918

2019
def default: LockProcess =

library/src/libdaemonjvm/internal/Pid.java

Lines changed: 0 additions & 16 deletions
This file was deleted.

library/src/libdaemonjvm/internal/PidSubst.java

Lines changed: 0 additions & 18 deletions
This file was deleted.

library/src/libdaemonjvm/internal/Processes.scala

Lines changed: 0 additions & 32 deletions
This file was deleted.

0 commit comments

Comments
 (0)