Merge pull request #1455 from rdeviti/tidy-output

tidy output for remote execution

Compiler/compilerLib.py

@@ -253,6 +253,13 @@ def build_option_parser(self):
                 dest="hostfile",
                 help="hosts to execute with",
             )
+            parser.add_option(
+                "-t",
+                "--tidy_output",
+                action="store_true",
+                dest="tidy_output",
+                help="make output prints tidy and grouped by party (note: delays the prints)",
+            )
         else:
             parser.add_option(
                 "-E",
@@ -618,6 +625,12 @@ def run_with_error(i):
 
         import threading
         import random
+        import io
+
+        def run_and_capture_outputs(outputs, fn, i):
+            out = fn(i)
+            outputs[i] = out
+
         threads = []
         for i in range(len(hosts)):
             threads.append(threading.Thread(target=run_with_error, args=(i,)))
@@ -628,6 +641,14 @@ def run_with_error(i):
 
         # execution
         threads = []
+
+        # tidy up output prints
+        hide_option = False
+        if self.options.tidy_output:
+            outputs = []
+            for i in range(len(connections)):
+                outputs += [""]
+            hide_option = True
         # random port numbers to avoid conflict
         port = 10000 + random.randrange(40000)
         if '@' in hostnames[0]:
@@ -642,9 +663,15 @@ def run_with_error(i):
             run = lambda i: connections[i].run(
                 "cd %s; ./%s -p %d %s -h %s -pn %d %s" % \
                 (destinations[i], vm, i, self.prog.name, party0, port,
-                 ' '.join(args + N)))
-            threads.append(threading.Thread(target=run, args=(i,)))
+                 ' '.join(args + N)), hide=hide_option)
+            if self.options.tidy_output:
+                threads.append(threading.Thread(target=run_and_capture_outputs, args=(outputs, run, i,)))
+            else:
+                threads.append(threading.Thread(target=run, args=(i,)))
         for thread in threads:
             thread.start()
         for thread in threads:
             thread.join()
+        if self.options.tidy_output:
+            for out in outputs:
+                print(out)

README.md

@@ -366,12 +366,15 @@ There are three ways of running computation:
    ```
 
    If <path> does not start with `/` (only one `/` after the
-   hostname), the path with be relative to the home directory of the
+   hostname), the path will be relative to the home directory of the
    user. Otherwise (`//` after the hostname it will be relative to the
    root directory.
 
    It is assumed that the SSH login is possible without password.
 
+   Adding the compiler option `-t` (`--tidy_output`) groups the output prints by
+   party; however, it delays the outputs until the execution is finished.
+
 Even with the integrated execution it is important to keep in mind
 that there are two different phases, the compilation and the run-time
 phase. Any secret data is only available in the second phase, when the