Add runtime and native entry tags

runtime/vm/tags.cc

 // Copyright (c) 2014, 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/tags.h"
 
 #include "vm/isolate.h"
 #include "vm/json_stream.h"
+#include "vm/native_entry.h"
 
 namespace dart {
 
 const char* VMTag::TagName(uword tag) {
+  if (IsNativeEntryTag(tag)) {
+    const uint8_t* native_reverse_lookup = NativeEntry::ResolveSymbol(tag);
+    if (native_reverse_lookup != NULL) {
+      return reinterpret_cast<const char*>(native_reverse_lookup);
+    }
+    return "Unknown native entry";
+  } else if (IsRuntimeEntryTag(tag)) {
+    const char* runtime_entry_name = RuntimeEntryTagName(tag);
+    ASSERT(runtime_entry_name != NULL);
+    return runtime_entry_name;
+  }
   ASSERT(tag != kInvalidTagId);
   ASSERT(tag < kNumVMTags);
   const TagEntry& entry = entries_[tag];
   ASSERT(entry.id == tag);
   return entry.name;
 }
 
 
+bool VMTag::IsNativeEntryTag(uword tag) {
+  ASSERT(tag != kInvalidTagId);
+  ASSERT(tag != kNumVMTags);
+  return (tag > kNumVMTags) && !IsRuntimeEntryTag(tag);
+}
+
+
+struct RegisteredRuntimeEntry {
+  const char* name;
+  uword entry;
+  RegisteredRuntimeEntry* next;
+};
+
+static RegisteredRuntimeEntry* runtime_entry_list = NULL;
+
+
+bool VMTag::IsRuntimeEntryTag(uword id) {
+  RegisteredRuntimeEntry* current = runtime_entry_list;
+  while (current != NULL) {
+    if (current->entry == id) {
+      return true;
+    }
+    current = current->next;
+  }
+  return false;
+}
+
+
+const char* VMTag::RuntimeEntryTagName(uword id) {
+  RegisteredRuntimeEntry* current = runtime_entry_list;
+  while (current != NULL) {
+    if (current->entry == id) {
+      return current->name;
+    }
+    current = current->next;
+  }
+  return NULL;
+}
+
+
+void VMTag::RegisterRuntimeEntry(const RuntimeEntry* runtime_entry) {
+  RegisteredRuntimeEntry* entry =
+      reinterpret_cast<RegisteredRuntimeEntry*>(malloc(sizeof(*entry)));

[siva, 2014/04/10 17:58:22]

Do we need a new type RegisteredRuntimeEntry here which needs to be malloced, I
was wondering if we could add a 'next' field to RuntimeEntry itself and hook it
up here.

[Cutch, 2014/04/10 20:17:32]

Done.

+  ASSERT(entry != NULL);
+  entry->name = runtime_entry->name();
+  entry->entry = reinterpret_cast<uword>(runtime_entry->function());
+  entry->next = runtime_entry_list;
+  runtime_entry_list = entry;
+}
+
+
 VMTag::TagEntry VMTag::entries_[] = {
   { "InvalidTag", kInvalidTagId, },
 #define DEFINE_VM_TAG_ENTRY(tag)                                               \
   { ""#tag, k##tag##TagId },
   VM_TAG_LIST(DEFINE_VM_TAG_ENTRY)
 #undef DEFINE_VM_TAG_ENTRY
   { "kNumVMTags", kNumVMTags },
 };
 
 
@@ skipping 12 matching lines @@
 
 
 VMTagCounters::VMTagCounters() {
   for (intptr_t i = 0; i < VMTag::kNumVMTags; i++) {
     counters_[i] = 0;
   }
 }
 
 
 void VMTagCounters::Increment(uword tag) {
+  if (VMTag::IsRuntimeEntryTag(tag)) {
+    counters_[VMTag::kRuntimeTagId]++;
+    return;
+  } else if (tag > VMTag::kNumVMTags) {
+    // Assume native entry.
+    counters_[VMTag::kNativeTagId]++;
+    return;
+  }
   ASSERT(tag != VMTag::kInvalidTagId);
   ASSERT(tag < VMTag::kNumVMTags);
   counters_[tag]++;
 }
 
 
 int64_t VMTagCounters::count(uword tag) {
   ASSERT(tag != VMTag::kInvalidTagId);
   ASSERT(tag < VMTag::kNumVMTags);
   return counters_[tag];
 }
 
 
 void VMTagCounters::PrintToJSONObject(JSONObject* obj) {
   {
     JSONArray arr(obj, "names");
     for (intptr_t i = 1; i < VMTag::kNumVMTags; i++) {
       arr.AddValue(VMTag::TagName(i));
     }
   }
   {
     JSONArray arr(obj, "counters");
     for (intptr_t i = 1; i < VMTag::kNumVMTags; i++) {
       arr.AddValue64(counters_[i]);
     }
   }
 }
 
 }  // namespace dart