Changeset 107 for java/main/src/main/java/com/framsticks/running/ExternalProcess.java

Timestamp:

09/23/13 18:54:07 (11 years ago)

Author:

psniegowski

Message:

HIGHLIGHTS:

• add SimultorProviders? hierarchy
• start Framsticks server over SSH
• FJF compatible with Framsticks 4.0rc3
• reading and writing of standard.expt
• a proof-of-concept implementation of StandardExperiment?

CHANGELOG:
Optionally return FreeAccess? from registry.

Add SimulatorRange?.

StandardExperiment? with genotypes circulation.

Automate registration around StandardState?.

More improvements to StandardExperiment?.

Skeleton version of StandardExperiment?.

Test saving of StandardState?.

Standard experiment state is being loaded.

More development towards StandardState? reading.

Work on reading standard experiment state.

Add classes for standard experiment.

Update example standard.expt

Add FreeAccess? and FreeObject?.

Made compatible with version 4.0rc3

Change deserialization policy.

Improve SSH support.

Working running simulator over SSH.

Fix joining bug in Experiment.

Working version of SimulatorRunner?.

Add more SimulatorProviders?.

Working PrimeExperimentTest? with 4.0rc3

Add references to deserialization.

Add OpaqueObject? and it's serialization.

Add deserialization of dictionaries.

Partial implementation of deserialization.

Add more tests for deserialization.

Prepare tests for deserialization.

Add proper result to prime experiment test.

Minor fixes to simulators providers.

Draft version of SimulatorProvider?.

Add SimulatorProvider? interface.

File:

• java/main/src/main/java/com/framsticks/running/ExternalProcess.java (modified) (6 diffs)

java/main/src/main/java/com/framsticks/running/ExternalProcess.java

@@ -8 +8 @@
 import java.io.PrintWriter;
 import java.util.ArrayList;
+import java.util.Arrays;
 import java.util.List;
 
@@ -31 +32 @@
 import com.framsticks.util.dispatching.ThrowExceptionHandler;
 import com.framsticks.util.io.Encoding;
+import com.framsticks.util.lang.Strings;
 
 @FramsClassAnnotation
@@ -38 +40 @@
         protected List<String> arguments = new ArrayList<>();
         protected Process process;
-        protected final ProcessBuilder builder = new ProcessBuilder();
         protected Thread<ExternalProcess> readerThread = new Thread<ExternalProcess>();
 
@@ -45 +46 @@
         protected Integer exitCode;
         protected String echoInput;
+        protected String directory;
+        protected String host;
 
         protected final EventListeners<ValueChange> listeners = new EventListeners<>();
@@ -70 +73 @@
                 setName("process");
                 arguments.add(null);
-                builder.redirectErrorStream(true);
         }
 
@@ -120 +122 @@
         @ParamAnnotation(flags = ParamFlags.USERREADONLY)
         public void setDirectory(String directory) {
-                builder.directory(new File(directory));
+                this.directory = directory;
+        }
+
+        /**
+         * @return the host
+         */
+        public String getHost() {
+                return host;
+        }
+
+        /**
+         * @param host the host to set
+         */
+        public void setHost(String host) {
+                this.host = host;
         }
 
         @ParamAnnotation
         public String getDirectory() {
-                return builder.directory() != null ? builder.directory().getName() : ".";
+                return Strings.toStringNullProof(directory, ".");
         }
 
         @Override
         protected void joinableStart() {
+
+                final ProcessBuilder builder = new ProcessBuilder();
+
+                builder.redirectErrorStream(true);
+                if (host == null) {
+                        setDirectory(System.getProperties().get("user.home") + "/" + getDirectory());
+                        setCommand(getDirectory() + "/" + getCommand());
+                        builder.directory(new File(getDirectory()));
+                } else {
+                        StringBuilder b = new StringBuilder();
+                        setCommand("./" + getCommand());
+                        for (String a : arguments) {
+                                b.append(" '").append(a).append("'");
+                        }
+                        arguments = Arrays.asList("ssh", host, "-tt", ("cd " + getDirectory() + " &&" + b.toString()));
+                }
                 log.info("running process {}", this);
+
                 builder.command(arguments);
                 try {