Handle duration events when filtering the timeline for a time range

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 144 matching lines @@
   void StealArguments(intptr_t arguments_length,
                       TimelineEventArgument* arguments);
   // Mandatory to call when this event is completely filled out.
   void Complete();
 
   EventType event_type() const {
     return EventTypeField::decode(state_);
   }
 
   bool IsFinishedDuration() const {
-    return (event_type() == kDuration) && (timestamp1_ > timestamp0_);
+    return (SerializedJSONIsDuration() || (event_type() == kDuration)) &&
+           (timestamp1_ > timestamp0_);
   }
 
   int64_t TimeOrigin() const;
   int64_t AsyncId() const;
   int64_t TimeDuration() const;
   int64_t TimeEnd() const {
     ASSERT(IsFinishedDuration());
     return timestamp1_;
   }
 
@@ skipping 55 matching lines @@
       if (other->TimeOrigin() > TimeEnd()) {
         return false;
       }
       if (other->TimeEnd() > TimeEnd()) {
         return false;
       }
       return true;
     }
   }
 
+  bool Within(int64_t time_origin_micros,
+              int64_t time_extent_micros);
+
   const char* GetSerializedJSON() const;
 
+  void SetSerializedJSONIsDuration(bool duration) {
+    state_ = SerializedJSONIsDurationField::update(duration, state_);
+  }
+
+  bool SerializedJSONIsDuration() const {
+    return SerializedJSONIsDurationField::decode(state_);
+  }
+
  private:
   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_);
   }
 
   void set_timestamp0(int64_t value) {
     ASSERT(timestamp0_ == 0);
     timestamp0_ = value;
   }
   void set_timestamp1(int64_t value) {
     ASSERT(timestamp1_ == 0);
     timestamp1_ = value;
   }
 
   enum StateBits {
     kEventTypeBit = 0,  // reserve 4 bits for type.
-    kNextBit = 4,
+    kSerializedJSONIsDuration = 4,
+    kNextBit = 5,
   };
 
   class EventTypeField : public BitField<EventType, kEventTypeBit, 4> {};
+  class SerializedJSONIsDurationField :
+      public BitField<bool, kSerializedJSONIsDuration, 1> {};
 
   int64_t timestamp0_;
   int64_t timestamp1_;
   TimelineEventArgument* arguments_;
   intptr_t arguments_length_;
   uword state_;
   const char* label_;
   const char* category_;
   ThreadId thread_;
   Dart_Port isolate_id_;
@@ skipping 257 matching lines @@
     return !block->IsEmpty() && !block->in_use();
   }
 
   virtual bool IncludeEvent(TimelineEvent* event) {
     if (event == NULL) {
       return false;
     }
     return event->IsValid();
   }
 
-  bool EventInTimeRange(TimelineEvent* event);
+  int64_t time_origin_micros() const {
+    return time_origin_micros_;
+  }
+
+  int64_t time_extent_micros() const {
+    return time_extent_micros_;
+  }
 
  private:
   int64_t time_origin_micros_;
   int64_t time_extent_micros_;
 };
 
 
 class IsolateTimelineEventFilter : public TimelineEventFilter {
  public:
   explicit IsolateTimelineEventFilter(Dart_Port isolate_id,
@@ skipping 160 matching lines @@
 
  private:
   TimelineEventBlock* current_;
   TimelineEventRecorder* recorder_;
 };
 
 
 }  // namespace dart
 
 #endif  // VM_TIMELINE_H_