Improve CPU Profile View

runtime/vm/profiler_service.cc

Index: runtime/vm/profiler_service.cc
diff --git a/runtime/vm/profiler_service.cc b/runtime/vm/profiler_service.cc
index 53938cf83c7dca2b62a8253763de51651573d24a..195149f37118ec718daadfbc791ab3e69c524934 100644
--- a/runtime/vm/profiler_service.cc
+++ b/runtime/vm/profiler_service.cc
@@ -19,6 +19,7 @@ namespace dart {
 DECLARE_FLAG(int, max_profile_depth);
 DECLARE_FLAG(int, profile_period);
 DECLARE_FLAG(bool, show_invisible_frames);
+DECLARE_FLAG(bool, profile_vm);
 
 #ifndef PRODUCT
 
@@ -1375,6 +1376,8 @@ class ProfileBuilder : public ValueObject {
         ASSERT(code != NULL);
         code->Tick(pc, IsExecutingFrame(sample, frame_index), sample_index);
       }
+
+      TickExitFrame(sample->vm_tag(), sample_index);
     }
     SanitizeMinMaxTimes();
   }
@@ -1490,6 +1493,10 @@ class ProfileBuilder : public ValueObject {
         current = current->GetChild(index);
         current->Tick();
       }
+
+      if (!sample->first_frame_executing()) {
+        current = AppendExitFrame(sample->vm_tag(), current);
+      }
     }
   }
 
@@ -1510,6 +1517,10 @@ class ProfileBuilder : public ValueObject {
 
       ResetKind();
 
+      if (!sample->first_frame_executing()) {
+        current = AppendExitFrame(sample->vm_tag(), current);
+      }
+
       // Walk the sampled PCs.
       Code& code = Code::Handle();
       for (intptr_t frame_index = 0;
@@ -1582,6 +1593,10 @@ class ProfileBuilder : public ValueObject {
         current = ProcessFrame(current, sample_index, sample, frame_index);
       }
 
+      if (!sample->first_frame_executing()) {
+        current = AppendExitFrame(sample->vm_tag(), current);
+      }
+
       sample->set_timeline_trie(current);
     }
   }
