Resubmission of native memory allocation info surfacing in Observatory. Fixed crashing tests and st…

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"
@@ skipping 11 matching lines @@
 // 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 208 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 inclusive_allocations() const { return inclusive_allocations_; }
+  intptr_t exclusive_allocations() const { return exclusive_allocations_; }
 
   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 74 matching lines @@
     ASSERT(profile_ != NULL);
   }
 
   void Reset(Profile::TrieKind trie_kind);
 
   const char* CurrentName();
   // Return the current node's peer's inclusive tick count.
   intptr_t CurrentInclusiveTicks();
   // Return the current node's peer's exclusive tick count.
   intptr_t CurrentExclusiveTicks();
+  // Return the current node's inclusive allocation count.
+  intptr_t CurrentInclusiveAllocations();
+  // Return the current node's exclusive allocation count.
+  intptr_t CurrentExclusiveAllocations();
   // Return the current node's tick count.
   intptr_t CurrentNodeTickCount();
   // Return the number siblings (including yourself).
   intptr_t SiblingCount();
 
   // If the following conditions are met returns the current token:
   // 1) This is a function trie.
   // 2) There is only one token position for a given function.
   // Will return NULL otherwise.
   const char* CurrentToken();
@@ skipping 45 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_