We have signal in JVM; re-order and remove #?jvm.

rakudo · Jun 12, 2017 · 055cf75 · 055cf75
1 parent 5154b62
commit 055cf75
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 4 deletions.
diff --git a/src/core/Proc/Async.pm b/src/core/Proc/Async.pm
@@ -242,7 +242,6 @@ my class Proc::Async {
             CLONE-HASH-DECONTAINERIZED(%ENV),
             $callbacks,
         );
-
         Promise.allof( $!exit_promise, @!promises ).then({
             $!exit_promise.status == Broken
                 ?? $!exit_promise.cause.throw
@@ -305,12 +304,10 @@ my class Proc::Async {
     # Note: some of the duplicated code in methods could be moved to
     # proto, but at the moment (2017-06-02) that makes the call 24% slower
     proto method kill(|) { * }
-#?if !jvm
     multi method kill(Proc::Async:D: Signal:D \signal = SIGHUP) {
         X::Proc::Async::MustBeStarted.new(:method<kill>, proc => self).throw if !$!started;
         nqp::killprocasync($!process_handle, signal.value)
     }
-#?endif
     multi method kill(Proc::Async:D: Int:D \signal) {
         X::Proc::Async::MustBeStarted.new(:method<kill>, proc => self).throw if !$!started;
         nqp::killprocasync($!process_handle, signal)

diff --git a/tools/build/jvm_core_sources b/tools/build/jvm_core_sources
@@ -149,11 +149,11 @@ src/core/IO/Socket.pm
 src/core/IO/Socket/INET.pm
 src/core/IO/Socket/Async.pm
 src/core/Proc.pm
+src/core/signals.pm
 src/core/Proc/Async.pm
 src/core/Systemic.pm
 src/core/VM.pm
 src/core/Distro.pm
-src/core/signals.pm
 src/core/Kernel.pm
 src/core/Compiler.pm
 src/core/Perl.pm