More timeline cleanups

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"
 #include "vm/os.h"
@@ skipping 70 matching lines @@
   char* value;
 };
 
 
 // You should get a |TimelineEvent| from a |TimelineStream|.
 class TimelineEvent {
  public:
   // Keep in sync with StateBits below.
   enum EventType {
     kNone,
+    kSerializedJSON,  // Events from Dart code.
     kBegin,
     kEnd,
     kDuration,
     kInstant,
     kAsyncBegin,
     kAsyncInstant,
     kAsyncEnd,
     kNumEventTypes,
   };
 
@@ skipping 22 matching lines @@
   void Duration(const char* label,
                 int64_t start_micros,
                 int64_t end_micros);
 
   void Begin(const char* label,
              int64_t micros = OS::GetCurrentTraceMicros());
 
   void End(const char* label,
            int64_t micros = OS::GetCurrentTraceMicros());
 
+  void SerializedJSON(const char* json);
+
   // Set the number of arguments in the event.
   void SetNumArguments(intptr_t length);
-  // |name| must be a compile time constant. Takes ownership of |argumentp|.
+  // |name| must be a compile time constant. Takes ownership of |argument|.
   void SetArgument(intptr_t i, const char* name, char* argument);
   // |name| must be a compile time constant. Copies |argument|.
   void CopyArgument(intptr_t i, const char* name, const char* argument);
   // |name| must be a compile time constant.
   void FormatArgument(intptr_t i,
                       const char* name,
                       const char* fmt, ...) PRINTF_ATTRIBUTE(4, 5);
 
   void StealArguments(intptr_t arguments_length,
                       TimelineEventArgument* arguments);
@@ skipping 15 matching lines @@
     ASSERT(IsFinishedDuration());
     return timestamp1_;
   }
 
   void PrintJSON(JSONStream* stream) const;
 
   ThreadId thread() const {
     return thread_;
   }
 
+  Dart_Port isolate_id() const {
+    return isolate_id_;
+  }
+
   const char* label() const {
     return label_;
   }
 
   // Does this duration end before |micros| ?
   bool DurationFinishedBefore(int64_t micros) const {
     return TimeEnd() <= micros;
   }
 
   bool IsDuration() const {
@@ skipping 35 matching lines @@
       if (other->TimeOrigin() > TimeEnd()) {
         return false;
       }
       if (other->TimeEnd() > TimeEnd()) {
         return false;
       }
       return true;
     }
   }
 
+  const char* GetSerializedJSON() const;
+
  private:
   int64_t timestamp0_;
   int64_t timestamp1_;
   TimelineEventArgument* arguments_;
   intptr_t arguments_length_;
   uword state_;
   const char* label_;
   const char* category_;
   ThreadId thread_;
-  Isolate* isolate_;
+  Dart_Port isolate_id_;
 
   void FreeArguments();
 
   void StreamInit(TimelineStream* stream);
   void Init(EventType event_type, const char* label);
 
   void set_event_type(EventType event_type) {
     // We only reserve 4 bits to hold the event type.
     COMPILE_ASSERT(kNumEventTypes < 16);
     state_ = EventTypeField::update(event_type, state_);
@@ skipping 143 matching lines @@
     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();
 
   // Only safe to access under the recorder's lock.
   bool in_use() const {
     return in_use_;
   }
 
   // Only safe to access under the recorder's lock.
-  Isolate* isolate() const {
-    return isolate_;
+  ThreadId thread_id() const {
+    return thread_id_;
   }
 
  protected:
   TimelineEvent* StartEvent();
 
   TimelineEvent events_[kBlockSize];
   TimelineEventBlock* next_;
   intptr_t length_;
   intptr_t block_index_;
 
   // Only accessed under the recorder's lock.
-  Isolate* isolate_;
+  ThreadId thread_id_;
   bool in_use_;
 
-  void Open(Isolate* isolate);
+  void Open();
   void Finish();
 
   friend class Thread;
   friend class ThreadRegistry;
   friend class TimelineEventRecorder;
   friend class TimelineEventRingRecorder;
   friend class TimelineEventEndlessRecorder;
   friend class TimelineTestHelper;
 
  private:
@@ skipping 20 matching lines @@
     }
     return event->IsValid();
   }
 
  private:
 };
 
 
 class IsolateTimelineEventFilter : public TimelineEventFilter {
  public:
-  explicit IsolateTimelineEventFilter(Isolate* isolate);
+  explicit IsolateTimelineEventFilter(Dart_Port isolate_id);
 
   bool IncludeBlock(TimelineEventBlock* block) {
     if (block == NULL) {
       return false;
     }
     // Not empty, not in use, and isolate match.
-    return !block->IsEmpty() && !block->in_use() &&
-           (block->isolate() == isolate_);
+    return !block->IsEmpty() && !block->in_use();
+  }
+
+  bool IncludeEvent(TimelineEvent* event) {
+    return event->IsValid() &&
+           (event->isolate_id() == isolate_id_);
   }
 
  private:
-  Isolate* isolate_;
+  Dart_Port isolate_id_;
 };
 
 
