Disable applyAuthorStyles

runtime/vm/profiler.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 "platform/utils.h"
 
 #include "vm/allocation.h"
 #include "vm/atomic.h"
 #include "vm/code_patcher.h"
 #include "vm/isolate.h"
@@ skipping 1113 matching lines @@
                              dead_code_table_->Length();
     intptr_t root_index = tag_code_table_->FindIndex(0);
     // Verify that the "0" tag does not exist.
     ASSERT(root_index < 0);
     // Insert the dummy tag CodeRegion that is used for the Trie root.
     CodeRegion* region = new CodeRegion(CodeRegion::kTagCode, 0, 1, 0);
     root_index = tag_code_table_->InsertCodeRegion(region);
     ASSERT(root_index >= 0);
     region->set_creation_serial(0);
     root_ = new CodeRegionTrieNode(tag_code_table_offset_ + root_index);
-    // Use tags by default.
-    set_use_tags(true);
+    set_tag_order(Profiler::kUserVM);
   }
 
   void VisitSample(Sample* sample) {
     // Give the root a tick.
     root_->Tick();
     CodeRegionTrieNode* current = root_;
-    if (use_tags()) {
-      intptr_t user_tag_index = FindTagIndex(sample->user_tag());
-      if (user_tag_index >= 0) {
-        current = current->GetChild(user_tag_index);
-        // Give the tag a tick.
-        current->Tick();
-      }
-      if (VMTag::IsNativeEntryTag(sample->vm_tag())) {
-        // Insert a dummy kNativeTagId node.
-        intptr_t tag_index = FindTagIndex(VMTag::kNativeTagId);
-        current = current->GetChild(tag_index);
-        // Give the tag a tick.
-        current->Tick();
-      } else if (VMTag::IsRuntimeEntryTag(sample->vm_tag())) {
-        // Insert a dummy kRuntimeTagId node.
-        intptr_t tag_index = FindTagIndex(VMTag::kRuntimeTagId);
-        current = current->GetChild(tag_index);
-        // Give the tag a tick.
-        current->Tick();
-      }
-      intptr_t tag_index = FindTagIndex(sample->vm_tag());
-      current = current->GetChild(tag_index);
-      // Give the tag a tick.
-      current->Tick();
-    }
+    current = ProcessTags(sample, current);
     // Walk the sampled PCs.
     for (intptr_t i = 0; i < FLAG_profile_depth; i++) {
       if (sample->At(i) == 0) {
         break;
       }
       intptr_t index = FindFinalIndex(sample->At(i), sample->timestamp());
       current = current->GetChild(index);
       current->Tick();
     }
   }
 
   CodeRegionTrieNode* root() const {
     return root_;
   }
 
