vmservice: Add /coverage collection to scripts, classes and libraries.

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 1186 matching lines @@
   JSONObject jsobj(js);
   jsobj.AddProperty("type", "InstanceSet");
   jsobj.AddProperty("id", "instance_set");
   jsobj.AddProperty("totalCount", count);
   jsobj.AddProperty("sampleCount", storage.Length());
   jsobj.AddProperty("sample", storage);
   return true;
 }
 
 
+static bool HandleClassesCoverage(Isolate* isolate,
+                                  const Class& cls,
+                                  JSONStream* stream) {
+  CodeCoverage::PrintJSONForClass(cls, stream);
+  return true;
+}
+
+
 static bool HandleClasses(Isolate* isolate, JSONStream* js) {
   if (js->num_arguments() == 1) {
     ClassTable* table = isolate->class_table();
     JSONObject jsobj(js);
     table->PrintToJSONObject(&jsobj);
     return true;
   }
   ASSERT(js->num_arguments() >= 2);
   intptr_t id;
   if (!GetIntegerId(js->GetArgument(1), &id)) {
@@ skipping 22 matching lines @@
     } else if (strcmp(second, "implicit_closures") == 0) {
       return HandleClassesImplicitClosures(isolate, cls, js);
     } else if (strcmp(second, "dispatchers") == 0) {
       return HandleClassesDispatchers(isolate, cls, js);
     } else if (strcmp(second, "types") == 0) {
       return HandleClassesTypes(isolate, cls, js);
     } else if (strcmp(second, "retained") == 0) {
       return HandleClassesRetained(isolate, cls, js);
     } else if (strcmp(second, "instances") == 0) {
       return HandleClassesInstances(isolate, cls, js);
+    } else if (strcmp(second, "coverage") == 0) {
+      return HandleClassesCoverage(isolate, cls, js);
     } else {
       PrintError(js, "Invalid sub collection %s", second);
       return true;
     }
   }
   UNREACHABLE();
   return true;
 }
 
 
@@ skipping 11 matching lines @@
   }
   const String& expr_str = String::Handle(isolate, String::New(expr));
   const Object& result = Object::Handle(lib.Evaluate(expr_str,
                                                      Array::empty_array(),
                                                      Array::empty_array()));
   result.PrintJSON(js, true);
   return true;
 }
 
 
+static bool HandleLibrariesCoverage(Isolate* isolate,
+                                    const Library& lib,
+                                    JSONStream* js) {
+  CodeCoverage::PrintJSONForLibrary(lib, Script::Handle(), js);

[Ivan Posva, 2014/06/26 10:14:33]

I find this an awkward API. If you want to factor out the coverage printing for
a library with a script filter within the CodeCoverage class, then please make
it a private implementation method instead of leaking out the functionality to
the public API.

+  return true;
+}
+
+
 static bool HandleLibraries(Isolate* isolate, JSONStream* js) {
   // TODO(johnmccutchan): Support fields and functions on libraries.
   REQUIRE_COLLECTION_ID("libraries");
   const GrowableObjectArray& libs =
       GrowableObjectArray::Handle(isolate->object_store()->libraries());
   ASSERT(!libs.IsNull());
   intptr_t id = 0;
   CHECK_COLLECTION_ID_BOUNDS("libraries", libs.Length(), js->GetArgument(1),
                              id, js);
   Library& lib = Library::Handle();
   lib ^= libs.At(id);
   ASSERT(!lib.IsNull());
   if (js->num_arguments() == 2) {
     lib.PrintJSON(js, false);
     return true;
   } else if (js->num_arguments() >= 3) {
     const char* second = js->GetArgument(2);
     if (strcmp(second, "eval") == 0) {
       return HandleLibrariesEval(isolate, lib, js);
+    } else if (strcmp(second, "coverage") == 0) {
+      return HandleLibrariesCoverage(isolate, lib, js);
     } else {
       PrintError(js, "Invalid sub collection %s", second);
       return true;
     }
   }
   UNREACHABLE();
   return true;
 }
 
 