-// Timeline events from Dart code are eagerly converted to JSON and stored
-// as a C string.
-class DartTimelineEvent {
- public:
-  DartTimelineEvent();
-  ~DartTimelineEvent();
-
-  void Clear();
-
-  // This function makes a copy of |event|.
-  void Init(Isolate* isolate, const char* event);
-
-  bool IsValid() const {
-    return (isolate_ != NULL) &&
-           (event_as_json_ != NULL);
-  }
-
-  Isolate* isolate() const {
-    return isolate_;
-  }
-
-  char* event_as_json() const {
-    return event_as_json_;
-  }
-
- private:
-  Isolate* isolate_;
-  char* event_as_json_;
-
-  DISALLOW_COPY_AND_ASSIGN(DartTimelineEvent);
-};
-
-
 // Recorder of |TimelineEvent|s.
 class TimelineEventRecorder {
  public:
   TimelineEventRecorder();
   virtual ~TimelineEventRecorder() {}
 
   TimelineEventBlock* GetNewBlock();
 
   // Interface method(s) which must be implemented.
   virtual void PrintJSON(JSONStream* js, TimelineEventFilter* filter) = 0;
   virtual void PrintTraceEvent(JSONStream* js, TimelineEventFilter* filter) = 0;
 
   int64_t GetNextAsyncId();
 
   void FinishBlock(TimelineEventBlock* block);
 
-  // Interface method(s) which must be implemented.
-  virtual void AppendDartEvent(Isolate* isolate, const char* event) = 0;
-
  protected:
   void WriteTo(const char* directory);
 
   // Interface method(s) which must be implemented.
   virtual TimelineEvent* StartEvent() = 0;
   virtual void CompleteEvent(TimelineEvent* event) = 0;
   virtual TimelineEventBlock* GetHeadBlockLocked() = 0;
-  virtual TimelineEventBlock* GetNewBlockLocked(Isolate* isolate) = 0;
-  virtual intptr_t NumDartEventsLocked() = 0;
-  virtual DartTimelineEvent* DartEventAtLocked(intptr_t i) = 0;
+  virtual TimelineEventBlock* GetNewBlockLocked() = 0;
 
   // Utility method(s).
   void PrintJSONMeta(JSONArray* array) const;
   TimelineEvent* ThreadBlockStartEvent();
   void ThreadBlockCompleteEvent(TimelineEvent* event);
 
   Mutex lock_;
   uintptr_t async_id_;
 
-  friend class DartTimelineEventIterator;
   friend class TimelineEvent;
   friend class TimelineEventBlockIterator;
   friend class TimelineStream;
   friend class TimelineTestHelper;
   friend class Timeline;
 
  private:
   DISALLOW_COPY_AND_ASSIGN(TimelineEventRecorder);
 };
 
 
 // A recorder that stores events in a ring buffer of fixed capacity.
 class TimelineEventRingRecorder : public TimelineEventRecorder {
  public:
   static const intptr_t kDefaultCapacity = 8192;
 
   explicit TimelineEventRingRecorder(intptr_t capacity = kDefaultCapacity);
   ~TimelineEventRingRecorder();
 
   void PrintJSON(JSONStream* js, TimelineEventFilter* filter);
   void PrintTraceEvent(JSONStream* js, TimelineEventFilter* filter);
 
-  void AppendDartEvent(Isolate* isolate, const char* event);
-
  protected:
   TimelineEvent* StartEvent();
   void CompleteEvent(TimelineEvent* event);
   TimelineEventBlock* GetHeadBlockLocked();
   intptr_t FindOldestBlockIndex() const;
-  TimelineEventBlock* GetNewBlockLocked(Isolate* isolate);
-  intptr_t NumDartEventsLocked();
-  DartTimelineEvent* DartEventAtLocked(intptr_t i);
+  TimelineEventBlock* GetNewBlockLocked();
 
   void PrintJSONEvents(JSONArray* array, TimelineEventFilter* filter) const;
 
   TimelineEventBlock** blocks_;
   intptr_t capacity_;
   intptr_t num_blocks_;
   intptr_t block_cursor_;
-
-  DartTimelineEvent** dart_events_;
-  intptr_t dart_events_capacity_;
-  intptr_t dart_events_cursor_;
 };
 
 
 // An abstract recorder that calls |StreamEvent| whenever an event is complete.
 class TimelineEventStreamingRecorder : public TimelineEventRecorder {
  public:
   TimelineEventStreamingRecorder();
   ~TimelineEventStreamingRecorder();
 
   void PrintJSON(JSONStream* js, TimelineEventFilter* filter);
   void PrintTraceEvent(JSONStream* js, TimelineEventFilter* filter);
 
-  void AppendDartEvent(Isolate* isolate, const char* event);
-
   // 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;
-  virtual void StreamDartEvent(const char* event) = 0;
 
  protected:
-  TimelineEventBlock* GetNewBlockLocked(Isolate* isolate) {
+  TimelineEventBlock* GetNewBlockLocked() {
     return NULL;
   }
   TimelineEventBlock* GetHeadBlockLocked() {
     return NULL;
   }
-  intptr_t NumDartEventsLocked();
-  DartTimelineEvent* DartEventAtLocked(intptr_t i);
   TimelineEvent* StartEvent();
   void CompleteEvent(TimelineEvent* event);
 };
 
 
 // A recorder that stores events in chains of blocks of events.
 // NOTE: This recorder will continue to allocate blocks until it exhausts
 // memory.
 class TimelineEventEndlessRecorder : public TimelineEventRecorder {
  public:
   TimelineEventEndlessRecorder();
 
   void PrintJSON(JSONStream* js, TimelineEventFilter* filter);
   void PrintTraceEvent(JSONStream* js, TimelineEventFilter* filter);
 
-  void AppendDartEvent(Isolate* isolate, const char* event);
-
  protected:
   TimelineEvent* StartEvent();
   void CompleteEvent(TimelineEvent* event);
-  TimelineEventBlock* GetNewBlockLocked(Isolate* isolate);
+  TimelineEventBlock* GetNewBlockLocked();
   TimelineEventBlock* GetHeadBlockLocked();
-  intptr_t NumDartEventsLocked();
-  DartTimelineEvent* DartEventAtLocked(intptr_t i);
 
   void PrintJSONEvents(JSONArray* array, TimelineEventFilter* filter) const;
 
   // Useful only for testing. Only works for one thread.
   void Clear();
 
   TimelineEventBlock* head_;
   intptr_t block_index_;
 
-  DartTimelineEvent** dart_events_;
-  intptr_t dart_events_capacity_;
-  intptr_t dart_events_cursor_;
-
   friend class TimelineTestHelper;
 };
 
 
 // An iterator for blocks.
 class TimelineEventBlockIterator {
  public:
   explicit TimelineEventBlockIterator(TimelineEventRecorder* recorder);
   ~TimelineEventBlockIterator();
 
   void Reset(TimelineEventRecorder* recorder);
 
   // Returns false when there are no more blocks.
   bool HasNext() const;
 
   // Returns the next block and moves forward.
   TimelineEventBlock* Next();
 
  private:
   TimelineEventBlock* current_;
   TimelineEventRecorder* recorder_;
 };
 
 
-// An iterator for timeline events.
-class DartTimelineEventIterator {
- public:
-  explicit DartTimelineEventIterator(TimelineEventRecorder* recorder);
-  ~DartTimelineEventIterator();
-
-  void Reset(TimelineEventRecorder* recorder);
-
-  // Returns true if there is another event.
-  bool HasNext() const;
-
-  // Returns the next event and moves forward.
-  DartTimelineEvent* Next();
-
-  // Returns a zone allocated string of all trace events for isolate.
-  // If isolate is NULL, all isolates' events will be included.
-  static const char* PrintTraceEvents(TimelineEventRecorder* recorder,
-                                      Zone* zone,
-                                      Isolate* isolate);
-
- private:
-  intptr_t cursor_;
-  intptr_t num_events_;
-  TimelineEventRecorder* recorder_;
-};
-
 }  // namespace dart
 
 #endif  // VM_TIMELINE_H_