VM restart + shutdown fixes

runtime/vm/message_handler_test.cc

 // Copyright (c) 2012, the Dart project authors.  Please see the AUTHORS file

[zra, 2015/10/05 16:56:47]

Would it be easy to have some unit tests of the new behavior here? E.g.
processing all OOB messages, and stopping processing OOB messages when we get
kShutdown.

[turnidge, 2015/10/05 22:18:24]

Good idea.  I added a couple of tests to cover these cases.  They turned up a
bug in HandleMessages.

 // 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 {
 
 class MessageHandlerTestPeer {
@@ skipping 20 matching lines @@
 
 class TestMessageHandler : public MessageHandler {
  public:
   TestMessageHandler()
       : port_buffer_(NULL),
         port_buffer_size_(0),
         notify_count_(0),
         message_count_(0),
         start_called_(false),
         end_called_(false),
-        result_(true) {
+        result_(kOK) {
   }
 
   ~TestMessageHandler() {
     delete[] port_buffer_;
   }
 
   void MessageNotify(Message::Priority priority) {
     notify_count_++;
   }
 
-  bool HandleMessage(Message* message) {
+  MessageStatus HandleMessage(Message* message) {
     // For testing purposes, keep a list of the ports
     // for all messages we receive.
     AddPortToBuffer(message->dest_port());
     delete message;
     message_count_++;
     return result_;
   }
 
-  bool Start() {
+  MessageStatus Start() {
     start_called_ = true;
-    return true;
+    return kOK;
   }
 
   void End() {
     end_called_ = true;
     AddPortToBuffer(-2);
   }
 
   Dart_Port* port_buffer() const { return port_buffer_; }
   int notify_count() const { return notify_count_; }
   int message_count() const { return message_count_; }
   bool start_called() const { return start_called_; }
   bool end_called() const { return end_called_; }
 
-  void set_result(bool result) { result_ = result; }
+  void set_result(MessageStatus result) { result_ = result; }
 
  private:
   void AddPortToBuffer(Dart_Port port) {
     if (port_buffer_ == NULL) {
       port_buffer_ = new Dart_Port[10];
       port_buffer_size_ = 10;
     } else if (message_count_ == port_buffer_size_) {
       int new_port_buffer_size_ = 2 * port_buffer_size_;
       Dart_Port* new_port_buffer_ = new Dart_Port[new_port_buffer_size_];
       for (int i = 0; i < port_buffer_size_; i++) {
         new_port_buffer_[i] = port_buffer_[i];
       }
       delete[] port_buffer_;
       port_buffer_ = new_port_buffer_;
       port_buffer_size_ = new_port_buffer_size_;
     }
     port_buffer_[message_count_] = port;
   }
 
   Dart_Port* port_buffer_;
   int port_buffer_size_;
   int notify_count_;
   int message_count_;
   bool start_called_;
   bool end_called_;
-  bool result_;
+  MessageStatus result_;
 
   DISALLOW_COPY_AND_ASSIGN(TestMessageHandler);
 };
 
 
-bool TestStartFunction(uword data) {
+MessageHandler::MessageStatus TestStartFunction(uword data) {
   return (reinterpret_cast<TestMessageHandler*>(data))->Start();
 }
 
 
 void TestEndFunction(uword data) {
   return (reinterpret_cast<TestMessageHandler*>(data))->End();
 }
 
 
 UNIT_TEST_CASE(MessageHandler_PostMessage) {
@@ skipping 104 matching lines @@
   Message* message1 = new Message(port1, NULL, 0, Message::kNormalPriority);
   handler_peer.PostMessage(message1);
   Message* oob_message1 = new Message(port2, NULL, 0, Message::kOOBPriority);
   handler_peer.PostMessage(oob_message1);
   Message* message2 = new Message(port2, NULL, 0, Message::kNormalPriority);
   handler_peer.PostMessage(message2);
   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(MessageHandler::kOK, 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, NULL, 0, Message::kNormalPriority);
   handler_peer.PostMessage(message1);
   Message* message2 = new Message(port2, NULL, 0, Message::kNormalPriority);
   handler_peer.PostMessage(message2);
   Message* oob_message1 = new Message(port3, NULL, 0, Message::kOOBPriority);
   handler_peer.PostMessage(oob_message1);
   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(MessageHandler::kOK, 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;
@@ skipping 64 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