Remove old isolate API and update all code in the repository to use

tests/standalone/io/socket_stream_close_test.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.
 //
 // VMOptions=
 // VMOptions=--short_socket_read
 // VMOptions=--short_socket_write
 // VMOptions=--short_socket_read --short_socket_write
 //
 // Test socket close events.
 
 #import("dart:io");
 #import("dart:isolate");
 
 final SERVERSHUTDOWN = -1;
 final ITERATIONS = 10;
 
 
 class SocketClose {
 
   SocketClose.start(this._mode, this._donePort)
       : _receivePort = new ReceivePort(),
         _sendPort = null,
         _readBytes = 0,
         _dataEvents = 0,
         _closeEvents = 0,
         _errorEvents = 0,
         _iterations = 0 {
-    new SocketCloseServer().spawn().then((SendPort port) {
-      _sendPort = port;
-      start();
-    });
+    _sendPort = spawnFunction(startSocketCloseServer);
+    start();
   }
 
   void proceed() {
     if (_iterations < ITERATIONS) {
       new Timer(0, sendData);
     } else {
       shutdown();
     }
   }
 
@@ skipping 165 matching lines @@
 }
 
 
 class ConnectionData {
   ConnectionData(Socket this.connection) : readBytes = 0;
   Socket connection;
   int readBytes;
 }
 
 
