Observatory: Include profiler samples in the timeline view.

runtime/vm/profiler.h

 // 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.
 
 #ifndef VM_PROFILER_H_
 #define VM_PROFILER_H_
 
 #include "vm/allocation.h"
 #include "vm/bitfield.h"
 #include "vm/code_observers.h"
 #include "vm/globals.h"
 #include "vm/growable_array.h"
 #include "vm/object.h"
 #include "vm/tags.h"
 #include "vm/thread_interrupter.h"
 
 // Profiler sampling and stack walking support.
 // NOTE: For service related code, see profile_service.h.
 
 namespace dart {
 
 // Forward declarations.
 class ProcessedSample;
 class ProcessedSampleBuffer;
 
 class Sample;
 class SampleBuffer;
+class ProfileTrieNode;
 
 class Profiler : public AllStatic {
  public:
   static void InitOnce();
   static void Shutdown();
 
   static void SetSampleDepth(intptr_t depth);
   static void SetSamplePeriod(intptr_t period);
 
   static SampleBuffer* sample_buffer() {
@@ skipping 488 matching lines @@
   uword At(intptr_t index) const {
     ASSERT(index >= 0);
     ASSERT(index < length());
     return pcs_[index];
   }
 
   // Timestamp sample was taken at.
   int64_t timestamp() const { return timestamp_; }
   void set_timestamp(int64_t timestamp) { timestamp_ = timestamp; }
 
+  ThreadId tid() const { return tid_; }
+  void set_tid(ThreadId tid) { tid_ = tid; }
+
   // The VM tag.
   uword vm_tag() const { return vm_tag_; }
   void set_vm_tag(uword tag) { vm_tag_ = tag; }
 
   // The user tag.
   uword user_tag() const { return user_tag_; }
   void set_user_tag(uword tag) { user_tag_ = tag; }
 
   // The class id if this is an allocation profile sample. -1 otherwise.
   intptr_t allocation_cid() const { return allocation_cid_; }
   void set_allocation_cid(intptr_t cid) { allocation_cid_ = cid; }
 
   bool IsAllocationSample() const {
     return allocation_cid_ > 0;
   }
 
   // Was the stack trace truncated?
   bool truncated() const { return truncated_; }
   void set_truncated(bool truncated) { truncated_ = truncated; }
 
   // Was the first frame in the stack trace executing?
   bool first_frame_executing() const { return first_frame_executing_; }
   void set_first_frame_executing(bool first_frame_executing) {
     first_frame_executing_ = first_frame_executing;
   }
 
+  ProfileTrieNode* timeline_trie() const { return timeline_trie_; }
+  void set_timeline_trie(ProfileTrieNode* trie) { timeline_trie_ = trie; }

[Cutch, 2015/12/15 21:54:58]

rewrite to:

ASSERT(timeline_trie_ == NULL);
timeline_trie_ = trie;

so it can only be set once.

[rmacnak, 2015/12/16 00:14:20]

Done.

+
  private:
   void FixupCaller(const CodeLookupTable& clt,
                    uword pc_marker,
                    uword* stack_buffer);
 
   void CheckForMissingDartFrame(const CodeLookupTable& clt,
                                 const CodeDescriptor* code,
                                 uword pc_marker,
                                 uword* stack_buffer);
 
   ZoneGrowableArray<uword> pcs_;
   int64_t timestamp_;
+  ThreadId tid_;
   uword vm_tag_;
   uword user_tag_;
   intptr_t allocation_cid_;
   bool truncated_;
   bool first_frame_executing_;
+  ProfileTrieNode* timeline_trie_;
 
   friend class SampleBuffer;
   DISALLOW_COPY_AND_ASSIGN(ProcessedSample);
 };
 
 
 // A collection of |ProcessedSample|s.
 class ProcessedSampleBuffer : public ZoneAllocated {
  public:
   ProcessedSampleBuffer();
@@ skipping 17 matching lines @@
  private:
   ZoneGrowableArray<ProcessedSample*> samples_;
   CodeLookupTable* code_lookup_table_;
 
   DISALLOW_COPY_AND_ASSIGN(ProcessedSampleBuffer);
 };
 
 }  // namespace dart
 
 #endif  // VM_PROFILER_H_