Don't conflate Timeline serialized json with event type

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 97 matching lines @@
   TimelineEvent();
   ~TimelineEvent();
 
   void Reset();
 
   bool IsValid() const {
     return (event_type() > kNone) && (event_type() < kNumEventTypes);
   }
 
   // Marks the beginning of an asynchronous operation with |async_id|.
-  void AsyncBegin(const char* label, int64_t async_id);
+  void AsyncBegin(const char* label,
+                  int64_t async_id,
+                  int64_t micros = OS::GetCurrentMonotonicMicros());
   // Marks an instantaneous event associated with |async_id|.
   void AsyncInstant(const char* label,
-                    int64_t async_id);
+                    int64_t async_id,
+                    int64_t micros = OS::GetCurrentMonotonicMicros());
   // Marks the end of an asynchronous operation associated with |async_id|.
   void AsyncEnd(const char* label,
-                int64_t async_id);
+                int64_t async_id,
+                int64_t micros = OS::GetCurrentMonotonicMicros());
 
-  void DurationBegin(const char* label);
-  void DurationEnd();
-  void Instant(const char* label);
+  void DurationBegin(const char* label,
+                     int64_t micros = OS::GetCurrentMonotonicMicros());
+  void DurationEnd(int64_t micros = OS::GetCurrentMonotonicMicros());
+  void Instant(const char* label,
+               int64_t micros = OS::GetCurrentMonotonicMicros());
 
   void Duration(const char* label,
                 int64_t start_micros,
                 int64_t end_micros);
 
   void Begin(const char* label,
              int64_t micros = OS::GetCurrentMonotonicMicros());
 
   void End(const char* label,
            int64_t micros = OS::GetCurrentMonotonicMicros());
 
-  void SerializedJSON(const char* json,
-                      int64_t timestamp0,
-                      int64_t timestamp1);
+  // Completes this event with pre-serialized JSON. Copies |json|.
+  void CompleteWithPreSerializedJSON(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 |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);
   // Mandatory to call when this event is completely filled out.
   void Complete();
 
   EventType event_type() const {
     return EventTypeField::decode(state_);
   }
 
   bool IsFinishedDuration() const {
-    return (SerializedJSONIsDuration() || (event_type() == kDuration)) &&
-           (timestamp1_ > timestamp0_);
+    return (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 60 matching lines @@
       }
       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;
   }
 
+  bool pre_serialized_json() const {
+    return PreSerializedJSON::decode(state_);
+  }
+
+  void set_pre_serialized_json(bool pre_serialized_json) {
+    state_ = PreSerializedJSON::update(pre_serialized_json, state_);
+  }
+
   enum StateBits {
     kEventTypeBit = 0,  // reserve 4 bits for type.
-    kSerializedJSONIsDuration = 4,
+    kPreSerializedJSON = 4,
     kNextBit = 5,
   };
 
   class EventTypeField : public BitField<EventType, kEventTypeBit, 4> {};
-  class SerializedJSONIsDurationField :
-      public BitField<bool, kSerializedJSONIsDuration, 1> {};
+  class PreSerializedJSON :
+      public BitField<bool, kPreSerializedJSON, 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 444 matching lines @@
 
  private:
   TimelineEventBlock* current_;
   TimelineEventRecorder* recorder_;
 };
 
 
 }  // namespace dart
 
 #endif  // VM_TIMELINE_H_