Rename docker attribute to pipe

Author: csev

play.php

@@ -34,7 +34,7 @@
 
 $retval = U::get($_SESSION, 'retval');
 
-if ( is_object($retval) && is_object($retval->docker) && strlen(U::get($_POST, "emcc_output", '')) > 0 ) {
+if ( is_object($retval) && is_object($retval->pipe) && strlen(U::get($_POST, "emcc_output", '')) > 0 ) {
     cc4e_emcc_get_output($retval, $displayname, $email, $_SESSION['id']);
     $_SESSION['retval'] = $retval;
 }
@@ -135,8 +135,8 @@
 </textarea>
 </p>
 </form>
-<?php if ( is_object($retval) && isset($retval->docker) && is_object($retval->docker) && is_string($retval->docker->stdout) && strlen($retval->docker->stdout) > 0 ) {
-  $rows = substr_count( $retval->docker->stdout, "\n" );
+<?php if ( is_object($retval) && isset($retval->pipe) && is_object($retval->pipe) && is_string($retval->pipe->stdout) && strlen($retval->pipe->stdout) > 0 ) {
+  $rows = substr_count( $retval->pipe->stdout, "\n" );
   if ( $rows < 5 ) $rows = 5;
   if ( $rows > 30 ) $rows = 30;
 ?>
@@ -145,7 +145,7 @@
 </p>
 <p>
 <textarea id="myoutput" name="output" style="width:100%; border: 1px black solid;" rows="<?= $rows ?>">
-<?php echo(htmlentities($retval->docker->stdout)); ?>
+<?php echo(htmlentities($retval->pipe->stdout)); ?>
 </textarea>
 </p>
 <?php } ?>

play_util.php

@@ -28,7 +28,7 @@ function cc4e_play_header($lines)  {
 function cc4e_play_errors($retval) { 
     global $LOGGED_IN;
     if ( ! $LOGGED_IN ) return false;
-    $compiler = $retval->docker->stderr ?? false;
+    $compiler = $retval->pipe->stderr ?? false;
 
     if ( is_string($compiler) && strlen($compiler) > 0 ) {
         echo '<pre style="color:red;">'."\n";
@@ -50,7 +50,7 @@ function cc4e_play_errors($retval) {
     } else if ( isset($retval->hasmain) && $retval->hasmain === false ) {
         echo('<p style="color:blue;">Compile only: You need a main() for your code to be run</p>'."\n");
         return true;
-    } else if ( isset($retval->docker->stdout) && strlen($retval->docker->stdout) > 0 ) {
+    } else if ( isset($retval->pipe->stdout) && strlen($retval->pipe->stdout) > 0 ) {
         return false;
     } else if ( isset($retval->minimum) && $retval->minimum === false ) {
          echo('<p style="color:red;">Your program did not produce any output</p>'."\n");
@@ -85,13 +85,13 @@ function cc4e_play_output($retval) {
 <?php
 if ( ! $LOGGED_IN ) return;
 // https://stackoverflow.com/questions/3008035/stop-an-input-field-in-a-form-from-being-submitted
-if ( isset($retval->docker->stdout) ) {
+if ( isset($retval->pipe->stdout) ) {
     echo '<form style="color: blue;">'."\n";
     echo '<div style="color: blue;">'."\n";
     echo "Output from your program:\n\n";
     // echo '<textarea id="myouput" readonly name="output" style="color: blue; width:100%; border: 1px black solid;">';
     echo('<div id="myoutput" class="xpre_text"><pre>');
-    echo(htmlentities($retval->docker->stdout, ENT_NOQUOTES));
+    echo(htmlentities($retval->pipe->stdout, ENT_NOQUOTES));
     // echo("</textarea>\n");
     echo("</pre></div>\n");
     echo("</div>\n");

sandbox/check/test.php

@@ -18,7 +18,7 @@
     $fail = false;
 
     $compile = $retval->assembly->status == 0;
-    $failure = isset($retval->docker->failure) && is_string($retval->docker->failure) ? $retval->docker->failure : false;
+    $failure = isset($retval->pipe->failure) && is_string($retval->pipe->failure) ? $retval->pipe->failure : false;
 
     if ( ! $compile ) {
        $fail = "Compiler error"; 
@@ -47,10 +47,10 @@
             } else if ( strpos($failure, "exceeded")> 0  && $stdout ) {
                 // Cool
             } else {
-                $fail = "Docker failure: ". $failure;
+                $fail = "Pipe/process failure: ". $failure;
             }
-        } else if ( isset($retval->docker->stdout) )  {
-            $output =  $retval->docker->stdout;
+        } else if ( isset($retval->pipe->stdout) )  {
+            $output =  $retval->pipe->stdout;
             if ( strlen($output) < 1 ) {
                 $fail = "Did not produce any output";
             }

sandbox/sandbox.php

@@ -221,13 +221,13 @@ function cc4e_emcc($user_id, $code, $input, $main=null, $note=null)
     $env = null;
     $timeout = 10.0;
 
-    $retval->docker = cc4e_pipe($command, $stdin, $cwd, $env, $timeout);
+    $retval->pipe = cc4e_pipe($command, $stdin, $cwd, $env, $timeout);
 
     $retval->tempdir = $tempdir;
     $retval->user_id = $user_id;
 
     $hexfolder = bin2hex($tempdir);
-    if ( strlen($retval->docker->stderr) < 1 ) {
+    if ( strlen($retval->pipe->stderr) < 1 ) {
         $retval->js = $CFG->apphome . '/emcompile/load.php/' . $hexfolder . '/a.out.js';
         $retval->wasm = $CFG->apphome . '/emcompile/load.php/' . $hexfolder . '/a.out.wasm';
         $retval->hasmain = true;
@@ -243,7 +243,7 @@ function cc4e_emcc($user_id, $code, $input, $main=null, $note=null)
 function cc4e_emcc_get_output($retval, $displayname, $email, $user_id)
 {
     if ( ! is_object($retval) ) return;
-    if ( ! is_object($retval->docker) ) return;
+    if ( ! is_object($retval->pipe) ) return;
     if ( strlen(U::get($_POST, "emcc_output", '')) < 1 ) return;
 
     $tempdir = $retval->tempdir ?? '';
@@ -254,7 +254,7 @@ function cc4e_emcc_get_output($retval, $displayname, $email, $user_id)
     } else {
         $output = substr(U::get($_POST, 'emcc_output', ''), 0, 20000);
         $_SESSION['output'] = $output;
-        $retval->docker->stdout = $output;
+        $retval->pipe->stdout = $output;
         $retval->output = $output;
         $retval->displayname = $displayname;
         $retval->email = $email;
@@ -500,10 +500,10 @@ function cc4e_rate_limit($retval)
     if ( $count >= $BUCKET_SIZE ) {
         if ( ! is_object($retval) ) {
             $retval = new \stdClass();
-            $retval->docker = new \stdClass();
+            $retval->pipe = new \stdClass();
         }
-        $retval->docker->stdout = "";
-        $retval->docker->stderr = "Rate Exceeded...";
+        $retval->pipe->stdout = "";
+        $retval->pipe->stderr = "Rate Exceeded...";
         $_SESSION['retval'] = $retval;
         return true;
     } else {

tools/ccauto/index.php

@@ -163,7 +163,7 @@
 $retval = U::get($_SESSION, 'retval');
 $actual = U::get($_SESSION, 'actual');
 
-if ( is_object($retval) && is_object($retval->docker) && strlen(U::get($_POST, "emcc_output", '')) > 0 ) {
+if ( is_object($retval) && is_object($retval->pipe) && strlen(U::get($_POST, "emcc_output", '')) > 0 ) {
     $_SESSION['actual'] = U::get($_POST, 'emcc_output', '');
     cc4e_emcc_get_output($retval, $displayname, $email, $LAUNCH->user->id);
     $_SESSION['retval'] = $retval;
@@ -199,7 +199,7 @@
             return;
         }
         $_SESSION['retval'] = $retval;
-        $actual = isset($retval->docker->stdout) && strlen($retval->docker->stdout) > 0 ? $retval->docker->stdout : false;
+        $actual = isset($retval->pipe->stdout) && strlen($retval->pipe->stdout) > 0 ? $retval->pipe->stdout : false;
         $_SESSION['actual'] = $actual;
         $_SESSION['checkgrade'] = 'true';
     }