-class SocketCloseServer extends Isolate {
+void startSocketCloseServer() {
+  var server = new SocketCloseServer();
+  port.receive((message, replyTo) {
+    server.dispatch(message, replyTo);

[kasperl, 2012/08/03 05:20:27]

!

+  });
+}
+
+
+class SocketCloseServer {
 
   static final HOST = "127.0.0.1";
 
   SocketCloseServer() : super() {}
 
-  void main() {
+  void connectionHandler(ConnectionData data) {
+    var connection = data.connection;
 
-    void connectionHandler(ConnectionData data) {
-      var connection = data.connection;
-
-      void readBytes(whenFiveBytes) {
-        var read = connection.inputStream.read();
-        data.readBytes += read.length;
-        if (data.readBytes == 5) {
-          whenFiveBytes();
-        }
-      }
-
-      void dataHandler() {
-        switch (_mode) {
-          case 0:
-            Expect.fail("No data expected");
-            break;
-          case 1:
-            readBytes(() {
-              _dataEvents++;
-            });
-            break;
-          case 2:
-            readBytes(() {
-              _dataEvents++;
-              connection.inputStream.close();
-            });
-            break;
-          case 3:
-            readBytes(() {
-              _dataEvents++;
-              connection.outputStream.write("Hello".charCodes());
-              connection.outputStream.onNoPendingWrites = () {
-                connection.inputStream.close();
-              };
-            });
-            break;
-          case 4:
-            readBytes(() {
-              _dataEvents++;
-              connection.outputStream.write("Hello".charCodes());
-              connection.inputStream.close();
-            });
-            break;
-          case 5:
-            readBytes(() {
-              _dataEvents++;
-              connection.outputStream.write("Hello".charCodes());
-            });
-            break;
-          case 6:
-          case 7:
-            readBytes(() {
-              _dataEvents++;
-              connection.outputStream.write("Hello".charCodes());
-              connection.outputStream.onNoPendingWrites = () {
-                connection.outputStream.close();
-              };
-            });
-            break;
-          case 8:
-            readBytes(() {
-              _dataEvents++;
-              connection.outputStream.write("Hello".charCodes());
-              connection.outputStream.close();
-            });
-            break;
-          default:
-            Expect.fail("Unknown test mode");
-        }
-      }
-
-      void closeHandler() {
-        _closeEvents++;
-        connection.outputStream.close();
-      }
-
-      void errorHandler(Exception e) {
-        Expect.fail("Socket error $e");
-      }
-
-      _iterations++;
-
-      connection.inputStream.onData = dataHandler;
-      connection.inputStream.onClosed = closeHandler;
-      connection.onError = errorHandler;
-    }
-
-    void errorHandlerServer(Exception e) {
-      Expect.fail("Server socket error");
-    }
-
-    waitForResult(Timer timer) {
-      // Make sure all iterations have been run. In multiple of these
-      // scenarios it is possible to get the SERVERSHUTDOWN message
-      // before we have received the last close event on the
-      // server. In these cases we wait for the correct number of
-      // close events.
-      if (_iterations == ITERATIONS &&
-          (_closeEvents == ITERATIONS ||
-           (_mode == 2 || _mode == 3 || _mode == 4))) {
-        switch (_mode) {
-          case 0:
-            Expect.equals(0, _dataEvents);
-            Expect.equals(ITERATIONS, _closeEvents);
-            break;
-          case 1:
-            Expect.equals(ITERATIONS, _dataEvents);
-            Expect.equals(ITERATIONS, _closeEvents);
-            break;
-          case 2:
-          case 3:
-          case 4:
-            Expect.equals(ITERATIONS, _dataEvents);
-            Expect.equals(0, _closeEvents);
-            break;
-          case 5:
-          case 6:
-          case 7:
-          case 8:
-            Expect.equals(ITERATIONS, _dataEvents);
-            Expect.equals(ITERATIONS, _closeEvents);
-            break;
-          default:
-            Expect.fail("Unknown test mode");
-        }
-        Expect.equals(0, _errorEvents);
-        _server.close();
-        this.port.close();
-        _donePort.send(null);
-      } else {
-        new Timer(100, waitForResult);
+    void readBytes(whenFiveBytes) {
+      var read = connection.inputStream.read();
+      data.readBytes += read.length;
+      if (data.readBytes == 5) {
+        whenFiveBytes();
       }
     }
 
-    this.port.receive((message, SendPort replyTo) {
-      _donePort = replyTo;
-      if (message != SERVERSHUTDOWN) {
-        _readBytes = 0;
-        _errorEvents = 0;
-        _dataEvents = 0;
-        _closeEvents = 0;
-        _iterations = 0;
-        _mode = message;
-        _server = new ServerSocket(HOST, 0, 10);
-        Expect.equals(true, _server !== null);
-        _server.onConnection = (connection) {
-          var data = new ConnectionData(connection);
-          connectionHandler(data);
-        };
-        _server.onError = errorHandlerServer;
-        replyTo.send(_server.port, null);
-      } else {
-        new Timer(0, waitForResult);
+    void dataHandler() {
+      switch (_mode) {
+        case 0:
+          Expect.fail("No data expected");
+          break;
+        case 1:
+          readBytes(() {
+            _dataEvents++;
+          });
+          break;
+        case 2:
+          readBytes(() {
+            _dataEvents++;
+            connection.inputStream.close();
+          });
+          break;
+        case 3:
+          readBytes(() {
+            _dataEvents++;
+            connection.outputStream.write("Hello".charCodes());
+            connection.outputStream.onNoPendingWrites = () {
+              connection.inputStream.close();
+            };
+          });
+          break;
+        case 4:
+          readBytes(() {
+            _dataEvents++;
+            connection.outputStream.write("Hello".charCodes());
+            connection.inputStream.close();
+          });
+          break;
+        case 5:
+          readBytes(() {
+            _dataEvents++;
+            connection.outputStream.write("Hello".charCodes());
+          });
+          break;
+        case 6:
+        case 7:
+          readBytes(() {
+            _dataEvents++;
+            connection.outputStream.write("Hello".charCodes());
+            connection.outputStream.onNoPendingWrites = () {
+              connection.outputStream.close();
+            };
+          });
+          break;
+        case 8:
+          readBytes(() {
+            _dataEvents++;
+            connection.outputStream.write("Hello".charCodes());
+            connection.outputStream.close();
+          });
+          break;
+        default:
+          Expect.fail("Unknown test mode");
       }
-    });
+    }
+
+    void closeHandler() {
+      _closeEvents++;
+      connection.outputStream.close();
+    }
+
+    void errorHandler(Exception e) {
+      Expect.fail("Socket error $e");
+    }
+
+    _iterations++;
+
+    connection.inputStream.onData = dataHandler;
+    connection.inputStream.onClosed = closeHandler;
+    connection.onError = errorHandler;
+  }
+
+  void errorHandlerServer(Exception e) {
+    Expect.fail("Server socket error");
+  }
+
+  waitForResult(Timer timer) {
+    // Make sure all iterations have been run. In multiple of these
+    // scenarios it is possible to get the SERVERSHUTDOWN message
+    // before we have received the last close event on the
+    // server. In these cases we wait for the correct number of
+    // close events.
+    if (_iterations == ITERATIONS &&
+        (_closeEvents == ITERATIONS ||
+         (_mode == 2 || _mode == 3 || _mode == 4))) {
+      switch (_mode) {
+        case 0:
+          Expect.equals(0, _dataEvents);
+          Expect.equals(ITERATIONS, _closeEvents);
+          break;
+        case 1:
+          Expect.equals(ITERATIONS, _dataEvents);
+          Expect.equals(ITERATIONS, _closeEvents);
+          break;
+        case 2:
+        case 3:
+        case 4:
+          Expect.equals(ITERATIONS, _dataEvents);
+          Expect.equals(0, _closeEvents);
+          break;
+        case 5:
+        case 6:
+        case 7:
+        case 8:
+          Expect.equals(ITERATIONS, _dataEvents);
+          Expect.equals(ITERATIONS, _closeEvents);
+          break;
+        default:
+          Expect.fail("Unknown test mode");
+      }
+      Expect.equals(0, _errorEvents);
+      _server.close();
+      port.close();
+      _donePort.send(null);
+    } else {
+      new Timer(100, waitForResult);
+    }
+  }
+
+  void dispatch(message, replyTo) {
+    _donePort = replyTo;
+    if (message != SERVERSHUTDOWN) {
+      _readBytes = 0;
+      _errorEvents = 0;
+      _dataEvents = 0;
+      _closeEvents = 0;
+      _iterations = 0;
+      _mode = message;
+      _server = new ServerSocket(HOST, 0, 10);
+      Expect.equals(true, _server !== null);
+      _server.onConnection = (connection) {
+        var data = new ConnectionData(connection);
+        connectionHandler(data);
+      };
+      _server.onError = errorHandlerServer;
+      replyTo.send(_server.port, null);
+    } else {
+      new Timer(0, waitForResult);
+    }
   }
 
   ServerSocket _server;
   SendPort _donePort;
   int _readBytes;
   int _errorEvents;
   int _dataEvents;
   int _closeEvents;
   int _iterations;
   int _mode;
@@ skipping 16 matching lines @@
   var tests = 9;
   var port = new ReceivePort();
   var completed = 0;
   port.receive((message, ignore) {
     if (++completed == tests) port.close();
   });
   for (var i = 0; i < tests; i++) {
     new SocketClose.start(i, port.toSendPort());
   }
 }