@@ -1604,6 +1619,10 @@ class ProfileBuilder : public ValueObject {
 
       ResetKind();
 
+      if (!sample->first_frame_executing()) {
+        current = AppendExitFrame(sample->vm_tag(), current);
+      }
+
       // Walk the sampled PCs.
       for (intptr_t frame_index = 0;
            frame_index < sample->length();
@@ -1612,6 +1631,8 @@ class ProfileBuilder : public ValueObject {
         current = ProcessFrame(current, sample_index, sample, frame_index);
       }
 
+      TickExitFrameFunction(sample->vm_tag(), sample_index);
+
       // Truncated tag.
       if (sample->truncated()) {
         current = AppendTruncatedTag(current);
@@ -1750,7 +1771,8 @@ class ProfileBuilder : public ValueObject {
     }
     // Only tick the first frame's node, if we are executing OR
     // vm tags have been emitted.
-    return IsExecutingFrame(sample, frame_index) || vm_tags_emitted();
+    return IsExecutingFrame(sample, frame_index) ||
+           !FLAG_profile_vm || vm_tags_emitted();
   }
 
   ProfileFunctionTrieNode* ProcessFunction(ProfileFunctionTrieNode* current,
@@ -1912,31 +1934,89 @@ class ProfileBuilder : public ValueObject {
     return current;
   }
 
+  void TickExitFrame(uword vm_tag, intptr_t serial) {
+    if (FLAG_profile_vm) {
+      return;
+    }
+    if (!VMTag::IsExitFrameTag(vm_tag)) {
+      return;
+    }
+    ProfileCodeTable* tag_table = profile_->tag_code_;
+    ProfileCode* code = tag_table->FindCodeForPC(vm_tag);
+    ASSERT(code != NULL);
+    code->Tick(vm_tag, true, serial);
+  }
+
+  void TickExitFrameFunction(uword vm_tag, intptr_t serial) {
+    if (FLAG_profile_vm) {
+      return;
+    }
+    if (!VMTag::IsExitFrameTag(vm_tag)) {
+      return;
+    }
+    ProfileCodeTable* tag_table = profile_->tag_code_;
+    ProfileCode* code = tag_table->FindCodeForPC(vm_tag);
+    ASSERT(code != NULL);
+    ProfileFunction* function = code->function();
+    ASSERT(function != NULL);
+    function->Tick(true, serial, TokenPosition::kNoSource);
+  }
+
+  ProfileCodeTrieNode* AppendExitFrame(uword vm_tag,
+                                       ProfileCodeTrieNode* current) {
+    if (FLAG_profile_vm) {
+      return current;
+    }
+
+    if (!VMTag::IsExitFrameTag(vm_tag)) {
+      return current;
+    }
+
+    if (VMTag::IsNativeEntryTag(vm_tag) ||
+        VMTag::IsRuntimeEntryTag(vm_tag)) {
+      current = AppendSpecificNativeRuntimeEntryVMTag(vm_tag, current);
+    } else {
+      intptr_t tag_index = GetProfileCodeTagIndex(vm_tag);
+      current = current->GetChild(tag_index);
+      // Give the tag a tick.
+      current->Tick();
+    }
+    return current;
+  }
+
   ProfileCodeTrieNode* AppendTags(uword vm_tag,
                                   uword user_tag,
                                   ProfileCodeTrieNode* current) {
-    // None.
-    if (tag_order() == Profile::kNoTags) {
-      return current;
-    }
-    // User first.
-    if ((tag_order() == Profile::kUserVM) ||
-        (tag_order() == Profile::kUser)) {
-      current = AppendUserTag(user_tag, current);
-      // Only user.
-      if (tag_order() == Profile::kUser) {
+    if (FLAG_profile_vm) {
+      // None.
+      if (tag_order() == Profile::kNoTags) {
+        return current;
+      }
+      // User first.
+      if ((tag_order() == Profile::kUserVM) ||
+          (tag_order() == Profile::kUser)) {
+        current = AppendUserTag(user_tag, current);
+        // Only user.
+        if (tag_order() == Profile::kUser) {
+          return current;
+        }
+        return AppendVMTags(vm_tag, current);
+      }
+      // VM first.
+      ASSERT((tag_order() == Profile::kVMUser) ||
+             (tag_order() == Profile::kVM));
+      current = AppendVMTags(vm_tag, current);
+      // Only VM.
+      if (tag_order() == Profile::kVM) {
         return current;
       }
-      return AppendVMTags(vm_tag, current);
-    }
-    // VM first.
-    ASSERT((tag_order() == Profile::kVMUser) ||
-           (tag_order() == Profile::kVM));
-    current = AppendVMTags(vm_tag, current);
-    // Only VM.
-    if (tag_order() == Profile::kVM) {
+      return AppendUserTag(user_tag, current);
+    }
+
+    if (tag_order() == Profile::kNoTags) {
       return current;
     }
+
     return AppendUserTag(user_tag, current);
   }
 
@@ -2031,37 +2111,66 @@ class ProfileBuilder : public ValueObject {
   }
 
   ProfileFunctionTrieNode* AppendVMTags(uword vm_tag,
-                                    ProfileFunctionTrieNode* current) {
+                                        ProfileFunctionTrieNode* current) {
     current = AppendVMTag(vm_tag, current);
     current = AppendSpecificNativeRuntimeEntryVMTag(vm_tag, current);
     return current;
   }
 
+  ProfileFunctionTrieNode* AppendExitFrame(uword vm_tag,
+                                           ProfileFunctionTrieNode* current) {
+    if (FLAG_profile_vm) {
+      return current;
+    }
+
+    if (!VMTag::IsExitFrameTag(vm_tag)) {
+      return current;
+    }
+    if (VMTag::IsNativeEntryTag(vm_tag) ||
+        VMTag::IsRuntimeEntryTag(vm_tag)) {
+      current = AppendSpecificNativeRuntimeEntryVMTag(vm_tag, current);
+    } else {
+      intptr_t tag_index = GetProfileFunctionTagIndex(vm_tag);
+      current = current->GetChild(tag_index);
+      // Give the tag a tick.
+      current->Tick();
+    }
+    return current;
+  }
+
   ProfileFunctionTrieNode* AppendTags(uword vm_tag,
                                       uword user_tag,
                                       ProfileFunctionTrieNode* current) {
-    // None.
-    if (tag_order() == Profile::kNoTags) {
-      return current;
-    }
-    // User first.
-    if ((tag_order() == Profile::kUserVM) ||
-        (tag_order() == Profile::kUser)) {
-      current = AppendUserTag(user_tag, current);
-      // Only user.
-      if (tag_order() == Profile::kUser) {
+    if (FLAG_profile_vm) {
+      // None.
+      if (tag_order() == Profile::kNoTags) {
+        return current;
+      }
+      // User first.
+      if ((tag_order() == Profile::kUserVM) ||
+          (tag_order() == Profile::kUser)) {
+        current = AppendUserTag(user_tag, current);
+        // Only user.
+        if (tag_order() == Profile::kUser) {
+          return current;
+        }
+        return AppendVMTags(vm_tag, current);
+      }
+      // VM first.
+      ASSERT((tag_order() == Profile::kVMUser) ||
+             (tag_order() == Profile::kVM));
+      current = AppendVMTags(vm_tag, current);
+      // Only VM.
+      if (tag_order() == Profile::kVM) {
         return current;
       }
-      return AppendVMTags(vm_tag, current);
-    }
-    // VM first.
-    ASSERT((tag_order() == Profile::kVMUser) ||
-           (tag_order() == Profile::kVM));
-    current = AppendVMTags(vm_tag, current);
-    // Only VM.
-    if (tag_order() == Profile::kVM) {
+      return AppendUserTag(user_tag, current);
+    }
+
+    if (tag_order() == Profile::kNoTags) {
       return current;
     }
+
     return AppendUserTag(user_tag, current);
   }