Add isolate tag-profile and better handling of errors

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 1399 matching lines @@
   if (!code.IsNull()) {
     code.PrintToJSONStream(js, false);
     return true;
   }
   PrintError(js, "Could not find code with id: %s", command);
   return true;
 }
 
 
 static bool HandleProfile(Isolate* isolate, JSONStream* js) {
+  if (js->num_arguments() == 2) {
+    const char* sub_command = js->GetArgument(1);
+    if (!strcmp(sub_command, "tag")) {
+      {
+        JSONObject miniProfile(js);
+        miniProfile.AddProperty("type", "TagProfile");
+        miniProfile.AddProperty("id", "profile/tag");
+        isolate->vm_tag_counters()->PrintToJSONObject(&miniProfile);
+      }
+      return true;
+    } else {
+      PrintError(js, "Unrecognized subcommand '%s'", sub_command);
+      return true;
+    }
+  }
   // A full profile includes disassembly of all Dart code objects.
   // TODO(johnmccutchan): Add sub command to trigger full code dump.
   bool full_profile = false;
   const char* tags_option = js->LookupOption("tags");
   bool use_tags = true;
   if (tags_option != NULL) {
     if (strcmp("hide", tags_option) != 0) {
       PrintError(js, "Invalid tags option value: %s\n", tags_option);
       return true;
     }
@@ skipping 139 matching lines @@
   {
     NoGCScope no_gc;
     ContainsAddressVisitor visitor(isolate, addr);
     object = isolate->heap()->FindObject(&visitor);
   }
   object.PrintToJSONStream(js, true);
   return true;
 }
 
 
+static bool HandleMalformedJson(Isolate* isolate, JSONStream* js) {
+  JSONObject jsobj(js);
+  jsobj.AddProperty("a", "a");
+  JSONObject jsobj1(js);
+  jsobj1.AddProperty("a", "a");
+  JSONObject jsobj2(js);
+  jsobj2.AddProperty("a", "a");
+  JSONObject jsobj3(js);
+  jsobj3.AddProperty("a", "a");
+  return true;
+}
+
+
+static bool HandleMalformedObject(Isolate* isolate, JSONStream* js) {
+  JSONObject jsobj(js);
+  jsobj.AddProperty("bart", "simpson");
+  return true;
+}

[turnidge, 2014/03/24 20:22:13]

How do you use these currently?  Just curious.

[Cutch, 2014/03/25 14:39:06]

I am manually using these to test error handling in Observatory.

+
+
 static IsolateMessageHandlerEntry isolate_handlers[] = {
+  { "_malformedjson", HandleMalformedJson },
+  { "_malformedobject", HandleMalformedObject },
   { "_echo", HandleIsolateEcho },
   { "", HandleIsolate },
   { "address", HandleAddress },
   { "allocationprofile", HandleAllocationProfile },
   { "classes", HandleClasses },
   { "code", HandleCode },
   { "coverage", HandleCoverage },
   { "debug", HandleDebug },
   { "heapmap", HandleHeapMap },
   { "libraries", HandleLibraries },
@@ skipping 249 matching lines @@
   while (current != NULL) {
     if (strcmp(name, current->name()) == 0) {
       return current;
     }
     current = current->next();
   }
   return NULL;
 }
 
 }  // namespace dart