DevTools: Show GPU utilization bar on timeline

Source/core/inspector/TimelineTraceEventProcessor.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 159 matching lines @@
     registerHandler(InstrumentationEvents::RasterTask, TRACE_EVENT_PHASE_BEGIN, &TimelineTraceEventProcessor::onRasterTaskBegin);
     registerHandler(InstrumentationEvents::RasterTask, TRACE_EVENT_PHASE_END, &TimelineTraceEventProcessor::onRasterTaskEnd);
     registerHandler(InstrumentationEvents::ImageDecodeTask, TRACE_EVENT_PHASE_BEGIN, &TimelineTraceEventProcessor::onImageDecodeTaskBegin);
     registerHandler(InstrumentationEvents::ImageDecodeTask, TRACE_EVENT_PHASE_END, &TimelineTraceEventProcessor::onImageDecodeTaskEnd);
     registerHandler(InstrumentationEvents::Layer, TRACE_EVENT_PHASE_DELETE_OBJECT, &TimelineTraceEventProcessor::onLayerDeleted);
     registerHandler(InstrumentationEvents::Paint, TRACE_EVENT_PHASE_INSTANT, &TimelineTraceEventProcessor::onPaint);
     registerHandler(PlatformInstrumentation::ImageDecodeEvent, TRACE_EVENT_PHASE_BEGIN, &TimelineTraceEventProcessor::onImageDecodeBegin);
     registerHandler(PlatformInstrumentation::ImageDecodeEvent, TRACE_EVENT_PHASE_END, &TimelineTraceEventProcessor::onImageDecodeEnd);
     registerHandler(PlatformInstrumentation::DrawLazyPixelRefEvent, TRACE_EVENT_PHASE_INSTANT, &TimelineTraceEventProcessor::onDrawLazyPixelRef);
     registerHandler(PlatformInstrumentation::LazyPixelRef, TRACE_EVENT_PHASE_DELETE_OBJECT, &TimelineTraceEventProcessor::onLazyPixelRefDeleted);
+    if (m_timelineAgent.get()->isCollectingGpuEvents()) {
+        // FIXME: Instead of filtering GPU events here on the client side
+        // just don't enable collection in the GPU process.
+        // Make sure GPU process agent can handle both client types connected
+        // simultaneously: ones that need GPU events and ones that do not.
+        registerHandler(InstrumentationEvents::GpuTask, TRACE_EVENT_PHASE_BEGIN, &TimelineTraceEventProcessor::onGpuTaskBegin);

[caseq, 2013/11/05 14:26:58]

How about s/Gpu/GPU/ globally on the patch?

[alph, 2013/11/05 14:59:16]

I'd like to keep it as "Gpu" taking into account other usage frequencies:

$ grep -r "Gpu" content/* | grep -v "#" | grep -v "//" | wc -l
2840
$ grep -r "GPU" content/* | grep -v "#" | grep -v "//" | grep -v "GPU_" | wc -l
305

wdyt?

[alph, 2013/11/05 18:28:58]

Done.

+        registerHandler(InstrumentationEvents::GpuTask, TRACE_EVENT_PHASE_END, &TimelineTraceEventProcessor::onGpuTaskEnd);
+    }
 
     TraceEventDispatcher::instance()->addProcessor(this, m_inspectorClient);
 }
 
 TimelineTraceEventProcessor::~TimelineTraceEventProcessor()
 {
 }
 
 void TimelineTraceEventProcessor::registerHandler(const char* name, char phase, TraceEventHandler handler)
 {
@@ skipping 220 matching lines @@
     if (const ImageResource* resource = renderImage->cachedImage())
         url = resource->url().string();
     m_pixelRefToImageInfo.set(pixelRefId, ImageInfo(nodeId, url));
 }
 
 void TimelineTraceEventProcessor::onLazyPixelRefDeleted(const TraceEvent& event)
 {
     m_pixelRefToImageInfo.remove(event.id());
 }
 
+void TimelineTraceEventProcessor::onGpuTaskBegin(const TraceEvent& event)
+{
+    RefPtr<JSONObject> data = JSONObject::create();
+    data->setString("name", event.name());

[caseq, 2013/11/05 14:26:58]

Do we really want to expose this?

[alph, 2013/11/05 14:59:16]

not really. nuked.

+    data->setNumber("ownerPid", event.asUInt(InstrumentationEventArguments::OwnerPid));

[caseq, 2013/11/05 14:26:58]

Please extract the above lines into a TimelineRecordFactory method.

[alph, 2013/11/05 14:59:16]

The record creation is quite simple already. Also why do you think it is
different from e.g. onPaint?

[alph, 2013/11/05 18:28:58]

Done.

+    m_gpuTask = createRecord(event, TimelineRecordType::GPUTask, data);
+}
+
+void TimelineTraceEventProcessor::onGpuTaskEnd(const TraceEvent& event)
+{
+    InspectorTimelineAgent* timelineAgent = m_timelineAgent.get();
+    if (!timelineAgent || !m_gpuTask)
+        return;
+    m_gpuTask->setNumber("endTime", m_timeConverter.fromMonotonicallyIncreasingTime(event.timestamp()));
+    timelineAgent->sendEvent(m_gpuTask);
+    m_gpuTask.clear();
+}
+
 PassRefPtr<JSONObject> TimelineTraceEventProcessor::createRecord(const TraceEvent& event, const String& recordType, PassRefPtr<JSONObject> data)
 {
     double startTime = m_timeConverter.fromMonotonicallyIncreasingTime(event.timestamp());
     RefPtr<JSONObject> record = TimelineRecordFactory::createBackgroundRecord(startTime, String::number(event.threadIdentifier()));
     record->setString("type", recordType);
     record->setObject("data", data ? data : JSONObject::create());
     return record.release();
 }
 
 void TimelineTraceEventProcessor::processBackgroundEvents()
@@ skipping 17 matching lines @@
 }
 
 void TimelineTraceEventProcessor::processBackgroundEventsTask()
 {
     m_processEventsTaskInFlight = false;
     processBackgroundEvents();
 }
 
 } // namespace WebCore