Update Isolate API.

sdk/lib/_internal/compiler/js_lib/isolate_helper.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.
 
 library _isolate_helper;
 
 import 'dart:_js_embedded_names' show
     CLASS_ID_EXTRACTOR,
     CLASS_FIELDS_EXTRACTOR,
     CREATE_NEW_ISOLATE,
@@ skipping 293 matching lines @@
   /// receive ports and no scheduled timers, because it hasn't had time to
   /// create them yet.
   bool initialized = false;
 
   // TODO(lrn): Store these in single "PauseState" object, so they don't take
   // up as much room when not pausing.
   bool isPaused = false;
   List<_IsolateEvent> delayedEvents = [];
   Set<Capability> pauseTokens = new Set();
 
-  // Container with the "on exit" handler send-ports.
+  // Container with the "on exit" handler send-ports and responses.
   var doneHandlers;
 
   /**
    * Queue of functions to call when the current event is complete.
    *
    * These events are not just put at the front of the event queue, because
    * they represent control messages, and should be handled even if the
    * event queue is paused.
    */
   var _scheduledControlEvents;
@@ skipping 23 matching lines @@
     if (pauseTokens.isEmpty) {
       while(delayedEvents.isNotEmpty) {
         _IsolateEvent event = delayedEvents.removeLast();
         _globalState.topEventLoop.prequeue(event);
       }
       isPaused = false;
     }
     _updateGlobalState();
   }
 
-  void addDoneListener(SendPort responsePort) {
+  void addDoneListener(SendPort responsePort, Object response) {
     if (doneHandlers == null) {
-      doneHandlers = [];
+      // TODO(lrn): Use map optimized for few keys.
+      doneHandlers = new HashMap();
     }
-    // If necessary, we can switch doneHandlers to a Set if it gets larger.
-    // That is not expected to happen in practice.
-    if (doneHandlers.contains(responsePort)) return;
-    doneHandlers.add(responsePort);
+    doneHandlers[responsePort] = response;
   }
 
   void removeDoneListener(SendPort responsePort) {
     if (doneHandlers == null) return;
     doneHandlers.remove(responsePort);
   }
 
   void setErrorsFatal(Capability authentification, bool errorsAreFatal) {
     if (terminateCapability != authentification) return;
     this.errorsAreFatal = errorsAreFatal;
   }
 
-  void handlePing(SendPort responsePort, int pingType) {
+  void handlePing(SendPort responsePort, int pingType, Object response) {
     if (pingType == Isolate.IMMEDIATE ||
         (pingType == Isolate.BEFORE_NEXT_EVENT &&
          !_isExecutingEvent)) {
-      responsePort.send(null);
+      responsePort.send(response);
       return;
     }
-    void respond() { responsePort.send(null); }
-    if (pingType == Isolate.AS_EVENT) {
-      _globalState.topEventLoop.enqueue(this, respond, "ping");
-      return;
-    }
+    void respond() { responsePort.send(response); }
     assert(pingType == Isolate.BEFORE_NEXT_EVENT);
     if (_scheduledControlEvents == null) {
       _scheduledControlEvents = new Queue();
     }
     _scheduledControlEvents.addLast(respond);
   }
 
   void handleKill(Capability authentification, int priority) {
     if (this.terminateCapability != authentification) return;
     if (priority == Isolate.IMMEDIATE ||
         (priority == Isolate.BEFORE_NEXT_EVENT &&
          !_isExecutingEvent)) {
       kill();
       return;
     }
-    if (priority == Isolate.AS_EVENT) {
-      _globalState.topEventLoop.enqueue(this, kill, "kill");
-      return;
-    }
     assert(priority == Isolate.BEFORE_NEXT_EVENT);
     if (_scheduledControlEvents == null) {
       _scheduledControlEvents = new Queue();
     }
     _scheduledControlEvents.addLast(kill);
   }
 
   void addErrorListener(SendPort port) {
     errorPorts.add(port);
   }
@@ skipping 73 matching lines @@
    */
   void handleControlMessage(message) {
     switch (message[0]) {
       case "pause":
         addPause(message[1], message[2]);
         break;
       case "resume":
         removePause(message[1]);
         break;
       case 'add-ondone':
-        addDoneListener(message[1]);
+        addDoneListener(message[1], message[2]);
         break;
       case 'remove-ondone':
         removeDoneListener(message[1]);
         break;
       case 'set-errors-fatal':
         setErrorsFatal(message[1], message[2]);
         break;
       case "ping":
-        handlePing(message[1], message[2]);
+        handlePing(message[1], message[2], message[3]);
         break;
       case "kill":
         handleKill(message[1], message[2]);
         break;
       case "getErrors":
         addErrorListener(message[1]);
         break;
       case "stopErrors":
         removeErrorListener(message[1]);
         break;
@@ skipping 45 matching lines @@
     // we are listening on ourselves.
     // Closes all ports, including control port.
     for (var port in ports.values) {
       port._close();
     }
     ports.clear();
     weakPorts.clear();
     _globalState.isolates.remove(id); // indicate this isolate is not active
     errorPorts.clear();
     if (doneHandlers != null) {
-      for (SendPort port in doneHandlers) {
-        port.send(null);
-      }
+      doneHandlers.forEach((port, response) { port.send(response); });
       doneHandlers = null;
     }
   }
 
   /** Unregister a port on this isolate. */
   void unregister(int portId) {
     ports.remove(portId);
     weakPorts.remove(portId);
     _updateGlobalState();
   }
@@ skipping 858 matching lines @@
   }
 
   bool operator==(Object other) {
     if (identical(other, this)) return true;
     if (other is CapabilityImpl) {
       return identical(_id, other._id);
     }
     return false;
   }
 }