Added the ability for testrunner to start the HTTP server with a random port and communicate that p…

utils/testrunner/pipeline_utils.dart

 // Copyright (c) 2012, the Dart project authors.  Please see the AUTHORS file
 // for details. All rights reserved. Use of this source code is governed by a
 // BSD-style license that can be found in the LICENSE file.
 
 part of pipeline;
 
 List stdout, stderr, log;
 var replyPort;
 int _procId = 1;
 Map _procs = {};
@@ skipping 33 matching lines @@
   var ostream = file.openOutputStream(FileMode.WRITE);
   ostream.writeString(contents);
   ostream.close();
 }
 
 /*
  * Run an external process [cmd] with command line arguments [args].
  * [timeout] can be used to forcefully terminate the process after
  * some number of seconds. This is used by runCommand and startProcess.
  * If [procId] is 0 (runCommand) then this will return a [Future] for
  * when the process terminates; if [procId] is instead non-zero

[Siggi Cherem (dart-lang), 2012/10/10 22:07:28]

nit: fix comment now that the future is always returned :)

[gram, 2012/10/10 23:36:04]

Done.

  * (startProcess) then a reference to the [Process] will be put in a
  * map with key [procId]; in this case the process can be terminated
  * later by calling [stopProcess] and passing in the [procId].
  */
 Future _processHelper(String command, List<String> args,
     [int timeout = 300, int procId = 0]) {
-  var completer = null;
+  var completer = new Completer();
   log.add('Running $command ${Strings.join(args, " ")}');
   var timer = null;
   var stdoutHandler, stderrHandler;
   var process = Process.start(command, args);
-  if (procId == 0) {
-    completer = new Completer();
-  } else {
+  if (procId != 0) {
     _procs[procId] = process;
   }
   process.onStart = () {
     timer = new Timer(1000 * timeout, (t) {
       timer = null;
       process.kill();
     });
   };
   process.onExit = (exitCode) {
     if (timer != null) {
       timer.cancel();
     }
     process.close();
     if (completer != null) {
       completer.complete(exitCode);
     }
   };
   process.onError = (e) {
     stderr.add("Error starting process:");
     stderr.add("  Command: $command");
     stderr.add("  Error: $e");
     completePipeline(-1);
   };
 
   _pipeStream(process.stdout, stdout);
   _pipeStream(process.stderr, stderr);
 
-  return (completer == null) ? null : completer.future;
+  return completer.future;
 }
 
 void _pipeStream(InputStream stream, List<String> destination) {
   var source = new StringInputStream(stream);
   source.onLine = () {
     if (source.available() == 0) return;
     var line = source.readLine();
     while (null != line) {
       if (config["immediate"] && line.startsWith('###')) {
         // TODO - when we dump the list later skip '###' messages if immediate.
@@ skipping 14 matching lines @@
 Future runCommand(String command, List<String> args, [int timeout = 300]) {
   return _processHelper(command, args, timeout);
 }
 
 /**
  * Start an external process [cmd] with command line arguments [args].
  * Returns an ID by which it can later be stopped.
  */
 int startProcess(String command, List<String> args) {
   int id = _procId++;
-  _processHelper(command, args, 3000, id);
+  _processHelper(command, args, 3000, id).then((e) {
+    _procs.remove(id);
+  });
   return id;
 }
 
+/** Checks if a process is still running. */
+bool isProcessRunning(int id) {
+  return _procs.containsKey(id);
+}
+
 /**
  * Stop a process previously started with [startProcess] or [runCommand],
  * given the id string.
  */
 void stopProcess(int id) {
-  Process p = _procs.remove(id);
-  p.kill();
+  if (_procs.containsKey(id)) {
+    Process p = _procs.remove(id);
+    p.kill();
+  }
 }
 
 /** Delete a file named [fname] if it exists. */
 bool cleanup(String fname) {
   if (fname != null && !config['keep-files']) {
     var f = new File(fname);
     try {
       if (f.existsSync()) {
         logMessage('Removing $fname');
         f.deleteSync();
@@ skipping 11 matching lines @@
   stderr = new List();
   log = new List();
 }
 
 void completePipeline([exitCode = 0]) {
   replyPort.send([stdout, stderr, log, exitCode]);
 }
 
 /** Utility function to log diagnostic messages. */
 void logMessage(msg) => log.add(msg);