Changeset 15358

Timestamp:

07/30/20 14:09:11 (3 years ago)

Author:

Mark Evenson

Message:

Fix SYS:RUN-PROGRAM issues with openjdk11

On non-Windows platforms, java.lang.UNIXProcess is no longer present
in openjdk11, having been replaced with java.lang.ProcessImpl?. We now
use the platform conditionals now present in CL:*FEATURES* to choose
the present implementation to get the process id.

c.f. <​https://mailman.common-lisp.net/pipermail/armedbear-devel/2020-July/004067.html>
ff.

Fixes <https://abcl.org/trac/ticket/470>

File:

• trunk/abcl/src/org/armedbear/lisp/run-program.lisp (modified) (8 diffs)

trunk/abcl/src/org/armedbear/lisp/run-program.lisp

@@ -33 +33 @@
 (require :java)
 
-(defparameter *implementations*
-  '(:java-1.6 :java-1.7 :java-1.8)) ;; UNUSED
-(defun not-java-6 ()
-  (not (find :java-1.6 *features*)))
+(defun not-java-6-p ()
+  (not (find :java-6 *features*)))
+
+(defun pre-java-11-p ()
+  (or (find :java-6 *features*)
+      (find :java-7 *features*)
+      (find :java-8 *features*)))
 
 (export '(run-program process process-p process-input process-output
@@ -169 +172 @@
         (java:jcall "directory" process-builder (java:jnew "java.io.File" (namestring directory))))
       (let ((process 
-             (if (not-java-6)
+             (if (not-java-6-p)
                  (make-process (%process-builder-start process-builder)
                                input-stream-p output-stream-p error-stream-p)
@@ -189 +192 @@
               (threads:make-thread (lambda () (to-file error file :append appendp))))))
         (when (or wait
-                  (not-java-6)
+                  (not-java-6-p)
                   (process-wait process))
           process)))))
@@ -223 +226 @@
   (let ((redirect (if (eq value T)
                       ;; Either inherit stdio or fail
-                      (if (not-java-6)
+                      (if (not-java-6-p)
                           +inherit+
                           (signal 'implementation-not-available
@@ -238 +241 @@
                                   ((NIL)
                                    (return-from setup-input-redirection))))))
-                        (if (not-java-6)
+                        (if (not-java-6-p)
                             (java:jstatic "from" "java.lang.ProcessBuilder$Redirect" file)
                             file)))))
-    (when (not-java-6)
+    (when (not-java-6-p)
       (java:jcall "redirectInput" process-builder redirect))
     redirect))
@@ -251 +254 @@
 (defun setup-output-redirection (process-builder value errorp if-does-exist)
   (let ((redirect (if (eq value T)
-                      (if (not-java-6)
+                      (if (not-java-6-p)
                           +inherit+
                           (if errorp
@@ -269 +272 @@
                             (:append (setf appendp T))
                             ((NIL) (return-from setup-output-redirection))))
-      (if (not-java-6)
+      (if (not-java-6-p)
         (if appendp
             (java:jstatic "appendTo" "java.lang.ProcessBuilder$Redirect" file)
             (java:jstatic "to" "java.lang.ProcessBuilder$Redirect" file))
         (list file appendp))))))
-    (when (not-java-6)
+    (when (not-java-6-p)
       (if errorp
     (java:jcall "redirectError" process-builder redirect)
@@ -369 +372 @@
 (defun %process-pid (jprocess)
   (if (ext:os-unix-p)
-      ;; TODO: memoize this 
-      (let ((field (java:jcall "getDeclaredField" (java:jclass "java.lang.UNIXProcess") "pid")))
+      (let* ((process-class
+              (if (pre-java-11-p)
+                  "java.lang.UNIXProcess"
+                  "java.lang.ProcessImpl"))
+             (field
+               (java:jcall "getDeclaredField" process-class "pid")))
         (java:jcall "setAccessible" field java:+true+)
         (java:jcall "get" field jprocess))