Add storage of class id and state bit to the profiler's Sample

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"
@@ skipping 141 matching lines @@
   }
 
   void Clear() {
     isolate_ = NULL;
     pc_marker_ = 0;
     for (intptr_t i = 0; i < kStackBufferSizeInWords; i++) {
       stack_buffer_[i] = 0;
     }
     vm_tag_ = VMTag::kInvalidTagId;
     user_tag_ = UserTags::kDefaultUserTag;
-    sp_ = 0;
     lr_ = 0;

[rmacnak, 2015/06/22 22:23:19]

metadata = 0

[Cutch, 2015/06/23 13:47:13]

Done.

-    fp_ = 0;
     state_ = 0;
     uword* pcs = GetPCArray();
     for (intptr_t i = 0; i < pcs_length_; i++) {
       pcs[i] = 0;
     }
   }
 
   // Timestamp sample was taken at.
   int64_t timestamp() const {
     return timestamp_;
@@ skipping 36 matching lines @@
   }
 
   uword pc_marker() const {
     return pc_marker_;
   }
 
   void set_pc_marker(uword pc_marker) {
     pc_marker_ = pc_marker;
   }
 
-  uword sp() const {
-    return sp_;
-  }
-
-  void set_sp(uword sp) {
-    sp_ = sp;
-  }
-
-  uword fp() const {
-    return fp_;
-  }
-
-  void set_fp(uword fp) {
-    fp_ = fp;
-  }
-
   uword lr() const {
     return lr_;
   }
 
   void set_lr(uword link_register) {
     lr_ = link_register;
   }
 
   void InsertCallerForTopFrame(uword pc) {
     if (pcs_length_ == 1) {
@@ skipping 52 matching lines @@
   }
 
   bool truncated_trace() const {
     return TruncatedTraceBit::decode(state_);
   }
 
   void set_truncated_trace(bool truncated_trace) {
     state_ = TruncatedTraceBit::update(truncated_trace, state_);
   }
 
+  bool is_allocation_sample() const {
+    return ClassAllocationSampleBit::decode(state_);
+  }
+
+  void set_is_allocation_sample(bool allocation_sample) {
+    state_ = ClassAllocationSampleBit::update(allocation_sample, state_);
+  }
+
+  intptr_t allocation_cid() const {
+    ASSERT(is_allocation_sample());
+    return metadata_;
+  }
+
+  void set_metadata(intptr_t metadata) {
+    metadata_ = metadata;
+  }
+
   static void InitOnce();
 
   static intptr_t instance_size() {
     return instance_size_;
   }
 
   uword* GetPCArray() const;
 
   static const int kStackBufferSizeInWords = 2;
   uword* GetStackBuffer() {
     return &stack_buffer_[0];
   }
 
  private:
   static intptr_t instance_size_;
   static intptr_t pcs_length_;
   enum StateBits {
     kProcessedBit = 0,
     kLeafFrameIsDartBit = 1,
     kIgnoreBit = 2,
     kExitFrameBit = 3,
     kMissingFrameInsertedBit = 4,
     kTruncatedTrace = 5,
+    kClassAllocationSample = 6,
   };
   class ProcessedBit : public BitField<bool, kProcessedBit, 1> {};
   class LeafFrameIsDart : public BitField<bool, kLeafFrameIsDartBit, 1> {};
   class IgnoreBit : public BitField<bool, kIgnoreBit, 1> {};
   class ExitFrameBit : public BitField<bool, kExitFrameBit, 1> {};
   class MissingFrameInsertedBit
     : public BitField<bool, kMissingFrameInsertedBit, 1> {};
   class TruncatedTraceBit : public BitField<bool, kTruncatedTrace, 1> {};
+  class ClassAllocationSampleBit
+      : public BitField<bool, kClassAllocationSample, 1> {};
 
   int64_t timestamp_;
   ThreadId tid_;
   Isolate* isolate_;
   uword pc_marker_;
   uword stack_buffer_[kStackBufferSizeInWords];
   uword vm_tag_;
   uword user_tag_;
-  uword sp_;
-  uword fp_;
+  uword metadata_;
   uword lr_;
   uword state_;
 
   /* There are a variable number of words that follow, the words hold the
    * sampled pc values. Access via GetPCArray() */
 
   DISALLOW_COPY_AND_ASSIGN(Sample);
 };
 
 
@@ skipping 49 matching lines @@
   intptr_t capacity_;
   uintptr_t cursor_;
 
   DISALLOW_COPY_AND_ASSIGN(SampleBuffer);
 };
 
 
 }  // namespace dart
 
 #endif  // VM_PROFILER_H_