First version of PerformanceObserver

Source/core/timing/PerformanceBase.cpp

Index: Source/core/timing/PerformanceBase.cpp
diff --git a/Source/core/timing/PerformanceBase.cpp b/Source/core/timing/PerformanceBase.cpp
index c742fadbc9e96b1c913232b5874fea0075a8253a..74daf8c1813022b04f735ce63f4b4d215f6b2ad4 100644
--- a/Source/core/timing/PerformanceBase.cpp
+++ b/Source/core/timing/PerformanceBase.cpp
@@ -35,6 +35,7 @@
 #include "core/dom/Document.h"
 #include "core/events/Event.h"
 #include "core/timing/PerformanceCompositeTiming.h"
+#include "core/timing/PerformanceObserver.h"
 #include "core/timing/PerformanceRenderTiming.h"
 #include "core/timing/PerformanceResourceTiming.h"
 #include "core/timing/PerformanceUserTiming.h"
@@ -44,6 +45,8 @@
 
 namespace blink {
 
+using PerformanceObserverVector = HeapVector<Member<PerformanceObserver>>;
+
 static const size_t defaultResourceTimingBufferSize = 150;
 static const size_t defaultFrameTimingBufferSize = 150;
 
@@ -52,6 +55,8 @@ PerformanceBase::PerformanceBase(double timeOrigin)
     , m_resourceTimingBufferSize(defaultResourceTimingBufferSize)
     , m_timeOrigin(timeOrigin)
     , m_userTiming(nullptr)
+    , m_observerFilterOptions(PerformanceEntry::Invalid)
+    , m_deliverObservationsTimer(this, &PerformanceBase::deliverObservationsTimerFired)
 {
 }
 
@@ -88,25 +93,28 @@ PerformanceEntryVector PerformanceBase::getEntries() const
 PerformanceEntryVector PerformanceBase::getEntriesByType(const String& entryType)
 {
     PerformanceEntryVector entries;
+    PerformanceEntry::EntryType type = PerformanceEntry::toEntryTypeEnum(entryType);
+
+    if (type == PerformanceEntry::Invalid)

[esprehn, 2015/09/09 22:41:40]

This should be a switch() over the type.

[MikeB, 2015/09/10 19:53:01]

Done.

+        return entries;
 
-    if (equalIgnoringCase(entryType, "resource")) {
+    if (type == PerformanceEntry::Resource) {
         for (const auto& resource : m_resourceTimingBuffer)
             entries.append(resource);
     }
 
-    if (equalIgnoringCase(entryType, "composite")
-        || equalIgnoringCase(entryType, "render")) {
+    if (type == PerformanceEntry::Composite || type == PerformanceEntry::Render) {
         for (const auto& frame : m_frameTimingBuffer) {
-            if (equalIgnoringCase(entryType, frame->entryType())) {
+            if (type == frame->entryTypeEnum()) {
                 entries.append(frame);
             }
         }
     }
 
     if (m_userTiming) {
-        if (equalIgnoringCase(entryType, "mark"))
+        if (type == PerformanceEntry::Mark)
             entries.appendVector(m_userTiming->getMarks());
-        else if (equalIgnoringCase(entryType, "measure"))
+        else if (type == PerformanceEntry::Measure)
             entries.appendVector(m_userTiming->getMeasures());
     }
 
@@ -117,16 +125,19 @@ PerformanceEntryVector PerformanceBase::getEntriesByType(const String& entryType
 PerformanceEntryVector PerformanceBase::getEntriesByName(const String& name, const String& entryType)
 {
     PerformanceEntryVector entries;
+    PerformanceEntry::EntryType type = PerformanceEntry::toEntryTypeEnum(entryType);
+
+    if (!entryType.isNull() && type == PerformanceEntry::Invalid)
+        return entries;
 
-    if (entryType.isNull() || equalIgnoringCase(entryType, "resource")) {
+    if (entryType.isNull() || type == PerformanceEntry::Resource) {
         for (const auto& resource : m_resourceTimingBuffer) {
             if (resource->name() == name)
                 entries.append(resource);
         }
     }
 
-    if (entryType.isNull() || equalIgnoringCase(entryType, "composite")
-        || equalIgnoringCase(entryType, "render")) {
+    if (entryType.isNull() || type == PerformanceEntry::Composite || type == PerformanceEntry::Render) {
         for (const auto& frame : m_frameTimingBuffer) {
             if (frame->name() == name && (entryType.isNull()
                 || equalIgnoringCase(entryType, frame->entryType()))) {
@@ -136,9 +147,9 @@ PerformanceEntryVector PerformanceBase::getEntriesByName(const String& name, con
     }
 
     if (m_userTiming) {
-        if (entryType.isNull() || equalIgnoringCase(entryType, "mark"))
+        if (entryType.isNull() || type == PerformanceEntry::Mark)
             entries.appendVector(m_userTiming->getMarks(name));
-        if (entryType.isNull() || equalIgnoringCase(entryType, "measure"))
+        if (entryType.isNull() || type == PerformanceEntry::Measure)
             entries.appendVector(m_userTiming->getMeasures(name));
     }
 
@@ -213,7 +224,7 @@ static bool allowsTimingRedirect(const Vector<ResourceResponse>& redirectChain,
 
 void PerformanceBase::addResourceTiming(const ResourceTimingInfo& info)
 {
-    if (isResourceTimingBufferFull())
+    if (isResourceTimingBufferFull() && !hasObserverFor(PerformanceEntry::Resource))
         return;
     SecurityOrigin* securityOrigin = nullptr;
     if (ExecutionContext* context = executionContext())
@@ -227,7 +238,7 @@ void PerformanceBase::addResourceTiming(const ResourceTimingInfo& info)
 
     if (info.redirectChain().isEmpty()) {
         PerformanceEntry* entry = PerformanceResourceTiming::create(info, timeOrigin(), startTime, allowTimingDetails);
-        addResourceTimingBuffer(entry);
+        addResourceTimingBuffer(*entry);
         return;
     }
 
@@ -246,12 +257,14 @@ void PerformanceBase::addResourceTiming(const ResourceTimingInfo& info)
     double lastRedirectEndTime = lastRedirectTiming->receiveHeadersEnd();
 
     PerformanceEntry* entry = PerformanceResourceTiming::create(info, timeOrigin(), startTime, lastRedirectEndTime, allowTimingDetails, allowRedirectDetails);
-    addResourceTimingBuffer(entry);
+    notifyObserversOfEntry(*entry);
+    if (!isResourceTimingBufferFull())
+        addResourceTimingBuffer(*entry);
 }
 
-void PerformanceBase::addResourceTimingBuffer(PerformanceEntry* entry)
+void PerformanceBase::addResourceTimingBuffer(PerformanceEntry& entry)
 {
-    m_resourceTimingBuffer.append(entry);
+    m_resourceTimingBuffer.append(&entry);
 
     if (isResourceTimingBufferFull()) {
         dispatchEvent(Event::create(EventTypeNames::resourcetimingbufferfull));
@@ -266,25 +279,29 @@ bool PerformanceBase::isResourceTimingBufferFull()
 
 void PerformanceBase::addRenderTiming(Document* initiatorDocument, unsigned sourceFrame, double startTime, double finishTime)
 {
-    if (isFrameTimingBufferFull())
+    if (isFrameTimingBufferFull() && !hasObserverFor(PerformanceEntry::Render))
         return;
 
     PerformanceEntry* entry = PerformanceRenderTiming::create(initiatorDocument, sourceFrame, startTime, finishTime);
-    addFrameTimingBuffer(entry);
+    notifyObserversOfEntry(*entry);
+    if (!isFrameTimingBufferFull())
+        addFrameTimingBuffer(*entry);
 }
 
 void PerformanceBase::addCompositeTiming(Document* initiatorDocument, unsigned sourceFrame, double startTime)
 {
-    if (isFrameTimingBufferFull())
+    if (isFrameTimingBufferFull() && !hasObserverFor(PerformanceEntry::Composite))
         return;
 
     PerformanceEntry* entry = PerformanceCompositeTiming::create(initiatorDocument, sourceFrame, startTime);
-    addFrameTimingBuffer(entry);
+    notifyObserversOfEntry(*entry);
+    if (!isFrameTimingBufferFull())
+        addFrameTimingBuffer(*entry);
 }
 
-void PerformanceBase::addFrameTimingBuffer(PerformanceEntry* entry)
+void PerformanceBase::addFrameTimingBuffer(PerformanceEntry& entry)
 {
-    m_frameTimingBuffer.append(entry);
+    m_frameTimingBuffer.append(&entry);
 
     if (isFrameTimingBufferFull())
         dispatchEvent(Event::create(EventTypeNames::frametimingbufferfull));
@@ -298,31 +315,104 @@ bool PerformanceBase::isFrameTimingBufferFull()
 void PerformanceBase::mark(const String& markName, ExceptionState& exceptionState)
 {
     if (!m_userTiming)
-        m_userTiming = UserTiming::create(this);
-    m_userTiming->mark(markName, exceptionState);
+        m_userTiming = UserTiming::create(*this);
+    if (PerformanceEntry* entry = m_userTiming->mark(markName, exceptionState))
+        notifyObserversOfEntry(*entry);
 }
 
 void PerformanceBase::clearMarks(const String& markName)
 {
     if (!m_userTiming)
-        m_userTiming = UserTiming::create(this);
+        m_userTiming = UserTiming::create(*this);
     m_userTiming->clearMarks(markName);
 }
 
 void PerformanceBase::measure(const String& measureName, const String& startMark, const String& endMark, ExceptionState& exceptionState)
 {
     if (!m_userTiming)
-        m_userTiming = UserTiming::create(this);
-    m_userTiming->measure(measureName, startMark, endMark, exceptionState);
+        m_userTiming = UserTiming::create(*this);
+    if (PerformanceEntry* entry = m_userTiming->measure(measureName, startMark, endMark, exceptionState))
+        notifyObserversOfEntry(*entry);
 }
 
 void PerformanceBase::clearMeasures(const String& measureName)
 {
     if (!m_userTiming)
-        m_userTiming = UserTiming::create(this);
+        m_userTiming = UserTiming::create(*this);
     m_userTiming->clearMeasures(measureName);
 }
 
+void PerformanceBase::registerPerformanceObserver(PerformanceObserver& observer)
+{
+    m_observerFilterOptions |= observer.filterOptions();
+    m_observers.add(&observer);
+}
+
+void PerformanceBase::unregisterPerformanceObserver(PerformanceObserver& oldObserver)
+{
+    m_observers.remove(&oldObserver);
+    updatePerformanceObserverFilterOptions();
+}
+
+void PerformanceBase::updatePerformanceObserverFilterOptions()
+{
+    m_observerFilterOptions = PerformanceEntry::Invalid;
+    for (const auto& observer : m_observers) {
+        m_observerFilterOptions |= observer->filterOptions();
+    }
+}
+
+void PerformanceBase::notifyObserversOfEntry(PerformanceEntry& entry)
+{
+    for (auto& observer : m_observers) {
+        if (observer->filterOptions() & entry.entryTypeEnum())
+            observer->enqueuePerformanceEntry(entry);
+    }
+}
+
+bool PerformanceBase::hasObserverFor(PerformanceEntry::EntryType filterType)
+{
+    return m_observerFilterOptions & filterType;
+}
+
+void PerformanceBase::activateObserver(PerformanceObserver& observer)
+{
+    if (m_activeObservers.isEmpty())
+        m_deliverObservationsTimer.startOneShot(0, FROM_HERE);
+
+    m_activeObservers.add(&observer);
+}
+
+void PerformanceBase::resumeSuspendedObservers()
+{
+    ASSERT(isMainThread());
+    if (m_suspendedObservers.isEmpty())
+        return;
+
+    PerformanceObserverVector suspended;
+    copyToVector(m_suspendedObservers, suspended);
+    for (size_t i = 0; i < suspended.size(); ++i) {
+        if (!suspended[i]->shouldBeSuspended()) {
+            m_suspendedObservers.remove(suspended[i]);
+            activateObserver(*suspended[i]);
+        }
+    }
+}
+
+void PerformanceBase::deliverObservationsTimerFired(Timer<PerformanceBase>*)
+{
+    ASSERT(isMainThread());
+    PerformanceObserverVector observers;
+    copyToVector(m_activeObservers, observers);
+    m_activeObservers.clear();
+    for (size_t i = 0; i < observers.size(); ++i) {
+        if (observers[i]->shouldBeSuspended())
+            m_suspendedObservers.add(observers[i]);
+        else
+            observers[i]->deliver();
+    }
+}
+
 double PerformanceBase::now() const
 {
     double nowSeconds = monotonicallyIncreasingTime() - m_timeOrigin;
@@ -335,6 +425,9 @@ DEFINE_TRACE(PerformanceBase)
     visitor->trace(m_frameTimingBuffer);
     visitor->trace(m_resourceTimingBuffer);
     visitor->trace(m_userTiming);
+    visitor->trace(m_observers);
+    visitor->trace(m_activeObservers);
+    visitor->trace(m_suspendedObservers);
     RefCountedGarbageCollectedEventTargetWithInlineData<PerformanceBase>::trace(visitor);
 }