Coverage API revamp

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 133 matching lines @@
   }
 
  private:
   char* name_;
   Dart_ServiceRequestCallback callback_;
   void* user_data_;
   EmbedderServiceHandler* next_;
 };
 
 
+class LibraryFilter : public CoverageFilter {

[Michael Lippautz (Google), 2014/06/27 00:16:48]

We could name those to SimpleXXXFilter and include them in coverage.h?

[Cutch, 2014/06/27 15:07:19]

I think it's okay to leave them here with the names:

LibraryCoverageFilter
ScriptCoverageFilter
...

[Michael Lippautz (Google), 2014/06/27 17:12:24]

Done.

+ public:
+  explicit LibraryFilter(const Library& lib) : lib_(lib) {}
+  ~LibraryFilter() {}
+  bool GetCoverage(const Library& lib,
+                   const Script& script,
+                   const Class& cls,
+                   const Function& func) {
+    return lib.raw() == lib_.raw();
+  }
+ private:
+  const Library& lib_;
+};
+
+
+class ScriptFilter : public CoverageFilter {
+ public:
+  explicit ScriptFilter(const Script& script) : script_(script) {}
+  ~ScriptFilter() {}
+  bool GetCoverage(const Library& lib,
+                   const Script& script,
+                   const Class& cls,
+                   const Function& func) {
+    return script.raw() == script_.raw();
+  }
+ private:
+  const Script& script_;
+};
+
+
+class ClassFilter : public CoverageFilter {
+ public:
+  explicit ClassFilter(const Class& cls) : cls_(cls) {}
+  ~ClassFilter() {}
+  bool GetCoverage(const Library& lib,
+                   const Script& script,
+                   const Class& cls,
+                   const Function& func) {
+    return cls.raw() == cls_.raw();
+  }
+ private:
+  const Class& cls_;
+};
+
+
 static uint8_t* allocator(uint8_t* ptr, intptr_t old_size, intptr_t new_size) {
   void* new_ptr = realloc(reinterpret_cast<void*>(ptr), new_size);
   return reinterpret_cast<uint8_t*>(new_ptr);
 }
 
 
 static void SendIsolateServiceMessage(Dart_NativeArguments args) {
   NativeArguments* arguments = reinterpret_cast<NativeArguments*>(args);
   Isolate* isolate = arguments->isolate();
   StackZone zone(isolate);
@@ skipping 1036 matching lines @@
   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);
+  ClassFilter cf(cls);
+  CodeCoverage::PrintJSON(isolate, stream, &cf);
   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;
@@ skipping 62 matching lines @@
                                                      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);
+  LibraryFilter lf(lib);
+  CodeCoverage::PrintJSON(isolate, js, &lf);
   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());
@@ skipping 185 matching lines @@
 
 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);
+  ScriptFilter sf(script);
+  CodeCoverage::PrintJSON(isolate, js, &sf);
   return true;
 }
 
 
 static bool HandleScripts(Isolate* isolate, JSONStream* js) {
   if (js->num_arguments() == 1) {
     // Enumerate all scripts.
     return HandleScriptsEnumerate(isolate, js);
   }
   // Subcommands of scripts require a valid script id.
@@ skipping 209 matching lines @@
     } else {
       PrintError(js, "Invalid tags option value: %s\n", tags_option);
       return true;
     }
   }
   Profiler::PrintJSON(isolate, js, full_profile, tag_order);
   return true;
 }
 
 static bool HandleCoverage(Isolate* isolate, JSONStream* js) {
-  CodeCoverage::PrintJSON(isolate, js);
+  CodeCoverage::PrintJSON(isolate, js, NULL);
   return true;
 }
 
 
 static bool HandleAllocationProfile(Isolate* isolate, JSONStream* js) {
   bool should_reset_accumulator = false;
   bool should_collect = false;
   if (js->num_arguments() != 1) {
     PrintError(js, "Command too long");
     return true;
@@ skipping 462 matching lines @@
   while (current != NULL) {
     if (strcmp(name, current->name()) == 0) {
       return current;
     }
     current = current->next();
   }
   return NULL;
 }
 
 }  // namespace dart