Revert "Optimize the message queue for many active ports with few messages."

runtime/vm/dart_entry.cc

 // Copyright (c) 2011, 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 "vm/dart_entry.h"
 
 #include "vm/code_generator.h"
 #include "vm/compiler.h"
 #include "vm/object_store.h"
 #include "vm/resolver.h"
@@ skipping 353 matching lines @@
   const Array& args = Array::Handle(Array::New(kNumArguments));
   args.SetAt(0, left);
   args.SetAt(1, right);
   const Object& result = Object::Handle(DartEntry::InvokeDynamic(function,
                                                                  args));
   ASSERT(result.IsInstance() || result.IsError());
   return result.raw();
 }
 
 
-RawObject* DartLibraryCalls::LookupReceivePort(Dart_Port port_id) {
-  Isolate* isolate = Isolate::Current();
-  Function& function =
-      Function::Handle(isolate,
-                       isolate->object_store()->lookup_receive_port_function());
-  const int kNumArguments = 1;
-  if (function.IsNull()) {
-    Library& isolate_lib = Library::Handle(Library::IsolateLibrary());
-    ASSERT(!isolate_lib.IsNull());
-    const String& public_class_name =
-        String::Handle(Symbols::New("_ReceivePortImpl"));
-    const String& class_name =
-        String::Handle(isolate_lib.PrivateName(public_class_name));
-    const String& function_name =
-        String::Handle(Symbols::New("_lookupReceivePort"));
-    const Array& kNoArgumentNames = Array::Handle();
-    function = Resolver::ResolveStatic(isolate_lib,
-                                       class_name,
-                                       function_name,
-                                       kNumArguments,
-                                       kNoArgumentNames,
-                                       Resolver::kIsQualified);
-    isolate->object_store()->set_lookup_receive_port_function(function);
-  }
-  const Array& args = Array::Handle(Array::New(kNumArguments));
-  args.SetAt(0, Integer::Handle(Integer::New(port_id)));
-  const Object& result =
-      Object::Handle(DartEntry::InvokeStatic(function, args));
-  return result.raw();
-}
-
-
-RawObject* DartLibraryCalls::HandleMessage(const Object& receive_port,
+RawObject* DartLibraryCalls::HandleMessage(Dart_Port dest_port_id,
                                            Dart_Port reply_port_id,
                                            const Instance& message) {
   Isolate* isolate = Isolate::Current();
   Function& function =
       Function::Handle(isolate,
                        isolate->object_store()->handle_message_function());
   const int kNumArguments = 3;
   if (function.IsNull()) {
     Library& isolate_lib = Library::Handle(Library::IsolateLibrary());
     ASSERT(!isolate_lib.IsNull());
     const String& public_class_name =
         String::Handle(Symbols::New("_ReceivePortImpl"));
     const String& class_name =
         String::Handle(isolate_lib.PrivateName(public_class_name));
     const String& function_name =
         String::Handle(Symbols::New("_handleMessage"));
     const Array& kNoArgumentNames = Array::Handle();
     function = Resolver::ResolveStatic(isolate_lib,
                                        class_name,
                                        function_name,
                                        kNumArguments,
                                        kNoArgumentNames,
                                        Resolver::kIsQualified);
     isolate->object_store()->set_handle_message_function(function);
   }
   const Array& args = Array::Handle(isolate, Array::New(kNumArguments));
-  args.SetAt(0, receive_port);
+  args.SetAt(0, Integer::Handle(isolate, Integer::New(dest_port_id)));
   args.SetAt(1, Integer::Handle(isolate, Integer::New(reply_port_id)));
   args.SetAt(2, message);
   const Object& result =
       Object::Handle(isolate, DartEntry::InvokeStatic(function, args));
   ASSERT(result.IsNull() || result.IsError());
   return result.raw();
 }
 
 
 RawObject* DartLibraryCalls::NewSendPort(intptr_t port_id) {
@@ skipping 43 matching lines @@
   const String& func_name = String::Handle(Field::GetterName(field_name));
   const Function& func = Function::Handle(cls.LookupDynamicFunction(func_name));
   ASSERT(!func.IsNull());
   const Array& args = Array::Handle(Array::New(1));
   args.SetAt(0, port);
   return DartEntry::InvokeDynamic(func, args);
 }
 
 
 }  // namespace dart