Added page to Observatory to display native memory allocation information.

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 RUNTIME_VM_PROFILER_SERVICE_H_
 #define RUNTIME_VM_PROFILER_SERVICE_H_
 
 #include "vm/allocation.h"
 #include "vm/code_observers.h"
 #include "vm/globals.h"
 #include "vm/growable_array.h"
+#include "vm/hash_map.h"
 #include "vm/object.h"
 #include "vm/tags.h"
 #include "vm/thread_interrupter.h"
 #include "vm/token_position.h"
 
 // CPU Profile model and service protocol bits.
 // NOTE: For sampling and stack walking related code, see profiler.h.
 
 namespace dart {
 
 // Forward declarations.
 class Code;
 class Function;
 class JSONArray;
 class JSONStream;
 class ProfileFunctionTable;
 class ProfileCodeTable;
 class RawCode;
 class RawFunction;
 class SampleFilter;
+class ProcessedSample;
 class ProcessedSampleBuffer;
 
 class ProfileFunctionSourcePosition {
  public:
   explicit ProfileFunctionSourcePosition(TokenPosition token_pos);
 
   void Tick(bool exclusive);
 
   TokenPosition token_pos() const { return token_pos_; }
   intptr_t exclusive_ticks() const { return exclusive_ticks_; }
@@ skipping 34 matching lines @@
   const Function* function() const { return &function_; }
 
   bool is_visible() const;
 
   intptr_t table_index() const { return table_index_; }
 
   Kind kind() const { return kind_; }
 
   intptr_t exclusive_ticks() const { return exclusive_ticks_; }
   intptr_t inclusive_ticks() const { return inclusive_ticks_; }
-
   void IncInclusiveTicks() { inclusive_ticks_++; }
-
   void Tick(bool exclusive,
             intptr_t inclusive_serial,
             TokenPosition token_position);
 
+  bool contains_native_allocation() const {
+    return contains_native_allocation_;

[Cutch, 2017/03/21 20:27:11]

is this used anywhere? why is it needed?

[bkonyi, 2017/03/22 21:25:21]

Apparently not. Removed.

+  }
+
   static const char* KindToCString(Kind kind);
 
   void PrintToJSONArray(JSONArray* functions);
 
   // Returns true if the call was successful and |pfsp| is set.
   bool GetSinglePosition(ProfileFunctionSourcePosition* pfsp);
 
   void TickSourcePosition(TokenPosition token_position, bool exclusive);
 
   intptr_t NumSourcePositions() const {
     return source_position_ticks_.length();
   }
 
   const ProfileFunctionSourcePosition& GetSourcePosition(intptr_t i) const {
     return source_position_ticks_.At(i);
   }
 
  private:
   const Kind kind_;
   const char* name_;
   const Function& function_;
   const intptr_t table_index_;
   ZoneGrowableArray<intptr_t> profile_codes_;
   ZoneGrowableArray<ProfileFunctionSourcePosition> source_position_ticks_;
 
   intptr_t exclusive_ticks_;
   intptr_t inclusive_ticks_;
   intptr_t inclusive_serial_;
 
+  bool contains_native_allocation_;
+
   void PrintToJSONObject(JSONObject* func);
   // A |ProfileCode| that contains this function.
   void AddProfileCode(intptr_t code_table_index);
 
   friend class ProfileCode;
   friend class ProfileBuilder;
 };
 
 
 class ProfileCodeAddress {
@@ skipping 54 matching lines @@
     exclusive_ticks_ = exclusive_ticks;
   }
   void IncExclusiveTicks() { exclusive_ticks_++; }
 
   intptr_t inclusive_ticks() const { return inclusive_ticks_; }
   void set_inclusive_ticks(intptr_t inclusive_ticks) {
     inclusive_ticks_ = inclusive_ticks;
   }
   void IncInclusiveTicks() { inclusive_ticks_++; }
 
+  bool contains_native_allocation() const {
+    return contains_native_allocation_;
+  }
+
   bool IsOptimizedDart() const;
   RawCode* code() const { return code_.raw(); }
 
   const char* name() const { return name_; }
   void SetName(const char* name);
   void GenerateAndSetSymbolName(const char* prefix);
 
   static const char* KindToCString(Kind kind);
 
   void PrintToJSONArray(JSONArray* codes);
@@ skipping 14 matching lines @@
   void set_code_table_index(intptr_t index) { code_table_index_ = index; }
   intptr_t code_table_index() const { return code_table_index_; }
 
   const Kind kind_;
   uword start_;
   uword end_;
   intptr_t exclusive_ticks_;
   intptr_t inclusive_ticks_;
   intptr_t inclusive_serial_;
 
+  bool contains_native_allocation_;
+
   const Code& code_;
   char* name_;
   int64_t compile_timestamp_;
   ProfileFunction* function_;
   intptr_t code_table_index_;
   ZoneGrowableArray<ProfileCodeAddress> address_ticks_;
 
   friend class ProfileBuilder;
 };
 
@@ skipping 10 matching lines @@
   explicit ProfileTrieNode(intptr_t index);
   virtual ~ProfileTrieNode();
 
   virtual void PrintToJSONArray(JSONArray* array) const = 0;
 
   // Index into function or code tables.
   intptr_t table_index() const { return table_index_; }
 
   intptr_t count() const { return count_; }
 
-  void Tick() { count_++; }
+  void Tick(ProcessedSample* sample, bool exclusive = false);
+
+  void IncrementAllocation(intptr_t allocation, bool exclusive) {
+    ASSERT(allocation >= 0);
+    if (exclusive) {
+      exclusive_allocations_ += allocation;
+    }
+    inclusive_allocations_ += allocation;
+  }
 
   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) {
     ASSERT(frame_id_ == -1);
     frame_id_ = id;
   }
 
  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_;
+  intptr_t exclusive_allocations_;
+  intptr_t inclusive_allocations_;
   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 {
@@ skipping 139 matching lines @@
                             JSONStream* stream,
                             Profile::TagOrder tag_order,
                             intptr_t extra_tags,
                             SampleFilter* filter,
                             bool as_timline);
 };
 
 }  // namespace dart
 
 #endif  // RUNTIME_VM_PROFILER_SERVICE_H_