Make TimelineRingRecorder use TimelineEventBlocks

runtime/vm/timeline.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_TIMELINE_H_
 #define VM_TIMELINE_H_
 
 #include "vm/allocation.h"
 #include "vm/bitfield.h"
 
@@ skipping 253 matching lines @@
  private:
   TimelineEvent* event_;
 };
 
 
 // A block of |TimelineEvent|s. Not thread safe.
 class TimelineEventBlock {
  public:
   static const intptr_t kBlockSize = 64;
 
-  TimelineEventBlock();
+  explicit TimelineEventBlock(intptr_t index);
+  ~TimelineEventBlock();
 
   TimelineEventBlock* next() const {
     return next_;
   }
   void set_next(TimelineEventBlock* next) {
     next_ = next;
   }
 
   intptr_t length() const {
     return length_;
   }
 
+  intptr_t block_index() const {
+    return block_index_;
+  }
+
   bool IsEmpty() const {
     return length_ == 0;
   }
 
   bool IsFull() const {
     return length_ == kBlockSize;
   }
 
   TimelineEvent* At(intptr_t index) {
     ASSERT(index >= 0);
     ASSERT(index < kBlockSize);
     return &events_[index];
   }
 
+  const TimelineEvent* At(intptr_t index) const {
+    ASSERT(index >= 0);
+    ASSERT(index < kBlockSize);
+    return &events_[index];
+  }
+
   // Attempt to sniff a thread id from the first event.
   ThreadId thread() const;
   // Attempt to sniff the timestamp from the first event.
   int64_t LowerTimeBound() const;
 
   // Returns false if |this| violates any of the following invariants:
   // - events in the block come from one thread.
   // - events have monotonically increasing timestamps.
   bool CheckBlock();
 
+  // Call Reset on all events and set length to 0.
+  void Reset();
+
  protected:
   TimelineEvent* StartEvent();
 
   TimelineEvent events_[kBlockSize];
   TimelineEventBlock* next_;
   intptr_t length_;
+  intptr_t block_index_;
 
   friend class TimelineEventEndlessRecorder;
+  friend class TimelineEventRecorder;
   friend class TimelineTestHelper;
 
  private:
   DISALLOW_COPY_AND_ASSIGN(TimelineEventBlock);
 };
 
 
 // Recorder of |TimelineEvent|s.
 class TimelineEventRecorder {
  public:
   TimelineEventRecorder();
   virtual ~TimelineEventRecorder() {}
 
   // Interface method(s) which must be implemented.
   virtual void PrintJSON(JSONStream* js) = 0;
-
-  // Override if recorder uses blocks.
-  virtual TimelineEventBlock* GetNewBlock() {
-    return NULL;
-  }
+  virtual TimelineEventBlock* GetNewBlock() = 0;
 
   void WriteTo(const char* directory);
 
  protected:
   // Interface method(s) which must be implemented.
   virtual void VisitObjectPointers(ObjectPointerVisitor* visitor) = 0;
   virtual TimelineEvent* StartEvent(const Object& object) = 0;
   virtual TimelineEvent* StartEvent() = 0;
   virtual void CompleteEvent(TimelineEvent* event) = 0;
 
   // Utility method(s).
   void PrintJSONMeta(JSONArray* array) const;
+  TimelineEvent* ThreadBlockStartEvent();
 
   friend class TimelineStream;
   friend class Isolate;
 
  private:
   DISALLOW_COPY_AND_ASSIGN(TimelineEventRecorder);
 };
 
 
 // A recorder that stores events in a ring buffer of fixed capacity.
 // This recorder does track Dart objects.
-// TODO(johnmccutchan): Make this recorder use event blocks too.
 class TimelineEventRingRecorder : public TimelineEventRecorder {
  public:
   static const intptr_t kDefaultCapacity = 8192;
 
-  static intptr_t SizeForCapacity(intptr_t capacity);
-
   explicit TimelineEventRingRecorder(intptr_t capacity = kDefaultCapacity);
   ~TimelineEventRingRecorder();
 
   void PrintJSON(JSONStream* js);
+  TimelineEventBlock* GetNewBlock();
 
  protected:
   void VisitObjectPointers(ObjectPointerVisitor* visitor);
   TimelineEvent* StartEvent(const Object& object);
   TimelineEvent* StartEvent();
   void CompleteEvent(TimelineEvent* event);
 
+  TimelineEventBlock* GetNewBlockLocked();
+
   void PrintJSONEvents(JSONArray* array) const;
 
-  intptr_t GetNextIndex();
-
-  // events_[i] and event_objects_[i] are indexed together.
-  TimelineEvent* events_;
+  TimelineEventBlock** blocks_;
   RawArray* event_objects_;
-  uintptr_t cursor_;
   intptr_t capacity_;
+  intptr_t num_blocks_;
+  intptr_t block_cursor_;
+  Mutex lock_;
 };
 
 
 // An abstract recorder that calls |StreamEvent| whenever an event is complete.
 // This recorder does not track Dart objects.
 class TimelineEventStreamingRecorder : public TimelineEventRecorder {
  public:
   TimelineEventStreamingRecorder();
   ~TimelineEventStreamingRecorder();
 
   void PrintJSON(JSONStream* js);
+  virtual TimelineEventBlock* GetNewBlock() {
+    return NULL;
+  }
 
   // Called when |event| is ready to be streamed. It is unsafe to keep a
   // reference to |event| as it may be freed as soon as this function returns.
   virtual void StreamEvent(TimelineEvent* event) = 0;
 
  protected:
   void VisitObjectPointers(ObjectPointerVisitor* visitor);
   TimelineEvent* StartEvent(const Object& object);
   TimelineEvent* StartEvent();
   void CompleteEvent(TimelineEvent* event);
@@ skipping 24 matching lines @@
   void VisitObjectPointers(ObjectPointerVisitor* visitor);
   TimelineEvent* StartEvent(const Object& object);
   TimelineEvent* StartEvent();
   void CompleteEvent(TimelineEvent* event);
 
   TimelineEventBlock* GetNewBlockLocked();
   void PrintJSONEvents(JSONArray* array) const;
 
   Mutex lock_;
   TimelineEventBlock* head_;
+  intptr_t block_index_;
 
   friend class TimelineEventBlockIterator;
 };
 
 
 // An iterator for blocks.
 class TimelineEventBlockIterator {
  public:
   explicit TimelineEventBlockIterator(TimelineEventEndlessRecorder* recorder);
   ~TimelineEventBlockIterator();
 
   void Reset();
   bool Next();
 
   TimelineEventBlock* current() const {
     return current_;
   }
 
  private:
   TimelineEventBlock* current_;
   TimelineEventEndlessRecorder* recorder_;
 };
 
 }  // namespace dart
 
 #endif  // VM_TIMELINE_H_