Cleanup native, collected, and stub code handling in profiler

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 "vm/compiler.h"
 #include "vm/coverage.h"
@@ skipping 1039 matching lines @@
 
 static bool HandleCpu(Isolate* isolate, JSONStream* js) {
   JSONObject jsobj(js);
   jsobj.AddProperty("type", "CPU");
   jsobj.AddProperty("targetCPU", CPU::Id());
   jsobj.AddProperty("hostCPU", HostCPUFeatures::hardware());
   return true;
 }
 
 
+static bool HandleNativeCode(uintptr_t pc, JSONStream* js) {
+  JSONObject jsobj(js);
+  jsobj.AddProperty("type", "NativeCode");

[turnidge, 2014/02/28 19:23:37]

The references to native and collected code have type "@Code" not
"@NativeCode/@CollectedCode"  so we should return "Code" as the type here for
consistency.

Actually, we usually have the case that the object reference (@Foo) returns a
subset of the response for the full object (Foo).  These cases don't follow this
pattern, as the NativeCode and CollectedCode responses contain less info than
the original references.  (The exception are null-like references like
objects/being-initilized which have null responses).

Is it possible to make these return the same info as the references?  Or is that
info not available?  Will these references be links in the Observatory UI?  If
not, it might make sense to handle one or both of them like we handle null-like
references like "objects/being-initialized" and return a null object.

Happy to discuss.

[Cutch, 2014/02/28 19:37:08]

Done.

+  jsobj.AddPropertyF("start", "%" Px "", pc);
+  return true;
+}
+
+
+static bool HandleCollectedCode(uintptr_t pc, JSONStream* js) {
+  JSONObject jsobj(js);
+  jsobj.AddProperty("type", "CollectedCode");
+  jsobj.AddPropertyF("start", "%" Px "", pc);
+  return true;
+}
+
+
 static bool HandleCode(Isolate* isolate, JSONStream* js) {
   REQUIRE_COLLECTION_ID("code");
   uintptr_t pc;
+  if (js->num_arguments() > 3) {
+    PrintError(js, "Command too long");
+    return true;
+  }
+  if (js->num_arguments() == 3) {
+    const char* command = js->GetArgument(1);
+    if (!strcmp("collected", command)) {
+      if (!GetUnsignedIntegerId(js->GetArgument(1), &pc, 16)) {
+        PrintError(js, "Must specify code address: code/collected/c0deadd0.");
+        return true;
+      }
+      return HandleCollectedCode(pc, js);
+    } else if (!strcmp("native", command)) {
+      if (!GetUnsignedIntegerId(js->GetArgument(1), &pc, 16)) {
+        PrintError(js, "Must specify code address: code/native/c0deadd0.");
+        return true;
+      }
+      return HandleNativeCode(pc, js);
+    } else {
+      PrintError(js, "Unrecognized subcommand '%s'", js->GetArgument(1));
+      return true;
+    }
+  }

[turnidge, 2014/02/28 19:23:37]

Can you extend the unit test to cover some of these new cases?

[Cutch, 2014/02/28 19:37:08]

Done.

+  ASSERT(js->num_arguments() == 2);
   if (!GetUnsignedIntegerId(js->GetArgument(1), &pc, 16)) {
     PrintError(js, "Must specify code address: code/c0deadd0.");
     return true;
   }
-  Code& code = Code::Handle(Code::LookupCode(pc));
-  if (code.IsNull()) {
-    PrintError(js, "Could not find code at %" Px "", pc);
+  Code& code = Code::Handle();
+  code ^= Code::LookupCode(pc);
+  if (!code.IsNull()) {
+    code.PrintToJSONStream(js, false);
     return true;
   }
-  code.PrintToJSONStream(js, false);
+  code ^= Code::LookupCodeInVmIsolate(pc);
+  if (!code.IsNull()) {
+    code.PrintToJSONStream(js, false);
+    return true;
+  }
+  PrintError(js, "Could not find code at %" Px "", pc);
   return true;
 }
 
 
 static bool HandleProfile(Isolate* isolate, JSONStream* js) {
   Profiler::PrintToJSONStream(isolate, js, true);
   return true;
 }
 
 static bool HandleCoverage(Isolate* isolate, JSONStream* js) {
@@ skipping 243 matching lines @@
   while (current != NULL) {
     if (!strcmp(name, current->name())) {
       return current;
     }
     current = current->next();
   }
   return NULL;
 }
 
 }  // namespace dart