isolates: remove Isolate2 interface, add top-level spawn functions, more comments

lib/isolate/frog/isolateimpl.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.
 
-/** Implementation of [Isolate2]. */
-class _Isolate2Impl implements Isolate2 {
-  SendPort sendPort;
-
-  _Isolate2Impl(this.sendPort);
-}
-
 /**
  * A native object that is shared across isolates. This object is visible to all
  * isolates running on the same worker (either UI or background web worker).
  *
  * This is code that is intended to 'escape' the isolate boundaries in order to
  * implement the semantics of isolates in JavaScript. Without this we would have
  * been forced to implement more code (including the top-level event loop) in
  * JavaScript itself.
  */
 GlobalState get globalState() native "return \$globalState;";
@@ skipping 371 matching lines @@
    */
   static _getEventData(e) native "return e.data";
 
   /**
    * Process messages on a worker, either to control the worker instance or to
    * pass messages along to the isolate running in the worker.
    */
   static void _processWorkerMessage(sender, e) {
     var msg = _deserializeMessage(_getEventData(e));
     switch (msg['command']) {
-      // TODO(sigmund): delete after we migrate to Isolate2
+      // TODO(sigmund): delete after we migrate to the new API
       case 'start':
         globalState.currentWorkerId = msg['id'];
         var runnerObject =
             _allocate(_getJSConstructorFromName(msg['factoryName']));
         var serializedReplyTo = msg['replyTo'];
         globalState.topEventLoop.enqueue(new IsolateContext(), function() {
           var replyTo = _deserializeMessage(serializedReplyTo);
           _startIsolate(runnerObject, replyTo);
         }, 'worker-start');
         globalState.topEventLoop.run();
         break;
       case 'start2':
         globalState.currentWorkerId = msg['id'];
         Function entryPoint = _getJSFunctionFromName(msg['functionName']);
         var replyTo = _deserializeMessage(msg['replyTo']);
         globalState.topEventLoop.enqueue(new IsolateContext(), function() {
           _startIsolate2(entryPoint, replyTo);
         }, 'worker-start');
         globalState.topEventLoop.run();
         break;
-      // TODO(sigmund): delete after we migrate to Isolate2
+      // TODO(sigmund): delete after we migrate to the new API
       case 'spawn-worker':
         _spawnWorker(msg['factoryName'], msg['replyPort']);
         break;
       case 'spawn-worker2':
         _spawnWorker2(msg['functionName'], msg['uri'], msg['replyPort']);
         break;
       case 'message':
         msg['port'].send(msg['msg'], msg['replyTo']);
         globalState.topEventLoop.run();
         break;
@@ skipping 145 matching lines @@
           'replyPort': replyPort}));
     } else {
       _spawnWorker2(functionName, uri, replyPort);
     }
   }
 
   static SendPort _startNonWorker2(
       String functionName, String uri, SendPort replyPort) {
     // TODO(eub): support IE9 using an iframe -- Dart issue 1702.
     if (uri != null) throw new UnsupportedOperationException(
-            "Currently Isolate2.fromUri is not supported without web workers.");
+            "Currently spawnUri is not supported without web workers.");
     globalState.topEventLoop.enqueue(new IsolateContext(), function() {
       final func = _getJSFunctionFromName(functionName);
       _startIsolate2(func, replyPort);
     }, 'nonworker start');
   }
 
   static void _startIsolate2(Function topLevel, SendPort replyTo) {
     fillStatics(globalState.currentContext);
-    final port = new ReceivePort();
+    _port = new ReceivePort();
     replyTo.send(_SPAWNED_SIGNAL, port.toSendPort());
-    topLevel(port);
+    topLevel();
   }
 
   /**
    * Spawns an isolate in a worker. [factoryName] is the Javascript constructor
    * name for the isolate entry point class.
    */
   static void _spawnWorker2(functionName, uri, replyPort) {
-    // TODO(eub): convert to 'main' once we switch back to port at top-level.
-    if (functionName == null) functionName = 'isolateMain';
+    if (functionName == null) functionName = 'main';
     if (uri == null) uri = _thisScript;
     if (!(new Uri.fromString(uri).isAbsolute())) {
       // The constructor of dom workers requires an absolute URL. If we use a
       // relative path we will get a DOM exception.
       String prefix = _thisScript.substring(0, _thisScript.lastIndexOf('/'));
       uri = "$prefix/$uri";
     }
     final worker = _newWorker(uri);
     worker.onmessage = (e) { _processWorkerMessage(worker, e); };
     var workerId = globalState.nextWorkerId++;
     // We also store the id on the worker itself so that we can unregister it.
     worker.id = workerId;
     globalState.workers[workerId] = worker;
     worker.postMessage(_serializeMessage({
       'command': 'start2',
       'id': workerId,
       // Note: we serialize replyPort twice because the child worker needs to
       // first deserialize the worker id, before it can correctly deserialize
       // the port (port deserialization is sensitive to what is the current
       // workerId).
       'replyTo': _serializeMessage(replyPort),
       'functionName': functionName }));
   }
 }