Implement function entry breakpoints in Observatory debugger.

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 286 matching lines @@
     }
     return (strcmp("true", value) == 0) || (strcmp("false", value) == 0);
   }
 
   static bool Interpret(const char* value) {
     return strcmp("true", value) == 0;
   }
 };
 
 
+class IntParameter : public MethodParameter {
+ public:
+  IntParameter(const char* name, bool required)
+      : MethodParameter(name, required) {
+  }
+
+  virtual bool Validate(const char* value) const {
+    if (value == NULL) {
+      return false;
+    }
+    for (const char* cp = value; *cp != '\0'; cp++) {
+      if (*cp < '0' || *cp > '9') {
+        return false;
+      }
+    }
+    return true;
+  }

[Cutch, 2015/02/13 19:30:52]

add:

static intptr_t Interpret(const char* value) {
   strtol
}

and use it instead of GetIntegerId

[turnidge, 2015/02/13 22:37:19]

Done.  Changed the name to "Parse".

+};
+
+
 class IdParameter : public MethodParameter {
  public:
   IdParameter(const char* name, bool required)
       : MethodParameter(name, required) {
   }
 
   virtual bool Validate(const char* value) const {
     return (value != NULL);
   }
 };
@@ skipping 1388 matching lines @@
   }
   PrintError(js, "%s: Invalid 'targetId' parameter value: "
              "id '%s' does not correspond to a "
              "script, library, class, or function", js->method(), target_id);
   return true;
 }
 
 
 static const MethodParameter* add_breakpoint_params[] = {
   ISOLATE_PARAMETER,
+  new IdParameter("scriptId", true),
+  new IntParameter("line", true),
   NULL,
 };
 
 
 static bool HandleIsolateAddBreakpoint(Isolate* isolate, JSONStream* js) {
-  if (!js->HasParam("line")) {
-    PrintMissingParamError(js, "line");
-    return true;
-  }
   const char* line_param = js->LookupParam("line");
   intptr_t line = -1;
   if (!GetIntegerId(line_param, &line)) {
     PrintInvalidParamError(js, "line");
     return true;
   }
-  const char* script_id = js->LookupParam("script");
+  const char* script_id = js->LookupParam("scriptId");
   Object& obj = Object::Handle(LookupHeapObject(isolate, script_id, NULL));
   if (obj.raw() == Object::sentinel().raw() || !obj.IsScript()) {
-    PrintInvalidParamError(js, "script");
+    PrintInvalidParamError(js, "scriptId");
     return true;
   }
   const Script& script = Script::Cast(obj);
   const String& script_url = String::Handle(script.url());
   SourceBreakpoint* bpt =
       isolate->debugger()->SetBreakpointAtLine(script_url, line);
   if (bpt == NULL) {
     PrintError(js, "Unable to set breakpoint at line %s", line_param);
     return true;
   }
   bpt->PrintJSON(js);
   return true;
 }
 
 
+static const MethodParameter* add_breakpoint_at_entry_params[] = {
+  ISOLATE_PARAMETER,
+  new IdParameter("functionId", true),
+  NULL,
+};
+
+
+static bool HandleIsolateAddBreakpointAtEntry(Isolate* isolate,

[Cutch, 2015/02/13 19:30:52]

The RPC is "addBreakpointAtEntry" so this function should be named
"AddBreakpointAtEntry". I'm going to do a pass soon which fixes up all of the
handle functions to match the corresponding RPC name.

[turnidge, 2015/02/13 22:37:20]

Acknowledged.

+                                              JSONStream* js) {
+  const char* function_id = js->LookupParam("functionId");
+  Object& obj = Object::Handle(LookupHeapObject(isolate, function_id, NULL));
+  if (obj.raw() == Object::sentinel().raw() || !obj.IsFunction()) {
+    PrintInvalidParamError(js, "functionId");
+    return true;
+  }
+  const Function& function = Function::Cast(obj);
+  SourceBreakpoint* bpt =
+      isolate->debugger()->SetBreakpointAtEntry(function);
+  if (bpt == NULL) {
+    const String& funcName = String::Handle(function.PrettyName());
+    PrintError(js, "Unable to set breakpoint at function '%s'",
+               funcName.ToCString());
+    return true;
+  }
+  bpt->PrintJSON(js);
+  return true;
+}
+
+
 static const MethodParameter* remove_breakpoint_params[] = {
   ISOLATE_PARAMETER,
   NULL,
 };
 
 
 static bool HandleIsolateRemoveBreakpoint(Isolate* isolate, JSONStream* js) {
   if (!js->HasParam("breakpointId")) {
     PrintMissingParamError(js, "breakpointId");
     return true;
@@ skipping 684 matching lines @@
   { "_echo", HandleIsolateEcho,
     NULL },
   { "_respondWithMalformedJson", HandleIsolateRespondWithMalformedJson,
     NULL },
   { "_respondWithMalformedObject", HandleIsolateRespondWithMalformedObject,
     NULL },
   { "_triggerEchoEvent", HandleIsolateTriggerEchoEvent,
     NULL },
   { "addBreakpoint", HandleIsolateAddBreakpoint,
     add_breakpoint_params },
+  { "addBreakpointAtEntry", HandleIsolateAddBreakpointAtEntry,
+    add_breakpoint_at_entry_params },
   { "eval", HandleIsolateEval,
     eval_params },
   { "getAllocationProfile", HandleIsolateGetAllocationProfile,
     get_allocation_profile_params },
   { "getBreakpoints", HandleIsolateGetBreakpoints,
     get_breakpoints_params },
   { "getCallSiteData", HandleIsolateGetCallSiteData,
     get_call_site_data_params },
   { "getClassList", HandleIsolateGetClassList,
     get_class_list_params },
@@ skipping 55 matching lines @@
     ServiceMethodDescriptor& method = service_methods_[i];
     if (strcmp(method_name, method.name) == 0) {
       return &method;
     }
   }
   return NULL;
 }
 
 
 }  // namespace dart