- Remove the reply_port from the VM internal message object.

runtime/vm/message_handler_test.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 "vm/message_handler.h"
 #include "vm/port.h"
 #include "vm/unit_test.h"
 
 namespace dart {
 
@@ skipping 105 matching lines @@
   return (reinterpret_cast<TestMessageHandler*>(data))->End();
 }
 
 
 UNIT_TEST_CASE(MessageHandler_PostMessage) {
   TestMessageHandler handler;
   MessageHandlerTestPeer handler_peer(&handler);
   EXPECT_EQ(0, handler.notify_count());
 
   // Post a message.
-  Message* message = new Message(0, 0, NULL, 0, Message::kNormalPriority);
+  Message* message = new Message(0, NULL, 0, Message::kNormalPriority);
   handler_peer.PostMessage(message);
 
   // The notify callback is called.
   EXPECT_EQ(1, handler.notify_count());
 
   // The message has been added to the correct queue.
   EXPECT(message == handler_peer.queue()->Dequeue());
   EXPECT(NULL == handler_peer.oob_queue()->Dequeue());
   delete message;
 
   // Post an oob message.
-  message = new Message(0, 0, NULL, 0, Message::kOOBPriority);
+  message = new Message(0, NULL, 0, Message::kOOBPriority);
   handler_peer.PostMessage(message);
 
   // The notify callback is called.
   EXPECT_EQ(2, handler.notify_count());
 
   // The message has been added to the correct queue.
   EXPECT(message == handler_peer.oob_queue()->Dequeue());
   EXPECT(NULL == handler_peer.queue()->Dequeue());
   delete message;
 }
 
 
 UNIT_TEST_CASE(MessageHandler_ClosePort) {
   TestMessageHandler handler;
   MessageHandlerTestPeer handler_peer(&handler);
-  Message* message1 = new Message(1, 0, NULL, 0, Message::kNormalPriority);
+  Message* message1 = new Message(1, NULL, 0, Message::kNormalPriority);
   handler_peer.PostMessage(message1);
-  Message* message2 = new Message(2, 0, NULL, 0, Message::kNormalPriority);
+  Message* message2 = new Message(2, NULL, 0, Message::kNormalPriority);
   handler_peer.PostMessage(message2);
 
   handler_peer.ClosePort(1);
 
   // Closing the port does not drop the messages from the queue.
   EXPECT(message1 == handler_peer.queue()->Dequeue());
   EXPECT(message2 == handler_peer.queue()->Dequeue());
   delete message1;
   delete message2;
 }
 
 
 UNIT_TEST_CASE(MessageHandler_CloseAllPorts) {
   TestMessageHandler handler;
   MessageHandlerTestPeer handler_peer(&handler);
-  Message* message1 = new Message(1, 0, NULL, 0, Message::kNormalPriority);
+  Message* message1 = new Message(1, NULL, 0, Message::kNormalPriority);
   handler_peer.PostMessage(message1);
-  Message* message2 = new Message(2, 0, NULL, 0, Message::kNormalPriority);
+  Message* message2 = new Message(2, NULL, 0, Message::kNormalPriority);
   handler_peer.PostMessage(message2);
 
   handler_peer.CloseAllPorts();
 
   // All messages are dropped from the queue.
   EXPECT(NULL == handler_peer.queue()->Dequeue());
 }
 
 
 UNIT_TEST_CASE(MessageHandler_HandleNextMessage) {
   TestMessageHandler handler;
   MessageHandlerTestPeer handler_peer(&handler);
   Dart_Port port1 = PortMap::CreatePort(&handler);
   Dart_Port port2 = PortMap::CreatePort(&handler);
   Dart_Port port3 = PortMap::CreatePort(&handler);
-  Message* message1 = new Message(port1, 0, NULL, 0, Message::kNormalPriority);
+  Message* message1 = new Message(port1, NULL, 0, Message::kNormalPriority);
   handler_peer.PostMessage(message1);
-  Message* oob_message1 = new Message(port2, 0, NULL, 0, Message::kOOBPriority);
+  Message* oob_message1 = new Message(port2, NULL, 0, Message::kOOBPriority);
   handler_peer.PostMessage(oob_message1);
-  Message* message2 = new Message(port2, 0, NULL, 0, Message::kNormalPriority);
+  Message* message2 = new Message(port2, NULL, 0, Message::kNormalPriority);
   handler_peer.PostMessage(message2);
-  Message* oob_message2 = new Message(port3, 0, NULL, 0, Message::kOOBPriority);
+  Message* oob_message2 = new Message(port3, NULL, 0, Message::kOOBPriority);
   handler_peer.PostMessage(oob_message2);
 
   // We handle both oob messages and a single normal message.
   EXPECT(handler.HandleNextMessage());
   EXPECT_EQ(3, handler.message_count());
   Dart_Port* ports = handler.port_buffer();
   EXPECT_EQ(port2, ports[0]);
   EXPECT_EQ(port3, ports[1]);
   EXPECT_EQ(port1, ports[2]);
   PortMap::ClosePorts(&handler);
 }
 
 
 UNIT_TEST_CASE(MessageHandler_HandleOOBMessages) {
   TestMessageHandler handler;
   MessageHandlerTestPeer handler_peer(&handler);
   Dart_Port port1 = PortMap::CreatePort(&handler);
   Dart_Port port2 = PortMap::CreatePort(&handler);
   Dart_Port port3 = PortMap::CreatePort(&handler);
   Dart_Port port4 = PortMap::CreatePort(&handler);
-  Message* message1 = new Message(port1, 0, NULL, 0, Message::kNormalPriority);
+  Message* message1 = new Message(port1, NULL, 0, Message::kNormalPriority);
   handler_peer.PostMessage(message1);
-  Message* message2 = new Message(port2, 0, NULL, 0, Message::kNormalPriority);
+  Message* message2 = new Message(port2, NULL, 0, Message::kNormalPriority);
   handler_peer.PostMessage(message2);
-  Message* oob_message1 = new Message(port3, 0, NULL, 0, Message::kOOBPriority);
+  Message* oob_message1 = new Message(port3, NULL, 0, Message::kOOBPriority);
   handler_peer.PostMessage(oob_message1);
-  Message* oob_message2 = new Message(port4, 0, NULL, 0, Message::kOOBPriority);
+  Message* oob_message2 = new Message(port4, NULL, 0, Message::kOOBPriority);
   handler_peer.PostMessage(oob_message2);
 
   // We handle both oob messages but no normal messages.
   EXPECT(handler.HandleOOBMessages());
   EXPECT_EQ(2, handler.message_count());
   Dart_Port* ports = handler.port_buffer();
   EXPECT_EQ(port3, ports[0]);
   EXPECT_EQ(port4, ports[1]);
   handler_peer.CloseAllPorts();
 }
 
 
 struct ThreadStartInfo {
   MessageHandler* handler;
   Dart_Port* ports;
   int count;
 };
 
 
 static void SendMessages(uword param) {
   ThreadStartInfo* info = reinterpret_cast<ThreadStartInfo*>(param);
   MessageHandler* handler = info->handler;
   MessageHandlerTestPeer handler_peer(handler);
   for (int i = 0; i < info->count; i++) {
     Message* message =
-        new Message(info->ports[i], 0, NULL, 0, Message::kNormalPriority);
+        new Message(info->ports[i], NULL, 0, Message::kNormalPriority);
     handler_peer.PostMessage(message);
   }
 }
 
 
 UNIT_TEST_CASE(MessageHandler_Run) {
   ThreadPool pool;
   TestMessageHandler handler;
   MessageHandlerTestPeer handler_peer(&handler);
   int sleep = 0;
   const int kMaxSleep = 20 * 1000;  // 20 seconds.
 
   EXPECT(!handler.HasLivePorts());
   handler_peer.increment_live_ports();
 
   handler.Run(&pool,
               TestStartFunction,
               TestEndFunction,
               reinterpret_cast<uword>(&handler));
   Dart_Port port = PortMap::CreatePort(&handler);
-  Message* message = new Message(port, 0, NULL, 0, Message::kNormalPriority);
+  Message* message = new Message(port, NULL, 0, Message::kNormalPriority);
   handler_peer.PostMessage(message);
 
   // Wait for the first message to be handled.
   while (sleep < kMaxSleep && handler.message_count() < 1) {
     OS::Sleep(10);
     sleep += 10;
   }
   EXPECT_EQ(1, handler.message_count());
   EXPECT(handler.start_called());
   EXPECT(!handler.end_called());
@@ skipping 21 matching lines @@
   EXPECT_EQ(port, handler_ports[0]);
   for (int i = 1; i < 11; i++) {
     EXPECT_EQ(ports[i - 1], handler_ports[i]);
   }
   handler_peer.decrement_live_ports();
   EXPECT(!handler.HasLivePorts());
   PortMap::ClosePorts(&handler);
 }
 
 }  // namespace dart