Allow root level requests in the vm service.

runtime/vm/service_test.cc

 // Copyright (c) 2013, 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 "include/dart_debugger_api.h"
 #include "vm/dart_api_impl.h"
 #include "vm/dart_entry.h"
 #include "vm/debugger.h"
 #include "vm/globals.h"
 #include "vm/message_handler.h"
@@ skipping 97 matching lines @@
   EXPECT_VALID(Dart_SetField(lib, NewString("port"), port));
 
   Instance& service_msg = Instance::Handle();
 
   // Add a breakpoint.
   const String& url = String::Handle(String::New(TestCase::url()));
   isolate->debugger()->SetBreakpointAtLine(url, 3);
 
   // Get the breakpoint list.
   service_msg = Eval(lib, "[port, ['debug', 'breakpoints'], [], []]");
-  Service::HandleServiceMessage(isolate, service_msg);
+  Service::HandleIsolateMessage(isolate, service_msg);
   handler.HandleNextMessage();
   EXPECT_STREQ(
       "{\"type\":\"BreakpointList\",\"breakpoints\":[{"
           "\"type\":\"Breakpoint\",\"id\":1,\"enabled\":true,"
           "\"resolved\":false,"
           "\"location\":{\"type\":\"Location\","
                         "\"script\":\"dart:test-lib\",\"tokenPos\":5}}]}",
       handler.msg());
 
   // Individual breakpoint.
   service_msg = Eval(lib, "[port, ['debug', 'breakpoints', '1'], [], []]");
-  Service::HandleServiceMessage(isolate, service_msg);
+  Service::HandleIsolateMessage(isolate, service_msg);
   handler.HandleNextMessage();
   EXPECT_STREQ(
       "{\"type\":\"Breakpoint\",\"id\":1,\"enabled\":true,"
        "\"resolved\":false,"
        "\"location\":{\"type\":\"Location\","
                      "\"script\":\"dart:test-lib\",\"tokenPos\":5}}",
       handler.msg());
 
   // Missing sub-command.
   service_msg = Eval(lib, "[port, ['debug'], [], []]");
-  Service::HandleServiceMessage(isolate, service_msg);
+  Service::HandleIsolateMessage(isolate, service_msg);
   handler.HandleNextMessage();
   EXPECT_STREQ(
       "{\"type\":\"Error\","
        "\"text\":\"Must specify a subcommand\","
        "\"message\":{\"arguments\":[\"debug\"],\"option_keys\":[],"
                     "\"option_values\":[]}}",
       handler.msg());
 
   // Unrecognized breakpoint.
   service_msg = Eval(lib, "[port, ['debug', 'breakpoints', '1111'], [], []]");
-  Service::HandleServiceMessage(isolate, service_msg);
+  Service::HandleIsolateMessage(isolate, service_msg);
   handler.HandleNextMessage();
   EXPECT_STREQ("{\"type\":\"Error\","
                 "\"text\":\"Unrecognized breakpoint id 1111\","
                 "\"message\":{"
                     "\"arguments\":[\"debug\",\"breakpoints\",\"1111\"],"
                     "\"option_keys\":[],\"option_values\":[]}}",
                handler.msg());
 
   // Command too long.
   service_msg =
       Eval(lib, "[port, ['debug', 'breakpoints', '1111', 'green'], [], []]");
-  Service::HandleServiceMessage(isolate, service_msg);
+  Service::HandleIsolateMessage(isolate, service_msg);
   handler.HandleNextMessage();
   EXPECT_STREQ("{\"type\":\"Error\",\"text\":\"Command too long\","
                 "\"message\":{\"arguments\":[\"debug\",\"breakpoints\","
                                             "\"1111\",\"green\"],"
                              "\"option_keys\":[],\"option_values\":[]}}",
                handler.msg());
 
   // Unrecognized subcommand.
   service_msg = Eval(lib, "[port, ['debug', 'nosferatu'], [], []]");
