isolate lib: small refactor to distinguish protocols at the port level

frog/lib/isolate_serialization.dart

Index: frog/lib/isolate_serialization.dart
diff --git a/frog/lib/isolate_serialization.dart b/frog/lib/isolate_serialization.dart
index 2ab10a3b45d0d2303f005c98e31c3a84c66db48d..cd1c9c56a5bcd6182b41b566b1091858f5523b62 100644
--- a/frog/lib/isolate_serialization.dart
+++ b/frog/lib/isolate_serialization.dart
@@ -50,7 +50,8 @@ class MessageTraverser {
     if (isPrimitive(x)) return visitPrimitive(x);
     if (x is List) return visitList(x);
     if (x is Map) return visitMap(x);
-    if (x is SendPortImpl) return visitSendPort(x);
+    if (x is NativeJsSendPort) return visitNativeJsSendPort(x);
+    if (x is WorkerSendPort) return visitWorkerSendPort(x);
     if (x is ReceivePortImpl) return visitReceivePort(x);
     if (x is ReceivePortSingleShotImpl) return visitReceivePortSingleShot(x);
     // TODO(floitsch): make this a real exception. (which one)?
@@ -60,7 +61,8 @@ class MessageTraverser {
   abstract visitPrimitive(x);
   abstract visitList(List x);
   abstract visitMap(Map x);
-  abstract visitSendPort(SendPortImpl x);
+  abstract visitNativeJsSendPort(NativeJsSendPort x);
+  abstract visitWorkerSendPort(WorkerSendPort x);
   abstract visitReceivePort(ReceivePortImpl x);
   abstract visitReceivePortSingleShot(ReceivePortSingleShotImpl x);
 
@@ -110,10 +112,13 @@ class Copier extends MessageTraverser {
     return copy;
   }
 
-  SendPort visitSendPort(SendPortImpl port) {
-    return new SendPortImpl(port._workerId,
-                            port._isolateId,
-                            port._receivePortId);
+  SendPort visitNativeJsSendPort(NativeJsSendPort port) {
+    return new NativeJsSendPort(port._receivePort, port._isolateId);
+  }
+
+  SendPort visitWorkerSendPort(WorkerSendPort port) {
+    return new WorkerSendPort(
+        port._workerId, port._isolateId, port._receivePortId);
   }
 
   SendPort visitReceivePort(ReceivePortImpl port) {
@@ -154,16 +159,21 @@ class Serializer extends MessageTraverser {
     return ['map', id, keys, values];
   }
 
-  visitSendPort(SendPortImpl port) {
+  visitNativeJsSendPort(NativeJsSendPort port) {
+    return ['sendport', _globalState.currentWorkerId,
+        port._isolateId, port._receivePort._id];
+  }
+
+  visitWorkerSendPort(WorkerSendPort port) {
     return ['sendport', port._workerId, port._isolateId, port._receivePortId];
   }
 
   visitReceivePort(ReceivePortImpl port) {
-    return visitSendPort(port.toSendPort());;
+    return visitNativeJsSendPort(port.toSendPort());;
   }
 
   visitReceivePortSingleShot(ReceivePortSingleShotImpl port) {
-    return visitSendPort(port.toSendPort());
+    return visitNativeJsSendPort(port.toSendPort());
   }
 
   _serializeList(List list) {
@@ -245,7 +255,14 @@ class Deserializer {
     int workerId = x[1];
     int isolateId = x[2];
     int receivePortId = x[3];
-    return new SendPortImpl(workerId, isolateId, receivePortId);
+    if (workerId == _globalState.currentWorkerId) {

[eub, 2012/02/09 01:13:42]

Do we want to distinguish the serialization token string between the two types
of send ports instead of using this somewhat magic test?  Or is the magic better
since non-redundant?

[Siggi Cherem (dart-lang), 2012/02/10 00:16:41]

The magic is actually important for two reasons: check that we only create a
native port when we are in the correct worker (the redundancy issue you raised),
and normalize how ports are used. For the latter, we want to 'short-circuit'
ports that come back to the same worker. If I have 3 isolates, with A and B in
the same worker and C in a different one, then passing a port from A to C to B
should create a direct (nativejs) port B->A.

+      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);
+    }
   }
 
   // TODO(floitsch): this should by Map<int, var> or Map<int, Dynamic>.