@@ skipping 151 matching lines @@
     intptr_t num_scripts = loaded_scripts.Length();
     for (intptr_t i = 0; i < num_scripts; i++) {
       script ^= loaded_scripts.At(i);
       members.AddValue(script);
     }
   }
   return true;
 }
 
 
-static bool HandleScriptsFetch(Isolate* isolate, JSONStream* js) {
-  const GrowableObjectArray& libs =
-    GrowableObjectArray::Handle(isolate->object_store()->libraries());
-  int num_libs = libs.Length();
-  Library &lib = Library::Handle();
-  Script& script = Script::Handle();
-  String& url = String::Handle();
-  const String& id = String::Handle(String::New(js->GetArgument(1)));
-  ASSERT(!id.IsNull());
-  // The id is the url of the script % encoded, decode it.
-  String& requested_url = String::Handle(String::DecodeURI(id));
-  for (intptr_t i = 0; i < num_libs; i++) {
-    lib ^= libs.At(i);
-    ASSERT(!lib.IsNull());
-    ASSERT(Smi::IsValid(lib.index()));
-    const Array& loaded_scripts = Array::Handle(lib.LoadedScripts());
-    ASSERT(!loaded_scripts.IsNull());
-    intptr_t num_scripts = loaded_scripts.Length();
-    for (intptr_t i = 0; i < num_scripts; i++) {
-      script ^= loaded_scripts.At(i);
-      ASSERT(!script.IsNull());
-      url ^= script.url();
-      if (url.Equals(requested_url)) {
-        script.PrintJSON(js, false);
-        return true;
-      }
-    }
-  }
-  PrintErrorWithKind(js, "NotFoundError", "Cannot find script %s",
-                     requested_url.ToCString());
+static bool HandleScriptsFetch(
+    Isolate* isolate, const Script& script, JSONStream* js) {
+  script.PrintJSON(js, false);
   return true;
 }
 
+
+static bool HandleScriptsCoverage(
+    Isolate* isolate, const Script& script, JSONStream* js) {
+  CodeCoverage::PrintJSONForScript(script, js);
+  return true;
+}
+
 
 static bool HandleScripts(Isolate* isolate, JSONStream* js) {
   if (js->num_arguments() == 1) {
     // Enumerate all scripts.
     return HandleScriptsEnumerate(isolate, js);
-  } else if (js->num_arguments() == 2) {
-    // Fetch specific script.
-    return HandleScriptsFetch(isolate, js);
+  }
+  // Subcommands of scripts require a valid script id.
+  const String& id = String::Handle(String::New(js->GetArgument(1)));
+  ASSERT(!id.IsNull());
+  // The id is the url of the script % encoded, decode it.
+  String& requested_url = String::Handle(String::DecodeURI(id));
+  Script& script = Script::Handle();
+  script = Script::FindByUrl(requested_url);
+  if (script.IsNull()) {
+    PrintErrorWithKind(js, "NotFoundError", "Cannot find script %s",
+                       requested_url.ToCString());
+    return true;
+  }
+  if (js->num_arguments() == 2) {
+    // If no subcommand is given, just fetch the script.
+    return HandleScriptsFetch(isolate, script, js);
+  } else if (js->num_arguments() == 3) {
+    const char* arg = js->GetArgument(2);
+    if (strcmp(arg, "coverage") == 0) {
+      return HandleScriptsCoverage(isolate, script, js);
+    }
+    PrintError(js, "Unrecognized subcommand '%s'", arg);
+    return true;
   } else {
     PrintError(js, "Command too long");
     return true;
   }
 }
 
 
 static bool HandleDebugResume(Isolate* isolate, JSONStream* js) {
   if (isolate->message_handler()->paused_on_start()) {
     isolate->message_handler()->set_pause_on_start(false);
@@ skipping 661 matching lines @@
   while (current != NULL) {
     if (strcmp(name, current->name()) == 0) {
       return current;
     }
     current = current->next();
   }
   return NULL;
 }
 
 }  // namespace dart