Isolate library changes for leg support.

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.
 
 /**
  * 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;";
 set _globalState(_GlobalState val) native "\$globalState = val;";
 
 void _fillStatics(context) native @"""
   $globals = context.isolateStatics;
   $static_init();
 """;
 
+ReceivePort _port;

[ngeoffray, 2012/03/11 15:43:54]

I moved this code here because it can be shared between leg/frog. Let me know if
you prefer another place.

+
+SendPort _spawnFunction(void topLevelFunction()) {
+  final name = _IsolateNatives._getJSFunctionName(topLevelFunction);
+  if (name == null) {
+    throw new UnsupportedOperationException(
+        "only top-level functions can be spawned.");
+  }
+  return _IsolateNatives._spawn2(name, null, false);
+}
+
+SendPort _spawnUri(String uri) {
+  return _IsolateNatives._spawn2(null, uri, false);
+}
+
 /** Global state associated with the current worker. See [globalState]. */
 // TODO(sigmund): split in multiple classes: global, thread, main-worker states?
 class _GlobalState {
 
   /** Next available isolate id. */
   int nextIsolateId = 0;
 
   /** Worker id associated with this worker. */
   int currentWorkerId = 0;
 
@@ skipping 100 matching lines @@
   /** Holds isolate globals (statics and top-level properties). */
   var isolateStatics; // native object containing all globals of an isolate.
 
   _IsolateContext() {
     id = _globalState.nextIsolateId++;
     ports = {};
     initGlobals();
   }
 
   // these are filled lazily the first time the isolate starts running.
-  void initGlobals() native 'this.isolateStatics = {};';
+  void initGlobals() native @'$initGlobals(this);';

[ngeoffray, 2012/03/11 15:43:54]

Leg and Frog currently differ in where they put global state. This function will
be specialized for each compiler.

 
   /**
    * Run [code] in the context of the isolate represented by [this]. Note this
    * is called from JavaScript (see $wrap_call in corejs.dart).
    */
   void eval(Function code) {
     var old = _globalState.currentContext;
     _globalState.currentContext = this;
     this._setGlobals();
     var result = null;
     try {
       result = code();
     } finally {
       _globalState.currentContext = old;
       if (old != null) old._setGlobals();
     }
     return result;
   }
 
-  void _setGlobals() native @'$globals = this.isolateStatics;';
+  void _setGlobals() native @'$setGlobals(this);';

[ngeoffray, 2012/03/11 15:43:54]

Ditto.

 
   /** Lookup a port registered for this isolate. */
   ReceivePort lookup(int id) => ports[id];
 
   /** Register a port on this isolate. */
   void register(int portId, ReceivePort port)  {
     if (ports.containsKey(portId)) {
       throw new Exception("Registry: ports must be registered only once.");
     }
     ports[portId] = port;
@@ skipping 158 matching lines @@
       _thisScriptCache = _computeThisScript();
     }
     return _thisScriptCache;
   }
 
   static String _thisScriptCache;
 
   // TODO(sigmund): fix - this code should be run synchronously when loading the
   // script. Running lazily on DOMContentLoaded will yield incorrect results.
   static String _computeThisScript() native @"""
-    if (!$globalState.supportsWorkers || $globalState.isWorker) return null;
+    if (!$globalState.supportsWorkers || $globalState.isWorker) return (void 0);

[ngeoffray, 2012/03/11 15:43:54]

Currently leg recognizes JS undefined as Dart null. Frog can support both JS
null and undefined. So this change works for both compilers.

 
     // TODO(5334778): Find a cross-platform non-brittle way of getting the
     // currently running script.
     var scripts = document.getElementsByTagName('script');
     // The scripts variable only contains the scripts that have already been
     // executed. The last one is the currently running script.
     var script = scripts[scripts.length - 1];
     var src = script && script.src;
     if (!src) {
       // TODO()
@@ skipping 148 matching lines @@
     // When there is a match, our capture is element 1 of the results list.
     // If there is no match, match() returns null; we || this to a list
     // whose element 1 is null so everything lines up without error.
     //
     // TODO(eub): remove the toString workaround by attaching names to
     // functions where they could be needed.  For a simple
     // conservative approximation of "needed", see Siggi's option (c)
     // in discussion on the CL, 9416119.
     native @"""
     if (typeof(f.name) === 'undefined') {
-      return (f.toString().match(/function (.+)\(/) || [, null])[1];
+      return (f.toString().match(/function (.+)\(/) || [, (void 0)])[1];
     } else {
-      return f.name || null;
+      return f.name || (void 0);
     }
   """;
 
   /** Create a new JavaScript object instance given its constructor. */
   static var _allocate(var ctor) native "return new ctor();";
 
   /** Starts a non-worker isolate. */
   static SendPort _startNonWorker(Isolate runnable, SendPort replyTo) {
     // Spawn a new isolate and create the receive port in it.
     final spawned = new _IsolateContext();
@@ skipping 91 matching lines @@
       '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 }));
   }
 }