isolates refactor: this change introduces 'dart:isolate' as a library. This is a

lib/isolate/frog/messages.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.
 
-/**
- * Abstract visitor for dart objects that can be passed as messages between any
- * isolates.
- */
+// Defines message visitors, serialization, and deserialization.
+#library("isolate.frog.messages");
+
+#import("dart:isolate");
+#import("ports.dart");
+#import("isolateimpl.dart");
+
+/** Serialize [message] (or simulate serialization). */
+serialize(message) {
+  if (globalState.needSerialization) {
+    return new Serializer().traverse(message);
+  } else {
+    return new Copier().traverse(message);
+  }
+}
+
+/** Deserialize [message] (or simulate deserialization). */
+deserialize(message) {
+  if (globalState.needSerialization) {
+    return new Deserializer().deserialize(message);
+  } else {
+    // Nothing more to do.
+    return message;
+  }
+}
+
+/** Abstract visitor for dart objects that can be sent as isolate messages. */
 class MessageTraverser {
-  static bool isPrimitive(x) {
-    return (x === null) || (x is String) || (x is num) || (x is bool);
-  }
+
+  List _taggedObjects;
 
   MessageTraverser();
 
   /** Visitor's entry point. */
   traverse(var x) {
     if (isPrimitive(x)) return visitPrimitive(x);
     _taggedObjects = new List();
     var result;
     try {
       result = _dispatch(x);
@@ skipping 38 matching lines @@
 
   abstract visitPrimitive(x);
   abstract visitList(List x);
   abstract visitMap(Map x);
   abstract visitNativeJsSendPort(NativeJsSendPort x);
   abstract visitWorkerSendPort(WorkerSendPort x);
   abstract visitBufferingSendPort(BufferingSendPort x);
   abstract visitReceivePort(ReceivePortImpl x);
   abstract visitReceivePortSingleShot(ReceivePortSingleShotImpl x);
 
-  List _taggedObjects;
-
   _clearAttachedInfo(var o) native
       "o['__MessageTraverser__attached_info__'] = (void 0);";
 
   _setAttachedInfo(var o, var info) native
       "o['__MessageTraverser__attached_info__'] = info;";
 
   _getAttachedInfo(var o) native
       "return o['__MessageTraverser__attached_info__'];";
 
   _visitNativeOrWorkerPort(SendPort p) {
     if (p is NativeJsSendPort) return visitNativeJsSendPort(p);
     if (p is WorkerSendPort) return visitWorkerSendPort(p);
     throw "Illegal underlying port $p";
   }
+
+  static bool isPrimitive(x) {
+    return (x === null) || (x is String) || (x is num) || (x is bool);
+  }
 }
 
+
 /** A visitor that recursively copies a message. */
 class Copier extends MessageTraverser {
   Copier() : super();
 
   visitPrimitive(x) => x;
 
   List visitList(List list) {
     List copy = _getInfo(list);
     if (copy !== null) return copy;
 
@@ skipping 44 matching lines @@
     return port.toSendPort();
   }
 
   SendPort visitReceivePortSingleShot(ReceivePortSingleShotImpl port) {
     return port.toSendPort();
   }
 }
 
 /** Visitor that serializes a message as a JSON array. */
 class Serializer extends MessageTraverser {
+  int _nextFreeRefId = 0;
+
   Serializer() : super();
 
   visitPrimitive(x) => x;
 
   visitList(List list) {
     int copyId = _getInfo(list);
     if (copyId !== null) return ['ref', copyId];
 
     int id = _nextFreeRefId++;
     _attachInfo(list, id);
     var jsArray = _serializeList(list);
     // TODO(floitsch): we are losing the generic type.
     return ['list', id, jsArray];
   }
 
   visitMap(Map map) {
     int copyId = _getInfo(map);
     if (copyId !== null) return ['ref', copyId];
 
     int id = _nextFreeRefId++;
     _attachInfo(map, id);
     var keys = _serializeList(map.getKeys());
     var values = _serializeList(map.getValues());
     // TODO(floitsch): we are losing the generic type.
     return ['map', id, keys, values];
   }
 
   visitNativeJsSendPort(NativeJsSendPort port) {
-    return ['sendport', _globalState.currentWorkerId,
+    return ['sendport', globalState.currentWorkerId,
         port._isolateId, port._receivePort._id];
   }
 
   visitWorkerSendPort(WorkerSendPort port) {
     return ['sendport', port._workerId, port._isolateId, port._receivePortId];
   }
 
   visitBufferingSendPort(BufferingSendPort port) {
     if (port._port != null) {
       return _visitNativeOrWorkerPort(port._port);
@@ skipping 13 matching lines @@
   }
 
   _serializeList(List list) {
     int len = list.length;
     var result = new List(len);
     for (int i = 0; i < len; i++) {
       result[i] = _dispatch(list[i]);
     }
     return result;
   }
-
-  int _nextFreeRefId = 0;
 }
 
-/** Visitor that finds all unresolved [SendPort]s in a message. */
-class PendingSendPortFinder extends MessageTraverser {
-  List<Future<SendPort>> ports;
-  PendingSendPortFinder() : super(), ports = [];
-
-  visitPrimitive(x) {}
-  visitNativeJsSendPort(NativeJsSendPort port) {}
-  visitWorkerSendPort(WorkerSendPort port) {}
-  visitReceivePort(ReceivePortImpl port) {}
-  visitReceivePortSingleShot(ReceivePortSingleShotImpl port) {}
-
-  visitList(List list) {
-    final visited = _getInfo(list);
-    if (visited !== null) return;
-    _attachInfo(list, true);
-    // TODO(sigmund): replace with the following: (bug #1660)
-    // list.forEach(_dispatch);
-    list.forEach((e) => _dispatch(e));
-  }
-
-  visitMap(Map map) {
-    final visited = _getInfo(map);
-    if (visited !== null) return;
-
-    _attachInfo(map, true);
-    // TODO(sigmund): replace with the following: (bug #1660)
-    // map.getValues().forEach(_dispatch);
-    map.getValues().forEach((e) => _dispatch(e));
-  }
-
-  visitBufferingSendPort(BufferingSendPort port) {
-    if (port._port == null) {
-      ports.add(port._futurePort);
-    }
-  }
-}
-
-
 /** Deserializes arrays created with [Serializer]. */
 class Deserializer {
+  Map<int, Dynamic> _deserialized;
+
   Deserializer();
 
   static bool isPrimitive(x) {
     return (x === null) || (x is String) || (x is num) || (x is bool);
   }
 
   deserialize(x) {
     if (isPrimitive(x)) return x;
     // TODO(floitsch): this should be new HashMap<int, var|Dynamic>()
     _deserialized = new HashMap();
@@ skipping 47 matching lines @@
     }
     return result;
   }
 
   SendPort _deserializeSendPort(List x) {
     int workerId = x[1];
     int isolateId = x[2];
     int receivePortId = x[3];
     // If two isolates are in the same worker, we use NativeJsSendPorts to
     // deliver messages directly without using postMessage.
-    if (workerId == _globalState.currentWorkerId) {
-      var isolate = _globalState.isolates[isolateId];
+    if (workerId == globalState.currentWorkerId) {
+      var isolate = globalState.isolates[isolateId];
       if (isolate == null) return null; // Isolate has been closed.
       var receivePort = isolate.lookup(receivePortId);
       return new NativeJsSendPort(receivePort, isolateId);
     } else {
       return new WorkerSendPort(workerId, isolateId, receivePortId);
     }
   }
-
-  Map<int, Dynamic> _deserialized;
 }