-  bool use_tags() const {
-    return use_tags_;
+  Profiler::TagOrder tag_order() const {
+    return tag_order_;
   }
 
-  void set_use_tags(bool use_tags) {
-    use_tags_ = use_tags;
+  void set_tag_order(Profiler::TagOrder tag_order) {
+    tag_order_ = tag_order;
   }
 
  private:
+  CodeRegionTrieNode* ProcessUserTags(Sample* sample,
+                                      CodeRegionTrieNode* current) {
+    intptr_t user_tag_index = FindTagIndex(sample->user_tag());
+    if (user_tag_index >= 0) {
+      current = current->GetChild(user_tag_index);
+      // Give the tag a tick.
+      current->Tick();
+    }
+    return current;
+  }
+
+  CodeRegionTrieNode* ProcessVMTags(Sample* sample,
+                                    CodeRegionTrieNode* current) {
+    if (VMTag::IsNativeEntryTag(sample->vm_tag())) {
+      // Insert a dummy kNativeTagId node.
+      intptr_t tag_index = FindTagIndex(VMTag::kNativeTagId);
+      current = current->GetChild(tag_index);
+      // Give the tag a tick.
+      current->Tick();
+    } else if (VMTag::IsRuntimeEntryTag(sample->vm_tag())) {
+      // Insert a dummy kRuntimeTagId node.
+      intptr_t tag_index = FindTagIndex(VMTag::kRuntimeTagId);
+      current = current->GetChild(tag_index);
+      // Give the tag a tick.
+      current->Tick();
+    }
+    intptr_t tag_index = FindTagIndex(sample->vm_tag());
+    current = current->GetChild(tag_index);
+    // Give the tag a tick.
+    current->Tick();
+    return current;
+  }
+
+  CodeRegionTrieNode* ProcessTags(Sample* sample, CodeRegionTrieNode* current) {
+    // None.
+    if (tag_order() == Profiler::kNoTags) {
+      return current;
+    }
+    // User first.
+    if ((tag_order() == Profiler::kUserVM) ||
+        (tag_order() == Profiler::kUser)) {
+      current = ProcessUserTags(sample, current);
+      // Only user.
+      if (tag_order() == Profiler::kUser) {
+        return current;
+      }
+      return ProcessVMTags(sample, current);
+    }
+    // VM first.
+    ASSERT((tag_order() == Profiler::kVMUser) ||
+           (tag_order() == Profiler::kVM));
+    current = ProcessVMTags(sample, current);
+    // Only VM.
+    if (tag_order() == Profiler::kVM) {
+      return current;
+    }
+    return ProcessUserTags(sample, current);
+  }
+
   intptr_t FindTagIndex(uword tag) const {
     if (tag == 0) {
       return -1;
     }
     intptr_t index = tag_code_table_->FindIndex(tag);
     if (index <= 0) {
       return -1;
     }
     ASSERT(index >= 0);
     ASSERT((tag_code_table_->At(index))->contains(tag));
@@ skipping 11 matching lines @@
       ASSERT(index >= 0);
       region = dead_code_table_->At(index);
       ASSERT(region->contains(pc));
       ASSERT(region->compile_timestamp() <= timestamp);
       return index + dead_code_table_offset_;
     }
     ASSERT(region->compile_timestamp() <= timestamp);
     return index;
   }
 
-  bool use_tags_;
+  Profiler::TagOrder tag_order_;
   CodeRegionTrieNode* root_;
   CodeRegionTable* live_code_table_;
   CodeRegionTable* dead_code_table_;
   CodeRegionTable* tag_code_table_;
   intptr_t dead_code_table_offset_;
   intptr_t tag_code_table_offset_;
 };
 
 
 class CodeRegionTableCallersBuilder {
@@ skipping 52 matching lines @@
   CodeRegionTrieNode* exclusive_root_;
   CodeRegionTable* live_code_table_;
   CodeRegionTable* dead_code_table_;
   CodeRegionTable* tag_code_table_;
   intptr_t dead_code_table_offset_;
   intptr_t tag_code_table_offset_;
 };
 
 
 void Profiler::PrintToJSONStream(Isolate* isolate, JSONStream* stream,
-                                 bool full, bool use_tags) {
+                                 bool full, TagOrder tag_order) {
   ASSERT(isolate == Isolate::Current());
   // Disable profile interrupts while processing the buffer.
   EndExecution(isolate);
   MutexLocker profiler_data_lock(isolate->profiler_data_mutex());
   IsolateProfilerData* profiler_data = isolate->profiler_data();
   if (profiler_data == NULL) {
     JSONObject error(stream);
     error.AddProperty("type", "Error");
     error.AddProperty("text", "Isolate does not have profiling enabled.");
     return;
@@ skipping 35 matching lines @@
       dead_code_table.Verify();
       tag_code_table.Verify();
       if (FLAG_trace_profiled_isolates) {
         OS::Print("CodeRegionTables verified to be ordered and not overlap.\n");
       }
 #endif
       CodeRegionExclusiveTrieBuilder build_trie(isolate,
                                                 &live_code_table,
                                                 &dead_code_table,
                                                 &tag_code_table);
-      build_trie.set_use_tags(use_tags);
+      build_trie.set_tag_order(tag_order);
       {
         // Build CodeRegion trie.
         ScopeStopwatch sw("CodeRegionExclusiveTrieBuilder");
         sample_buffer->VisitSamples(&build_trie);
         build_trie.root()->SortByCount();
       }
       CodeRegionTableCallersBuilder build_callers(build_trie.root(),
                                                   &live_code_table,
                                                   &dead_code_table,
                                                   &tag_code_table);
       {
         // Build CodeRegion callers.
         ScopeStopwatch sw("CodeRegionTableCallersBuilder");
         build_callers.Build();
       }
       {
         ScopeStopwatch sw("CodeTableStream");
         // Serialize to JSON.
         JSONObject obj(stream);
         obj.AddProperty("type", "Profile");
         obj.AddProperty("id", "profile");
         obj.AddProperty("samples", samples);
         obj.AddProperty("depth", static_cast<intptr_t>(FLAG_profile_depth));
         obj.AddProperty("period", static_cast<intptr_t>(FLAG_profile_period));
-        obj.AddProperty("time_delta_micros", builder.TimeDeltaMicros());
+        obj.AddProperty("timeSpan",
+                        MicrosecondsToSeconds(builder.TimeDeltaMicros()));
         {
           JSONArray exclusive_trie(&obj, "exclusive_trie");
           CodeRegionTrieNode* root = build_trie.root();
           ASSERT(root != NULL);
           root->PrintToJSONArray(&exclusive_trie);
         }
         JSONArray codes(&obj, "codes");
         for (intptr_t i = 0; i < live_code_table.Length(); i++) {
           CodeRegion* region = live_code_table.At(i);
           ASSERT(region != NULL);
@@ skipping 32 matching lines @@
   Dart_FileCloseCallback file_close = Isolate::file_close_callback();
   Dart_FileWriteCallback file_write = Isolate::file_write_callback();
   if ((file_open == NULL) || (file_close == NULL) || (file_write == NULL)) {
     // Embedder has not provided necessary callbacks.
     return;
   }
   // We will be looking up code objects within the isolate.
   ASSERT(Isolate::Current() == isolate);
   JSONStream stream(10 * MB);
   intptr_t pid = OS::ProcessId();
-  PrintToJSONStream(isolate, &stream, true, false);
+  PrintToJSONStream(isolate, &stream, true, Profiler::kNoTags);
   const char* format = "%s/dart-profile-%" Pd "-%" Pd ".json";
   intptr_t len = OS::SNPrint(NULL, 0, format,
                              FLAG_profile_dir, pid, isolate->main_port());
   char* filename = Isolate::Current()->current_zone()->Alloc<char>(len + 1);
   OS::SNPrint(filename, len + 1, format,
               FLAG_profile_dir, pid, isolate->main_port());
   void* f = file_open(filename, true);
   if (f == NULL) {
     // Cannot write.
     return;
@@ skipping 244 matching lines @@
       ProfilerDartStackWalker stackWalker(sample);
       stackWalker.walk();
     } else {
       // TODO(johnmccutchan): Support collecting only Dart frames with
       // ProfilerNativeStackWalker.
     }
   }
 }
 
 }  // namespace dart