TimelinePanel: make GC events synchronous.

Source/core/inspector/InspectorTimelineAgent.cpp

 /*
 * Copyright (C) 2013 Google Inc. All rights reserved.
 *
 * Redistribution and use in source and binary forms, with or without
 * modification, are permitted provided that the following conditions are
 * met:
 *
 *     * Redistributions of source code must retain the above copyright
 * notice, this list of conditions and the following disclaimer.
 *     * Redistributions in binary form must reproduce the above
@@ skipping 198 matching lines @@
         , inKnownLayerTask(false)
         , decodedPixelRefId(0)
     {
     }
 
     TimelineRecordStack recordStack;
     bool inKnownLayerTask;
     unsigned long long decodedPixelRefId;
 };
 
-struct TimelineGCEvent {
-    TimelineGCEvent(double startTime, double endTime, size_t collectedBytes)
-        : startTime(startTime), endTime(endTime), collectedBytes(collectedBytes)
-    {
-    }
-    double startTime;
-    double endTime;
-    size_t collectedBytes;
-};
-
 struct TimelineImageInfo {
     int backendNodeId;
     String url;
 
     TimelineImageInfo() : backendNodeId(0) { }
     TimelineImageInfo(int backendNodeId, String url) : backendNodeId(backendNodeId), url(url) { }
 };
 
 static LocalFrame* frameForExecutionContext(ExecutionContext* context)
 {
@@ skipping 12 matching lines @@
         return true;
 
     for (size_t i = 0; i < eventPath.size(); i++) {
         if (eventPath[i].node()->hasEventListeners(eventType))
             return true;
     }
 
     return false;
 }
 
-void InspectorTimelineAgent::pushGCEventRecords()
-{
-    if (!m_gcEvents.size())
-        return;
-
-    GCEvents events = m_gcEvents;
-    m_gcEvents.clear();
-    for (GCEvents::iterator i = events.begin(); i != events.end(); ++i) {
-        double ts = i->startTime * msPerSecond;
-        RefPtr<TimelineEvent> record = TimelineRecordFactory::createGenericRecord(ts, m_maxCallStackDepth, TimelineRecordType::GCEvent, TimelineRecordFactory::createGCEventData(i->collectedBytes));
-        record->setEndTime(i->endTime * msPerSecond);
-        addRecordToTimeline(record.release(), ts);
-    }
-}
-
 void InspectorTimelineAgent::didGC(double startTime, double endTime, size_t collectedBytesCount)
 {
-    m_gcEvents.append(TimelineGCEvent(startTime, endTime, collectedBytesCount));
+    RefPtr<TimelineEvent> record = TimelineRecordFactory::createGenericRecord(
+        startTime * msPerSecond,
+        0,
+        TimelineRecordType::GCEvent,
+        TimelineRecordFactory::createGCEventData(collectedBytesCount));
+    record->setEndTime(endTime * msPerSecond);
+    addRecordToTimeline(record.release(), timestamp());
 }
 
 InspectorTimelineAgent::~InspectorTimelineAgent()
 {
 }
 
 void InspectorTimelineAgent::setFrontend(InspectorFrontend* frontend)
 {
     m_frontend = frontend->timeline();
 }
@@ skipping 133 matching lines @@
     if (m_client) {
         TraceEventDispatcher::instance()->removeAllListeners(this, m_client);
         if (m_state->getBoolean(TimelineAgentState::includeGPUEvents))
             m_client->stopGPUEventsRecording();
     }
     m_instrumentingAgents->setInspectorTimelineAgent(0);
     ScriptGCEvent::removeEventListener(this);
 
     clearRecordStack();
     m_threadStates.clear();
-    m_gcEvents.clear();
     m_gpuTask.clear();
     m_layerToNodeMap.clear();
     m_pixelRefToImageInfo.clear();
     m_imageBeingPainted = 0;
     m_paintSetupStart = 0;
     m_mayEmitFirstPaint = false;
 
     for (size_t i = 0; i < m_consoleTimelines.size(); ++i) {
         String message = String::format("Timeline '%s' terminated.", m_consoleTimelines[i].utf8().data());
         mainFrame()->console().addMessage(ConsoleAPIMessageSource, DebugMessageLevel, message);
@@ skipping 707 matching lines @@
 void InspectorTimelineAgent::didCompleteCurrentRecord(const String& type)
 {
     // An empty stack could merely mean that the timeline agent was turned on in the middle of
     // an event. Don't treat as an error.
     if (!m_recordStack.isEmpty()) {
         if (m_platformInstrumentationClientInstalledAtStackDepth == m_recordStack.size()) {
             m_platformInstrumentationClientInstalledAtStackDepth = 0;
             PlatformInstrumentation::setClient(0);
         }
 
-        pushGCEventRecords();
         TimelineRecordEntry entry = m_recordStack.last();
         m_recordStack.removeLast();
         while (entry.type != type && entry.skipWhenUnbalanced && !m_recordStack.isEmpty()) {
             // Discard pending skippable entry, paste its children inplace.
             if (entry.children)
                 m_recordStack.last().children->concat(entry.children);
             entry = m_recordStack.last();
             m_recordStack.removeLast();
         }
         ASSERT(entry.type == type);
@@ skipping 32 matching lines @@
     , m_imageBeingPainted(0)
     , m_paintSetupStart(0)
     , m_styleRecalcElementCounter(0)
     , m_mayEmitFirstPaint(false)
     , m_lastProgressTimestamp(0)
 {
 }
 
 void InspectorTimelineAgent::appendRecord(PassRefPtr<JSONObject> data, const String& type, bool captureCallStack, LocalFrame* frame)
 {
-    pushGCEventRecords();
     double ts = timestamp();
     RefPtr<TimelineEvent> record = TimelineRecordFactory::createGenericRecord(ts, captureCallStack ? m_maxCallStackDepth : 0, type, data);
     setFrameIdentifier(record.get(), frame);
     addRecordToTimeline(record.release(), ts);
 }
 
 void InspectorTimelineAgent::sendEvent(PassRefPtr<TimelineEvent> record)
 {
     RefPtr<TimelineEvent> retain = record;
     if (m_bufferedEvents) {
         m_bufferedEvents->addItem(retain);
         if (!m_liveEvents.contains(TimelineRecordFactory::type(retain.get())))
             return;
     }
     m_frontend->eventRecorded(retain.release());
 }
 
 void InspectorTimelineAgent::pushCurrentRecord(PassRefPtr<JSONObject> data, const String& type, bool captureCallStack, LocalFrame* frame, bool hasLowLevelDetails)
 {
-    pushGCEventRecords();
     commitFrameRecord();
     RefPtr<TimelineEvent> record = TimelineRecordFactory::createGenericRecord(timestamp(), captureCallStack ? m_maxCallStackDepth : 0, type, data.get());
     setFrameIdentifier(record.get(), frame);
     m_recordStack.append(TimelineRecordEntry(record.release(), data, TypeBuilder::Array<TimelineEvent>::create(), type, getUsedHeapSize()));
     if (hasLowLevelDetails && !m_platformInstrumentationClientInstalledAtStackDepth && !PlatformInstrumentation::hasClient()) {
         m_platformInstrumentationClientInstalledAtStackDepth = m_recordStack.size();
         PlatformInstrumentation::setClient(this);
     }
 }
 
@@ skipping 112 matching lines @@
 
 #ifndef NDEBUG
 bool TimelineRecordStack::isOpenRecordOfType(const String& type)
 {
     return !m_stack.isEmpty() && m_stack.last().type == type;
 }
 #endif
 
 } // namespace WebCore