-  Service::HandleServiceMessage(isolate, service_msg);
+  Service::HandleIsolateMessage(isolate, service_msg);
   handler.HandleNextMessage();
   EXPECT_STREQ("{\"type\":\"Error\","
                 "\"text\":\"Unrecognized subcommand 'nosferatu'\","
                 "\"message\":{\"arguments\":[\"debug\",\"nosferatu\"],"
                              "\"option_keys\":[],\"option_values\":[]}}",
                handler.msg());
 }
 
 
 TEST_CASE(Service_Classes) {
@@ skipping 31 matching lines @@
   Dart_Port port_id = PortMap::CreatePort(&handler);
   Dart_Handle port =
       Api::NewHandle(isolate, DartLibraryCalls::NewSendPort(port_id));
   EXPECT_VALID(port);
   EXPECT_VALID(Dart_SetField(h_lib, NewString("port"), port));
 
   Instance& service_msg = Instance::Handle();
 
   // Request an invalid class id.
   service_msg = Eval(h_lib, "[port, ['classes', '999999'], [], []]");
-  Service::HandleServiceMessage(isolate, service_msg);
+  Service::HandleIsolateMessage(isolate, service_msg);
   handler.HandleNextMessage();
   EXPECT_STREQ(
     "{\"type\":\"Error\",\"text\":\"999999 is not a valid class id.\","
     "\"message\":{\"arguments\":[\"classes\",\"999999\"],"
     "\"option_keys\":[],\"option_values\":[]}}", handler.msg());
 
   // Request the class A over the service.
   service_msg = EvalF(h_lib, "[port, ['classes', '%" Pd "'], [], []]", cid);
-  Service::HandleServiceMessage(isolate, service_msg);
+  Service::HandleIsolateMessage(isolate, service_msg);
   handler.HandleNextMessage();
   EXPECT_STREQ(
       "{\"type\":\"Class\",\"id\":\"classes\\/1009\",\"name\":\"A\","
       "\"user_name\":\"A\",\"implemented\":false,\"abstract\":false,"
       "\"patch\":false,\"finalized\":true,\"const\":false,\"super\":"
       "{\"type\":\"@Class\",\"id\":\"classes\\/35\",\"name\":\"Object\","
       "\"user_name\":\"Object\"},\"library\":{\"type\":\"@Library\",\"id\":"
       "\"libraries\\/12\",\"name\":\"\",\"user_name\":\"dart:test-lib\"},"
       "\"fields\":[{\"type\":\"@Field\",\"id\":\"classes\\/1009\\/fields\\/0\","
       "\"name\":\"a\",\"user_name\":\"a\",\"owner\":{\"type\":\"@Class\","
       "\"id\":\"classes\\/1009\",\"name\":\"A\",\"user_name\":\"A\"},"
       "\"declared_type\":{\"type\":\"@Class\",\"id\":\"classes\\/106\","
       "\"name\":\"dynamic\",\"user_name\":\"dynamic\"},\"static\":false,"
       "\"final\":false,\"const\":false}],\"functions\":["
       "{\"type\":\"@Function\",\"id\":\"classes\\/1009\\/functions\\/0\","
       "\"name\":\"get:a\",\"user_name\":\"A.a\"},{\"type\":\"@Function\","
       "\"id\":\"classes\\/1009\\/functions\\/1\",\"name\":\"set:a\","
       "\"user_name\":\"A.a=\"},{\"type\":\"@Function\",\"id\":"
       "\"classes\\/1009\\/functions\\/2\",\"name\":\"b\",\"user_name\":\"A.b\"}"
       ",{\"type\":\"@Function\",\"id\":\"classes\\/1009\\/functions\\/3\","
       "\"name\":\"c\",\"user_name\":\"A.c\"},{\"type\":\"@Function\",\"id\":"
       "\"classes\\/1009\\/functions\\/4\",\"name\":\"A.\",\"user_name\":"
       "\"A.A\"}]}",
       handler.msg());
 
   // Request function 0 from class A.
   service_msg = EvalF(h_lib, "[port, ['classes', '%" Pd "', 'functions', '0'],"
                               "[], []]", cid);
-  Service::HandleServiceMessage(isolate, service_msg);
+  Service::HandleIsolateMessage(isolate, service_msg);
   handler.HandleNextMessage();
   EXPECT_STREQ(
     "{\"type\":\"Function\",\"id\":\"classes\\/1009\\/functions\\/0\",\"name\":"
     "\"get:a\",\"user_name\":\"A.a\",\"is_static\":false,\"is_const\":false,"
     "\"is_optimizable\":true,\"is_inlinable\":false,\"kind\":"
     "\"kImplicitGetter\",\"unoptimized_code\":{\"type\":\"null\"},"
     "\"usage_counter\":0,\"optimized_call_site_count\":0,\"code\":"
     "{\"type\":\"null\"},\"deoptimizations\":0}", handler.msg());
 
   // Request field 0 from class A.
   service_msg = EvalF(h_lib, "[port, ['classes', '%" Pd "', 'fields', '0'],"
                               "[], []]", cid);
-  Service::HandleServiceMessage(isolate, service_msg);
+  Service::HandleIsolateMessage(isolate, service_msg);
   handler.HandleNextMessage();
   EXPECT_STREQ(
     "{\"type\":\"Field\",\"id\":\"classes\\/1009\\/fields\\/0\",\"name\":\"a\","
     "\"user_name\":\"a\",\"owner\":{\"type\":\"@Class\",\"id\":"
     "\"classes\\/1009\",\"name\":\"A\",\"user_name\":\"A\"},\"declared_type\":"
     "{\"type\":\"@Class\",\"id\":\"classes\\/106\",\"name\":\"dynamic\","
     "\"user_name\":\"dynamic\"},\"static\":false,\"final\":false,\"const\":"
     "false,\"guard_nullable\":true,\"guard_class\":{\"type\":\"@Class\","
     "\"id\":\"classes\\/105\",\"name\":\"Null\",\"user_name\":\"Null\"},"
     "\"guard_length\":\"variable\"}", handler.msg());
 
   // Invalid sub command.
   service_msg = EvalF(h_lib, "[port, ['classes', '%" Pd "', 'huh', '0'],"
                               "[], []]", cid);
-  Service::HandleServiceMessage(isolate, service_msg);
+  Service::HandleIsolateMessage(isolate, service_msg);
   handler.HandleNextMessage();
   EXPECT_STREQ(
     "{\"type\":\"Error\",\"text\":\"Invalid sub collection huh\",\"message\":"
     "{\"arguments\":[\"classes\",\"1009\",\"huh\",\"0\"],\"option_keys\":[],"
     "\"option_values\":[]}}", handler.msg());
 
   // Invalid field request.
   service_msg = EvalF(h_lib, "[port, ['classes', '%" Pd "', 'fields', '9'],"
                               "[], []]", cid);
-  Service::HandleServiceMessage(isolate, service_msg);
+  Service::HandleIsolateMessage(isolate, service_msg);
   handler.HandleNextMessage();
   EXPECT_STREQ(
     "{\"type\":\"Error\",\"text\":\"Field 9 not found\","
     "\"message\":{\"arguments\":[\"classes\",\"1009\",\"fields\",\"9\"],"
     "\"option_keys\":[],\"option_values\":[]}}", handler.msg());
 
   // Invalid function request.
   service_msg = EvalF(h_lib, "[port, ['classes', '%" Pd "', 'functions', '9'],"
                               "[], []]", cid);
-  Service::HandleServiceMessage(isolate, service_msg);
+  Service::HandleIsolateMessage(isolate, service_msg);
   handler.HandleNextMessage();
   EXPECT_STREQ(
     "{\"type\":\"Error\",\"text\":\"Function 9 not found\","
     "\"message\":{\"arguments\":[\"classes\",\"1009\",\"functions\",\"9\"],"
     "\"option_keys\":[],\"option_values\":[]}}", handler.msg());
 
 
   // Invalid field subcommand.
   service_msg = EvalF(h_lib, "[port, ['classes', '%" Pd "', 'fields', '9', 'x']"
                              ",[], []]", cid);
-  Service::HandleServiceMessage(isolate, service_msg);
+  Service::HandleIsolateMessage(isolate, service_msg);
   handler.HandleNextMessage();
   EXPECT_STREQ(
     "{\"type\":\"Error\",\"text\":\"Command too long\",\"message\":"
     "{\"arguments\":[\"classes\",\"1009\",\"fields\",\"9\",\"x\"],"
     "\"option_keys\":[],\"option_values\":[]}}",
     handler.msg());
 
   // Invalid function request.
   service_msg = EvalF(h_lib, "[port, ['classes', '%" Pd "', 'functions', '9',"
                              "'x'], [], []]", cid);
-  Service::HandleServiceMessage(isolate, service_msg);
+  Service::HandleIsolateMessage(isolate, service_msg);
   handler.HandleNextMessage();
   EXPECT_STREQ(
     "{\"type\":\"Error\",\"text\":\"Command too long\",\"message\":"
     "{\"arguments\":[\"classes\",\"1009\",\"functions\",\"9\",\"x\"],"
     "\"option_keys\":[],\"option_values\":[]}}",
     handler.msg());
 }
 
 
 TEST_CASE(Service_Code) {
@@ skipping 38 matching lines @@
   Dart_Port port_id = PortMap::CreatePort(&handler);
   Dart_Handle port =
       Api::NewHandle(isolate, DartLibraryCalls::NewSendPort(port_id));
   EXPECT_VALID(port);
   EXPECT_VALID(Dart_SetField(h_lib, NewString("port"), port));
 
   Instance& service_msg = Instance::Handle();
 
   // Request an invalid code object.
   service_msg = Eval(h_lib, "[port, ['code', '0'], [], []]");
-  Service::HandleServiceMessage(isolate, service_msg);
+  Service::HandleIsolateMessage(isolate, service_msg);
   handler.HandleNextMessage();
   EXPECT_STREQ(
     "{\"type\":\"Error\",\"text\":\"Could not find code at 0\",\"message\":"
     "{\"arguments\":[\"code\",\"0\"],"
     "\"option_keys\":[],\"option_values\":[]}}", handler.msg());
 
   // The following four tests check that a code object can be found
   // inside the range: [code.EntryPoint(), code.EntryPoint() + code.Size()).
   // Request code object at code.EntryPoint()
   // Expect this to succeed as it is inside [entry, entry + size).
   service_msg = EvalF(h_lib, "[port, ['code', '%" Px "'], [], []]", entry);
-  Service::HandleServiceMessage(isolate, service_msg);
+  Service::HandleIsolateMessage(isolate, service_msg);
   handler.HandleNextMessage();
   {
     // Only perform a partial match.
     const intptr_t kBufferSize = 512;
     char buffer[kBufferSize];
     OS::SNPrint(buffer, kBufferSize-1,
                 "{\"type\":\"Code\",\"id\":\"code\\/%" Px "\",", entry);
     EXPECT_SUBSTRING(buffer, handler.msg());
   }
 
   // Request code object at code.EntryPoint() + 16.
   // Expect this to succeed as it is inside [entry, entry + size).
   uintptr_t address = entry + 16;
   service_msg = EvalF(h_lib, "[port, ['code', '%" Px "'], [], []]", address);
-  Service::HandleServiceMessage(isolate, service_msg);
+  Service::HandleIsolateMessage(isolate, service_msg);
   handler.HandleNextMessage();
   {
     // Only perform a partial match.
     const intptr_t kBufferSize = 512;
     char buffer[kBufferSize];
     OS::SNPrint(buffer, kBufferSize-1,
                 "{\"type\":\"Code\",\"id\":\"code\\/%" Px "\",", entry);
     EXPECT_SUBSTRING(buffer, handler.msg());
   }
 
   // Request code object at code.EntryPoint() + code.Size() - 1.
   // Expect this to succeed as it is inside [entry, entry + size).
   address = last - 1;
   service_msg = EvalF(h_lib, "[port, ['code', '%" Px "'], [], []]", address);
-  Service::HandleServiceMessage(isolate, service_msg);
+  Service::HandleIsolateMessage(isolate, service_msg);
   handler.HandleNextMessage();
   {
     // Only perform a partial match.
     const intptr_t kBufferSize = 512;
     char buffer[kBufferSize];
     OS::SNPrint(buffer, kBufferSize-1,
                 "{\"type\":\"Code\",\"id\":\"code\\/%" Px "\",", entry);
     EXPECT_SUBSTRING(buffer, handler.msg());
   }
 
   // Request code object at code.EntryPoint() + code.Size(). Expect this
   // to fail as it's outside of [entry, entry + size).
   address = last;
   service_msg = EvalF(h_lib, "[port, ['code', '%" Px "'], [], []]", address);
-  Service::HandleServiceMessage(isolate, service_msg);
+  Service::HandleIsolateMessage(isolate, service_msg);
   handler.HandleNextMessage();
   {
     const intptr_t kBufferSize = 1024;
     char buffer[kBufferSize];
     OS::SNPrint(buffer, kBufferSize-1,
         "{\"type\":\"Error\",\"text\":\"Could not find code at %" Px "\","
         "\"message\":{\"arguments\":[\"code\",\"%" Px "\"],"
         "\"option_keys\":[],\"option_values\":[]}}", address, address);
     EXPECT_STREQ(buffer, handler.msg());
   }
 }
 
+
+TEST_CASE(Service_Cpu) {
+  const char* kScript =
+      "var port;\n"  // Set to our mock port by C++.
+      "\n"
+      "main() {\n"   // We set breakpoint here.
+      "}";
+
+  Isolate* isolate = Isolate::Current();
+  Dart_Handle lib = TestCase::LoadTestScript(kScript, NULL);
+  EXPECT_VALID(lib);
+
+  // Build a mock message handler and wrap it in a dart port.
+  ServiceTestMessageHandler handler;
+  Dart_Port port_id = PortMap::CreatePort(&handler);
+  Dart_Handle port =
+      Api::NewHandle(isolate, DartLibraryCalls::NewSendPort(port_id));
+  EXPECT_VALID(port);
+  EXPECT_VALID(Dart_SetField(lib, NewString("port"), port));
+
+  Instance& service_msg = Instance::Handle();
+  service_msg = Eval(lib, "[port, ['cpu'], [], []]");
+
+  Service::HandleRootMessage(service_msg);
+  handler.HandleNextMessage();
+  EXPECT_SUBSTRING("\"type\":\"CPU\"", handler.msg());
+}
+
 }  // namespace dart