Ticket #422: abcl-run-program-20161129a.diff

build.xml

@@ -68 +68 @@
       <include name="org/armedbear/lisp/scripting/*.java" if="abcl.jsr-223.p"/>
       <include name="org/armedbear/lisp/scripting/util/*.java" if="abcl.jsr-223.p"/>
       <include name="org/armedbear/Main.java"/>
+      <include name="org/abcl/**/*.java"/>
     </patternset>
 
     <patternset id="abcl.source.lisp">

new file src/org/abcl/util/ASyncIO.java

@@ +1 @@
+package org.abcl.util;
+
+import java.util.concurrent.ThreadPoolExecutor;
+import java.util.concurrent.TimeUnit;
+import java.util.concurrent.BlockingQueue;
+import java.util.concurrent.SynchronousQueue;
+
+public class ASyncIO
+{
+  static int poolSize = 1;
+  static int minPoolSize = 1;
+  static long keepAlive = 256;
+  static TimeUnit keepAliveUnit = TimeUnit.DAYS;
+  static BlockingQueue<Runnable> queue = null;
+
+  static ThreadPoolExecutor pool = null; 
+
+  public ASyncIO() {
+    if (queue == null) {
+      queue = new SynchronousQueue();
+      pool = new ThreadPoolExecutor(poolSize, minPoolSize, keepAlive, keepAliveUnit,
+                                    queue);
+    }
+  }
+}
+  

new file src/org/abcl/util/StreamTask.java

@@ +1 @@
+package org.abcl.util;
+
+public class StreamTask
+  implements Runnable
+{
+  public void run() {
+    int i = 42;
+  }
+}

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

@@ -163 +163 @@
         process))))
 
 (defconstant +inherit+
-  (java:jfield "java.lang.ProcessBuilder$Redirect" "INHERIT"))
+  (ignore-errors
+    (java:jfield "java.lang.ProcessBuilder$Redirect" "INHERIT")))
+
+(defun jvm7-p ()
+  (not (null +inherit+)))
 
 (defun coerce-to-file (value)
   (java:jnew
@@ -179 +183 @@
           (error "Don't know how to set up null stream on this platform."))))))
 
 (defun setup-input-redirection (process-builder value if-does-not-exist)
+  "Returns boolean truth when input redirections has been successfully set up.
+
+As a second value, returns either nil if input should inherit from the
+parent process, or a java.io.File reference to the file to read input from."
   (let ((redirect (if (eq value T)
-                      +inherit+
+                      (when (jvm7-p) +inherit+) 
                       (let ((file (coerce-to-file value)))
                         (when value
                           (if (eq if-does-not-exist :create)
@@ -189 +197 @@
                                 (ecase if-does-not-exist
                                   (:error (error "Input file ~S does not exist." value))
                                   ((NIL) (return-from setup-input-redirection))))))
-                        (java:jstatic "from" "java.lang.ProcessBuilder$Redirect" file)))))
-    (java:jcall "redirectInput" process-builder redirect))
-  T)
+      (if (jvm7-p)
+        (java:jstatic "from" "java.lang.ProcessBuilder$Redirect" file)
+                           file)))))
+
+    (when (jvm7-p)
+  (java:jcall "redirectInput" process-builder redirect))
+    (values t redirect)))
 
 (defun setup-output-redirection (process-builder value errorp if-does-exist)
   (let ((redirect (if (eq value T)
-                      +inherit+
+                      (when (jvm7-p) +inherit+)
                       (let ((file (coerce-to-file value))
                             appendp)
                         (when (and value (probe-file value))
@@ -207 +219 @@
                                                 :if-exists if-does-exist)))
                             (:append (setf appendp T))
                             ((NIL) (return-from setup-output-redirection))))
-                        (if appendp
-                            (java:jstatic "appendTo" "java.lang.ProcessBuilder$Redirect" file)
-                            (java:jstatic "to" "java.lang.ProcessBuilder$Redirect" file))))))
-    (if errorp
-        (java:jcall "redirectError" process-builder redirect)
-        (java:jcall "redirectOutput" process-builder redirect)))
-  T)
+      (if (jvm7-p)
+        (if appendp
+            (java:jstatic "appendTo" "java.lang.ProcessBuilder$Redirect" file)
+            (java:jstatic "to" "java.lang.ProcessBuilder$Redirect" file))
+        (list file appendp))))))
+    (when  (jvm7-p)
+      (if errorp
+    (java:jcall "redirectError" process-builder redirect)
+    (java:jcall "redirectOutput" process-builder redirect)))
+    (values t redirect errorp)))
 
 ;;; The process structure.
 (defstruct (process (:constructor %make-process (jprocess)))