Observatory: Include profiler samples in the timeline view.

runtime/vm/profiler_service.h

 // Copyright (c) 2015, 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_SERVICE_H_
 #define VM_PROFILER_SERVICE_H_
 
 #include "vm/allocation.h"
 #include "vm/code_observers.h"
 #include "vm/globals.h"
@@ skipping 10 matching lines @@
 // Forward declarations.
 class Code;
 class Function;
 class JSONArray;
 class JSONStream;
 class ProfileFunctionTable;
 class ProfileCodeTable;
 class RawCode;
 class RawFunction;
 class SampleFilter;
+class ProcessedSampleBuffer;
 
 // Profile data related to a |Function|.
 class ProfileFunction : public ZoneAllocated {
  public:
   enum Kind {
     kDartFunction,    // Dart function.
     kNativeFunction,  // Synthetic function for Native (C/C++).
     kTagFunction,     // Synthetic function for a VM or User tag.
     kStubFunction,    // Synthetic function for stub code.
     kUnknownFunction,  // A singleton function for unknown objects.
@@ skipping 202 matching lines @@
   intptr_t NumChildren() const {
     return children_.length();
   }
 
   ProfileTrieNode* At(intptr_t i) {
     return children_.At(i);
   }
 
   intptr_t IndexOf(ProfileTrieNode* node);
 
+  intptr_t frame_id() const { return frame_id_; }
+  void set_frame_id(intptr_t id) { frame_id_ = id; }

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

Rewrite to be:

ASSERT(frame_id_ == -1);
frame_id_ = id;

So it can only be set once.

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

Done.

+
  protected:
   void SortChildren();
 
   static int ProfileTrieNodeCompare(ProfileTrieNode* const* a,
                                     ProfileTrieNode* const* b) {
     ASSERT(a != NULL);
     ASSERT(b != NULL);
     return (*b)->count() - (*a)->count();
   }
 
 
   intptr_t table_index_;
   intptr_t count_;
   ZoneGrowableArray<ProfileTrieNode*> children_;
+  intptr_t frame_id_;
 
   friend class ProfileBuilder;
 };
 
 
 // The model for a profile. Most of the model is zone allocated, therefore
 // a zone must be created that lives longer than this object.
 class Profile : public ValueObject {
  public:
   enum TagOrder {
@@ skipping 31 matching lines @@
   int64_t max_time() const { return max_time_; }
   int64_t GetTimeSpan() const {
     return max_time() - min_time();
   }
   intptr_t sample_count() const { return sample_count_; }
 
   ProfileFunction* GetFunction(intptr_t index);
   ProfileCode* GetCode(intptr_t index);
   ProfileTrieNode* GetTrieRoot(TrieKind trie_kind);
 
-  void PrintJSON(JSONStream* stream);
+  void PrintProfileJSON(JSONStream* stream);
+  void PrintTimelineJSON(JSONStream* stream);
 
  private:
+  void PrintTimelineFrameJSON(JSONObject* frames,
+                              ProfileTrieNode* current,
+                              ProfileTrieNode* parent,
+                              intptr_t* next_id);
+
   Isolate* isolate_;
+  Zone* zone_;
+  ProcessedSampleBuffer* samples_;
   ProfileCodeTable* live_code_;
   ProfileCodeTable* dead_code_;
   ProfileCodeTable* tag_code_;
   ProfileFunctionTable* functions_;
   intptr_t dead_code_index_offset_;
   intptr_t tag_code_index_offset_;
 
   ProfileTrieNode* roots_[kNumTrieKinds];
 
   int64_t min_time_;
@@ skipping 46 matching lines @@
   };
 
   static void PrintJSON(JSONStream* stream,
                         Profile::TagOrder tag_order,
                         intptr_t extra_tags);
 
   static void PrintAllocationJSON(JSONStream* stream,
                                   Profile::TagOrder tag_order,
                                   const Class& cls);
 
+  static void PrintTimelineJSON(JSONStream* stream,
+                                Profile::TagOrder tag_order);
+
   static void ClearSamples();
 
  private:
   static void PrintJSONImpl(Thread* thread,
                             JSONStream* stream,
                             Profile::TagOrder tag_order,
                             intptr_t extra_tags,
-                            SampleFilter* filter);
+                            SampleFilter* filter,
+                            bool as_timline);
 };
 
 }  // namespace dart
 
 #endif  // VM_PROFILER_SERVICE_H_