Merge services into a shared IOService in dart:io, and use a native port.

runtime/bin/secure_socket.cc

 // 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.
 
 #include "bin/secure_socket.h"
 
 #include <errno.h>
 #include <fcntl.h>
 #include <sys/stat.h>
 #include <stdio.h>
@@ skipping 24 matching lines @@
 namespace dart {
 namespace bin {
 
 bool SSLFilter::library_initialized_ = false;
 // To protect library initialization.
 dart::Mutex* SSLFilter::mutex_ = new dart::Mutex();
 // The password is needed when creating secure server sockets.  It can
 // be null if only secure client sockets are used.
 const char* SSLFilter::password_ = NULL;
 
-// Forward declaration.
-static void ProcessFilter(Dart_Port dest_port_id,
-                          Dart_Port reply_port_id,
-                          Dart_CObject* message);
-
-NativeService SSLFilter::filter_service_("FilterService", ProcessFilter, 16);
-
 static const int kSSLFilterNativeFieldIndex = 0;
 
 
 /* Handle an error reported from the NSS library. */
 static void ThrowPRException(const char* exception_type,
                              const char* message,
                              bool free_message = false) {
   PRErrorCode error_code = PR_GetError();
   const char* error_message = PR_ErrorToString(error_code, PR_LANGUAGE_EN);
   OSError os_error_struct(error_code, error_message, OSError::kNSS);
@@ skipping 226 matching lines @@
  * area of the output buffers.  The function returns the new start and end
  * positions in the buffers, but it only updates start for input buffers, and
  * end for output buffers.  Therefore, the Dart thread can simultaneously
  * write to the free space and end pointer of input buffers, and read from
  * the data space of output buffers, and modify the start pointer.
  *
  * When ProcessFilter returns, the Dart thread is responsible for combining
  * the updated pointers from Dart and C++, to make the new valid state of
  * the circular buffer.
  */
-static void ProcessFilter(Dart_Port dest_port_id,
-                          Dart_Port reply_port_id,
-                          Dart_CObject* message) {
-  CObjectArray args(message);
-  CObjectIntptr filter_object(args[0]);
+CObject* SSLFilter::ProcessFilterRequest(const CObjectArray& request) {
+  CObjectIntptr filter_object(request[0]);
   SSLFilter* filter = reinterpret_cast<SSLFilter*>(filter_object.Value());
-  bool in_handshake = CObjectBool(args[1]).Value();
+  bool in_handshake = CObjectBool(request[1]).Value();
   int starts[SSLFilter::kNumBuffers];
   int ends[SSLFilter::kNumBuffers];
   for (int i = 0; i < SSLFilter::kNumBuffers; ++i) {
-    starts[i] = CObjectInt32(args[2 * i + 2]).Value();
-    ends[i] = CObjectInt32(args[2 * i + 3]).Value();
+    starts[i] = CObjectInt32(request[2 * i + 2]).Value();
+    ends[i] = CObjectInt32(request[2 * i + 3]).Value();
   }
 
   if (filter->ProcessAllBuffers(starts, ends, in_handshake)) {
+    CObjectArray* result = new CObjectArray(
+        CObject::NewArray(SSLFilter::kNumBuffers * 2));
     for (int i = 0; i < SSLFilter::kNumBuffers; ++i) {
-      args[2 * i + 2]->AsApiCObject()->value.as_int32 = starts[i];
-      args[2 * i + 3]->AsApiCObject()->value.as_int32 = ends[i];
+      result->SetAt(2 * i, new CObjectInt32(CObject::NewInt32(starts[i])));
+      result->SetAt(2 * i + 1, new CObjectInt32(CObject::NewInt32(ends[i])));
     }
-    Dart_PostCObject(reply_port_id, args.AsApiCObject());
+    return result;
   } else {
     PRErrorCode error_code = PR_GetError();
     const char* error_message = PR_ErrorToString(error_code, PR_LANGUAGE_EN);
     CObjectArray* result = new CObjectArray(CObject::NewArray(2));
     result->SetAt(0, new CObjectInt32(CObject::NewInt32(error_code)));
     result->SetAt(1, new CObjectString(CObject::NewString(error_message)));
-    Dart_PostCObject(reply_port_id, result->AsApiCObject());
+    return result;
   }
 }
 
 
 bool SSLFilter::ProcessAllBuffers(int starts[kNumBuffers],
                                   int ends[kNumBuffers],
                                   bool in_handshake) {
   for (int i = 0; i < kNumBuffers; ++i) {
     if (in_handshake && (i == kReadPlaintext || i == kWritePlaintext)) continue;
     int start = starts[i];
@@ skipping 611 matching lines @@
       memmove(buffer + start + bytes_processed, buf2, bytes_to_send);
       bytes_processed += bytes_to_send;
     }
     if (bytes_processed > 0) {
       memio_PutWriteResult(secret, bytes_processed);
     }
   }
   return bytes_processed;
 }
 
-
-Dart_Port SSLFilter::GetServicePort() {
-  return filter_service_.GetServicePort();
-}
-
-
-void FUNCTION_NAME(SecureSocket_NewServicePort)(Dart_NativeArguments args) {
-  Dart_SetReturnValue(args, Dart_Null());
-  Dart_Port service_port = SSLFilter::GetServicePort();
-  if (service_port != ILLEGAL_PORT) {
-    // Return a send port for the service port.
-    Dart_Handle send_port = Dart_NewSendPort(service_port);
-    Dart_SetReturnValue(args, send_port);
-  }
-}
-
-
 }  // namespace bin
 }  // namespace dart