Show flags in Observatory.

runtime/vm/service.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 "vm/service.h"
 
 #include "include/dart_api.h"
 #include "platform/globals.h"
 
 #include "vm/compiler.h"
@@ skipping 1915 matching lines @@
 
  private:
   JSONArray* jsarr_;
 };
 
 
 static bool HandleVM(JSONStream* js) {
   JSONObject jsobj(js);
   jsobj.AddProperty("type", "VM");
   jsobj.AddProperty("id", "vm");
-  jsobj.AddProperty("architecture", CPU::Id());
+  jsobj.AddProperty("targetCPU", CPU::Id());
+  jsobj.AddProperty("hostCPU", HostCPUFeatures::hardware());
   jsobj.AddProperty("version", Version::String());
   jsobj.AddProperty("assertsEnabled", FLAG_enable_asserts);
   jsobj.AddProperty("typeChecksEnabled", FLAG_enable_type_checks);
   int64_t start_time_micros = Dart::vm_isolate()->start_time();
   int64_t uptime_micros = (OS::GetCurrentTimeMicros() - start_time_micros);
   double seconds = (static_cast<double>(uptime_micros) /
                     static_cast<double>(kMicrosecondsPerSecond));
   jsobj.AddProperty("uptime", seconds);
 
   // Construct the isolate list.
   {
     JSONArray jsarr(&jsobj, "isolates");
     ServiceIsolateVisitor visitor(&jsarr);
     Isolate::VisitIsolates(&visitor);
   }
   return true;
 }
 
 
+static bool HandleFlags(JSONStream* js) {
+  if (js->num_arguments() == 1) {
+    Flags::PrintJSON(js);
+    return true;
+  } else if (js->num_arguments() == 2) {
+    const char* arg = js->GetArgument(1);
+    if (strcmp(arg, "set") == 0) {
+      if (js->num_arguments() > 2) {
+        PrintError(js, "expected at most 2 arguments but found %" Pd "\n",
+                   js->num_arguments());
+      } else {
+        if (js->HasOption("name") && js->HasOption("value")) {
+          JSONObject jsobj(js);
+          const char* flag_name = js->LookupOption("name");
+          const char* flag_value = js->LookupOption("value");
+          const char* error = NULL;
+          if (Flags::SetFlag(flag_name, flag_value, &error)) {
+            jsobj.AddProperty("type", "Success");
+            jsobj.AddProperty("id", "");
+          } else {
+            jsobj.AddProperty("type", "Failure");
+            jsobj.AddProperty("id", "");
+            jsobj.AddProperty("message", error);
+          }
+        } else {
+          PrintError(js, "expected to find 'name' and 'value' options");
+        }
+      }
+    }
+    return true;
+  } else {
+    PrintError(js, "Command too long");
+    return true;
+  }
+}
+
+
 static RootMessageHandlerEntry root_handlers[] = {
   { "_echo", HandleRootEcho },
   { "vm", HandleVM },
+  { "flags", HandleFlags },
 };
 
 
 static RootMessageHandler FindRootMessageHandler(const char* command) {
   intptr_t num_message_handlers = sizeof(root_handlers) /
                                   sizeof(root_handlers[0]);
   for (intptr_t i = 0; i < num_message_handlers; i++) {
     const RootMessageHandlerEntry& entry = root_handlers[i];
     if (strcmp(command, entry.command) == 0) {
       return entry.handler;
@@ skipping 95 matching lines @@
   while (current != NULL) {
     if (strcmp(name, current->name()) == 0) {
       return current;
     }
     current = current->next();
   }
   return NULL;
 }
 
 }  // namespace dart