diff --git a/engine/bindings/core/v8/ScriptController.cpp b/engine/bindings/core/v8/ScriptController.cpp index 9a75bbe2bb038cef53aeb3e4ed9b3fe5f971aaad..a020cb3f92646765f6c541c31ce414e53012cb9c 100644 --- a/engine/bindings/core/v8/ScriptController.cpp +++ b/engine/bindings/core/v8/ScriptController.cpp @@ -115,7 +115,7 @@ v8::Local ScriptController::callFunction(v8::Handle fun v8::Local ScriptController::callFunction(ExecutionContext* context, v8::Handle function, v8::Handle receiver, int argc, v8::Handle info[], v8::Isolate* isolate) { TRACE_EVENT1(TRACE_DISABLED_BY_DEFAULT("devtools.timeline"), "FunctionCall", "data", devToolsTraceEventData(context, function, isolate)); - TRACE_EVENT_INSTANT1(TRACE_DISABLED_BY_DEFAULT("devtools.timeline.stack"), "CallStack", "stack", InspectorCallStackEvent::currentCallStack()); + TRACE_EVENT_INSTANT1(TRACE_DISABLED_BY_DEFAULT("devtools.timeline.stack"), "CallStack", TRACE_EVENT_SCOPE_PROCESS, "stack", InspectorCallStackEvent::currentCallStack()); return V8ScriptRunner::callFunction(function, context, receiver, argc, info, isolate); } @@ -123,7 +123,7 @@ v8::Local ScriptController::callFunction(ExecutionContext* context, v v8::Local ScriptController::executeScriptAndReturnValue(v8::Handle context, const ScriptSourceCode& source) { TRACE_EVENT1(TRACE_DISABLED_BY_DEFAULT("devtools.timeline"), "EvaluateScript", "data", InspectorEvaluateScriptEvent::data(m_frame, source.url().string(), source.startLine())); - TRACE_EVENT_INSTANT1(TRACE_DISABLED_BY_DEFAULT("devtools.timeline.stack"), "CallStack", "stack", InspectorCallStackEvent::currentCallStack()); + TRACE_EVENT_INSTANT1(TRACE_DISABLED_BY_DEFAULT("devtools.timeline.stack"), "CallStack", TRACE_EVENT_SCOPE_PROCESS, "stack", InspectorCallStackEvent::currentCallStack()); v8::Local result; { @@ -146,7 +146,7 @@ v8::Local ScriptController::executeScriptAndReturnValue(v8::HandlepreviousSamplingState()); + if (isMainThread()) ScriptForbiddenScope::exit(); - } } void V8GCController::majorGCEpilogue(v8::Isolate* isolate) @@ -399,10 +397,8 @@ void V8GCController::majorGCEpilogue(v8::Isolate* isolate) v8::HandleScope scope(isolate); TRACE_EVENT_END0("v8", "majorGC"); - if (isMainThread()) { - TRACE_EVENT_SET_NONCONST_SAMPLING_STATE(V8PerIsolateData::from(isolate)->previousSamplingState()); + if (isMainThread()) ScriptForbiddenScope::exit(); - } } void V8GCController::collectGarbage(v8::Isolate* isolate) diff --git a/engine/bindings/core/v8/V8ScriptRunner.cpp b/engine/bindings/core/v8/V8ScriptRunner.cpp index 33e8faef7ed871bb79f7789ff72c77a7c799b8e1..9f6d746bf73117c74f057db1ed4c52a9347bab47 100644 --- a/engine/bindings/core/v8/V8ScriptRunner.cpp +++ b/engine/bindings/core/v8/V8ScriptRunner.cpp @@ -69,7 +69,7 @@ v8::Local V8ScriptRunner::compileScript(const ScriptSourceCode& sour v8::Local V8ScriptRunner::compileScript(v8::Handle code, const String& fileName, const TextPosition& scriptStartPosition, v8::Isolate* isolate, V8CacheOptions cacheOptions) { - TRACE_EVENT1("v8", "v8.compile", "fileName", fileName.utf8()); + TRACE_EVENT1("v8", "v8.compile", "fileName", fileName.utf8().data()); TRACE_EVENT_SCOPED_SAMPLING_STATE("v8", "V8Compile"); // NOTE: For compatibility with WebCore, ScriptSourceCode's line starts at diff --git a/engine/core/dom/Document.cpp b/engine/core/dom/Document.cpp index c55babb8c201ef5545b483d7b29afca5d4fd23cf..f0d5eebd417445697e3bc08763a8faef20b2b176 100644 --- a/engine/core/dom/Document.cpp +++ b/engine/core/dom/Document.cpp @@ -1066,8 +1066,8 @@ void Document::scheduleRenderTreeUpdate() page()->animator().scheduleVisualUpdate(); m_lifecycle.ensureStateAtMost(DocumentLifecycle::VisualUpdatePending); - TRACE_EVENT_INSTANT1(TRACE_DISABLED_BY_DEFAULT("devtools.timeline"), "ScheduleStyleRecalculation", "frame", frame()); - TRACE_EVENT_INSTANT1(TRACE_DISABLED_BY_DEFAULT("devtools.timeline.stack"), "CallStack", "stack", InspectorCallStackEvent::currentCallStack()); + TRACE_EVENT_INSTANT1(TRACE_DISABLED_BY_DEFAULT("devtools.timeline"), "ScheduleStyleRecalculation", TRACE_EVENT_SCOPE_PROCESS, "frame", frame()); + TRACE_EVENT_INSTANT1(TRACE_DISABLED_BY_DEFAULT("devtools.timeline.stack"), "CallStack", TRACE_EVENT_SCOPE_PROCESS, "stack", InspectorCallStackEvent::currentCallStack()); } bool Document::hasPendingForcedStyleRecalc() const @@ -1156,7 +1156,7 @@ void Document::updateRenderTree(StyleRecalcChange change) // FIXME: Remove m_styleRecalcElementCounter, we should just use the accessCount() on the resolver. m_styleRecalcElementCounter = 0; TRACE_EVENT_BEGIN1(TRACE_DISABLED_BY_DEFAULT("devtools.timeline"), "RecalculateStyles", "frame", frame()); - TRACE_EVENT_INSTANT1(TRACE_DISABLED_BY_DEFAULT("devtools.timeline.stack"), "CallStack", "stack", InspectorCallStackEvent::currentCallStack()); + TRACE_EVENT_INSTANT1(TRACE_DISABLED_BY_DEFAULT("devtools.timeline.stack"), "CallStack", TRACE_EVENT_SCOPE_PROCESS, "stack", InspectorCallStackEvent::currentCallStack()); DocumentAnimations::updateOutdatedAnimationPlayersIfNeeded(*this); evaluateMediaQueryListIfNeeded(); @@ -2591,7 +2591,7 @@ void Document::finishedParsing() if (RefPtr f = frame()) { checkCompleted(); - TRACE_EVENT_INSTANT1(TRACE_DISABLED_BY_DEFAULT("devtools.timeline"), "MarkDOMContent", "data", InspectorMarkLoadEvent::data(f.get())); + TRACE_EVENT_INSTANT1(TRACE_DISABLED_BY_DEFAULT("devtools.timeline"), "MarkDOMContent", TRACE_EVENT_SCOPE_PROCESS, "data", InspectorMarkLoadEvent::data(f.get())); } // Schedule dropping of the ElementDataCache. We keep it alive for a while after parsing finishes diff --git a/engine/core/dom/Node.cpp b/engine/core/dom/Node.cpp index b2f81e21b2974250da3b3ef17a8bcf09550d5f0e..2dc09f408b8b908887e90c10df8bca72d87e6a4f 100644 --- a/engine/core/dom/Node.cpp +++ b/engine/core/dom/Node.cpp @@ -617,7 +617,7 @@ void Node::traceStyleChange(StyleChangeType changeType) return; TRACE_EVENT_INSTANT1(TRACE_DISABLED_BY_DEFAULT("style.debug"), - "Node::setNeedsStyleRecalc", + "Node::setNeedsStyleRecalc", TRACE_EVENT_SCOPE_PROCESS, "data", jsonObjectForStyleInvalidation(nodeCount, this) ); } diff --git a/engine/core/dom/ScriptedAnimationController.cpp b/engine/core/dom/ScriptedAnimationController.cpp index d4815a274180a6d3790cc2cfa3e904d62d44b695..b1cc13e9fc1f67ffefe55c4af03126c145abc98d 100644 --- a/engine/core/dom/ScriptedAnimationController.cpp +++ b/engine/core/dom/ScriptedAnimationController.cpp @@ -90,8 +90,8 @@ ScriptedAnimationController::CallbackId ScriptedAnimationController::registerCal m_callbacks.append(callback); scheduleAnimationIfNeeded(); - TRACE_EVENT_INSTANT1(TRACE_DISABLED_BY_DEFAULT("devtools.timeline"), "RequestAnimationFrame", "data", InspectorAnimationFrameEvent::data(m_document, id)); - TRACE_EVENT_INSTANT1(TRACE_DISABLED_BY_DEFAULT("devtools.timeline.stack"), "CallStack", "stack", InspectorCallStackEvent::currentCallStack()); + TRACE_EVENT_INSTANT1(TRACE_DISABLED_BY_DEFAULT("devtools.timeline"), "RequestAnimationFrame", TRACE_EVENT_SCOPE_PROCESS, "data", InspectorAnimationFrameEvent::data(m_document, id)); + TRACE_EVENT_INSTANT1(TRACE_DISABLED_BY_DEFAULT("devtools.timeline.stack"), "CallStack", TRACE_EVENT_SCOPE_PROCESS, "stack", InspectorCallStackEvent::currentCallStack()); return id; } @@ -101,16 +101,16 @@ void ScriptedAnimationController::cancelCallback(CallbackId id) WTF_LOG(ScriptedAnimationController, "cancelCallback: id = %d", id); for (size_t i = 0; i < m_callbacks.size(); ++i) { if (m_callbacks[i]->m_id == id) { - TRACE_EVENT_INSTANT1(TRACE_DISABLED_BY_DEFAULT("devtools.timeline"), "CancelAnimationFrame", "data", InspectorAnimationFrameEvent::data(m_document, id)); - TRACE_EVENT_INSTANT1(TRACE_DISABLED_BY_DEFAULT("devtools.timeline.stack"), "CallStack", "stack", InspectorCallStackEvent::currentCallStack()); + TRACE_EVENT_INSTANT1(TRACE_DISABLED_BY_DEFAULT("devtools.timeline"), "CancelAnimationFrame", TRACE_EVENT_SCOPE_PROCESS, "data", InspectorAnimationFrameEvent::data(m_document, id)); + TRACE_EVENT_INSTANT1(TRACE_DISABLED_BY_DEFAULT("devtools.timeline.stack"), "CallStack", TRACE_EVENT_SCOPE_PROCESS, "stack", InspectorCallStackEvent::currentCallStack()); m_callbacks.remove(i); return; } } for (size_t i = 0; i < m_callbacksToInvoke.size(); ++i) { if (m_callbacksToInvoke[i]->m_id == id) { - TRACE_EVENT_INSTANT1(TRACE_DISABLED_BY_DEFAULT("devtools.timeline"), "CancelAnimationFrame", "data", InspectorAnimationFrameEvent::data(m_document, id)); - TRACE_EVENT_INSTANT1(TRACE_DISABLED_BY_DEFAULT("devtools.timeline.stack"), "CallStack", "stack", InspectorCallStackEvent::currentCallStack()); + TRACE_EVENT_INSTANT1(TRACE_DISABLED_BY_DEFAULT("devtools.timeline"), "CancelAnimationFrame", TRACE_EVENT_SCOPE_PROCESS, "data", InspectorAnimationFrameEvent::data(m_document, id)); + TRACE_EVENT_INSTANT1(TRACE_DISABLED_BY_DEFAULT("devtools.timeline.stack"), "CallStack", TRACE_EVENT_SCOPE_PROCESS, "stack", InspectorCallStackEvent::currentCallStack()); m_callbacksToInvoke[i]->m_cancelled = true; // will be removed at the end of executeCallbacks() return; @@ -158,7 +158,7 @@ void ScriptedAnimationController::executeCallbacks(double monotonicTimeNow) callback->handleEvent(legacyHighResNowMs); else callback->handleEvent(highResNowMs); - TRACE_EVENT_INSTANT1(TRACE_DISABLED_BY_DEFAULT("devtools.timeline"), "UpdateCounters", "data", InspectorUpdateCountersEvent::data()); + TRACE_EVENT_INSTANT1(TRACE_DISABLED_BY_DEFAULT("devtools.timeline"), "UpdateCounters", TRACE_EVENT_SCOPE_PROCESS, "data", InspectorUpdateCountersEvent::data()); } } diff --git a/engine/core/events/EventDispatcher.cpp b/engine/core/events/EventDispatcher.cpp index b639dbe56f45debfa22f1459f6d7e8131985a887..88ba7167b17beacf71fe5126d82ae62ee91ee41e 100644 --- a/engine/core/events/EventDispatcher.cpp +++ b/engine/core/events/EventDispatcher.cpp @@ -131,7 +131,7 @@ bool EventDispatcher::dispatch() // outermost shadow DOM boundary. m_event->setTarget(windowEventContext.target()); m_event->setCurrentTarget(0); - TRACE_EVENT_INSTANT1(TRACE_DISABLED_BY_DEFAULT("devtools.timeline"), "UpdateCounters", "data", InspectorUpdateCountersEvent::data()); + TRACE_EVENT_INSTANT1(TRACE_DISABLED_BY_DEFAULT("devtools.timeline"), "UpdateCounters", TRACE_EVENT_SCOPE_PROCESS, "data", InspectorUpdateCountersEvent::data()); return !m_event->defaultPrevented(); } diff --git a/engine/core/events/GenericEventQueue.cpp b/engine/core/events/GenericEventQueue.cpp index cc7d8bf9116fa33da4b540dd3f756b6a6e58a50d..9bbdf599dc8066f3570db6a9cd07f5aea42328a7 100644 --- a/engine/core/events/GenericEventQueue.cpp +++ b/engine/core/events/GenericEventQueue.cpp @@ -63,7 +63,7 @@ bool GenericEventQueue::enqueueEvent(PassRefPtr event) if (event->target() == m_owner) event->setTarget(nullptr); - TRACE_EVENT_ASYNC_BEGIN1("event", "GenericEventQueue:enqueueEvent", event.get(), "type", event->type().ascii()); + TRACE_EVENT_ASYNC_BEGIN1("event", "GenericEventQueue:enqueueEvent", event.get(), "type", event->type().ascii().data()); m_pendingEvents.append(event); if (!m_timer.isActive()) @@ -78,7 +78,7 @@ bool GenericEventQueue::cancelEvent(Event* event) if (found) { m_pendingEvents.remove(m_pendingEvents.find(event)); - TRACE_EVENT_ASYNC_END2("event", "GenericEventQueue:enqueueEvent", event, "type", event->type().ascii(), "status", "cancelled"); + TRACE_EVENT_ASYNC_END2("event", "GenericEventQueue:enqueueEvent", event, "type", event->type().ascii().data(), "status", "cancelled"); } if (m_pendingEvents.isEmpty()) @@ -100,9 +100,9 @@ void GenericEventQueue::timerFired(Timer*) Event* event = pendingEvents[i].get(); EventTarget* target = event->target() ? event->target() : m_owner.get(); CString type(event->type().ascii()); - TRACE_EVENT_ASYNC_STEP_INTO1("event", "GenericEventQueue:enqueueEvent", event, "dispatch", "type", type); + TRACE_EVENT_ASYNC_STEP_INTO1("event", "GenericEventQueue:enqueueEvent", event, "dispatch", "type", type.data()); target->dispatchEvent(pendingEvents[i]); - TRACE_EVENT_ASYNC_END1("event", "GenericEventQueue:enqueueEvent", event, "type", type); + TRACE_EVENT_ASYNC_END1("event", "GenericEventQueue:enqueueEvent", event, "type", type.data()); } } @@ -118,7 +118,7 @@ void GenericEventQueue::cancelAllEvents() for (size_t i = 0; i < m_pendingEvents.size(); ++i) { Event* event = m_pendingEvents[i].get(); - TRACE_EVENT_ASYNC_END2("event", "GenericEventQueue:enqueueEvent", event, "type", event->type().ascii(), "status", "cancelled"); + TRACE_EVENT_ASYNC_END2("event", "GenericEventQueue:enqueueEvent", event, "type", event->type().ascii().data(), "status", "cancelled"); } m_pendingEvents.clear(); } diff --git a/engine/core/fetch/ResourceFetcher.cpp b/engine/core/fetch/ResourceFetcher.cpp index 576c3925922ad8395ba3cd9327bde20a66313b01..216fd96306fa0fa24e3e7b37805a23c2b3987316 100644 --- a/engine/core/fetch/ResourceFetcher.cpp +++ b/engine/core/fetch/ResourceFetcher.cpp @@ -822,7 +822,7 @@ void ResourceFetcher::willTerminateResourceLoader(ResourceLoader* loader) void ResourceFetcher::willStartLoadingResource(Resource* resource, ResourceRequest& request) { - TRACE_EVENT_ASYNC_BEGIN2("net", "Resource", resource, "url", resource->url().string().ascii(), "priority", resource->resourceRequest().priority()); + TRACE_EVENT_ASYNC_BEGIN2("net", "Resource", resource, "url", resource->url().string().ascii().data(), "priority", resource->resourceRequest().priority()); } void ResourceFetcher::stopFetching() diff --git a/engine/core/frame/ConsoleBase.cpp b/engine/core/frame/ConsoleBase.cpp index 2b72a05b6ab0fb9b2f4f719eb8f19a60296e7590..e7c6c5c1815db05652f91d9b8c146e111946e0d9 100644 --- a/engine/core/frame/ConsoleBase.cpp +++ b/engine/core/frame/ConsoleBase.cpp @@ -171,7 +171,7 @@ void ConsoleBase::timeEnd(ScriptState* scriptState, const String& title) void ConsoleBase::timeStamp(const String& title) { - TRACE_EVENT_INSTANT1(TRACE_DISABLED_BY_DEFAULT("devtools.timeline"), "TimeStamp", "data", InspectorTimeStampEvent::data(context(), title)); + TRACE_EVENT_INSTANT1(TRACE_DISABLED_BY_DEFAULT("devtools.timeline"), "TimeStamp", TRACE_EVENT_SCOPE_PROCESS, "data", InspectorTimeStampEvent::data(context(), title)); } void ConsoleBase::timeline(ScriptState* scriptState, const String& title) diff --git a/engine/core/frame/DOMTimer.cpp b/engine/core/frame/DOMTimer.cpp index ca436bf05ad884e283402ea30d2d00997532cfd5..12700291241566bbe6ff111ca2864f1ad7ff8f83 100644 --- a/engine/core/frame/DOMTimer.cpp +++ b/engine/core/frame/DOMTimer.cpp @@ -70,8 +70,8 @@ double DOMTimer::visiblePageAlignmentInterval() int DOMTimer::install(ExecutionContext* context, PassOwnPtr action, int timeout, bool singleShot) { int timeoutID = context->installNewTimeout(action, timeout, singleShot); - TRACE_EVENT_INSTANT1(TRACE_DISABLED_BY_DEFAULT("devtools.timeline"), "TimerInstall", "data", InspectorTimerInstallEvent::data(context, timeoutID, timeout, singleShot)); - TRACE_EVENT_INSTANT1(TRACE_DISABLED_BY_DEFAULT("devtools.timeline.stack"), "CallStack", "stack", InspectorCallStackEvent::currentCallStack()); + TRACE_EVENT_INSTANT1(TRACE_DISABLED_BY_DEFAULT("devtools.timeline"), "TimerInstall", TRACE_EVENT_SCOPE_PROCESS, "data", InspectorTimerInstallEvent::data(context, timeoutID, timeout, singleShot)); + TRACE_EVENT_INSTANT1(TRACE_DISABLED_BY_DEFAULT("devtools.timeline.stack"), "CallStack", TRACE_EVENT_SCOPE_PROCESS, "stack", InspectorCallStackEvent::currentCallStack()); WTF_LOG(Timers, "DOMTimer::install: timeoutID = %d, timeout = %d, singleShot = %d", timeoutID, timeout, singleShot ? 1 : 0); return timeoutID; } @@ -80,8 +80,8 @@ void DOMTimer::removeByID(ExecutionContext* context, int timeoutID) { WTF_LOG(Timers, "DOMTimer::removeByID: timeoutID = %d", timeoutID); context->removeTimeoutByID(timeoutID); - TRACE_EVENT_INSTANT1(TRACE_DISABLED_BY_DEFAULT("devtools.timeline"), "TimerRemove", "data", InspectorTimerRemoveEvent::data(context, timeoutID)); - TRACE_EVENT_INSTANT1(TRACE_DISABLED_BY_DEFAULT("devtools.timeline.stack"), "CallStack", "stack", InspectorCallStackEvent::currentCallStack()); + TRACE_EVENT_INSTANT1(TRACE_DISABLED_BY_DEFAULT("devtools.timeline"), "TimerRemove", TRACE_EVENT_SCOPE_PROCESS, "data", InspectorTimerRemoveEvent::data(context, timeoutID)); + TRACE_EVENT_INSTANT1(TRACE_DISABLED_BY_DEFAULT("devtools.timeline.stack"), "CallStack", TRACE_EVENT_SCOPE_PROCESS, "stack", InspectorCallStackEvent::currentCallStack()); } DOMTimer::DOMTimer(ExecutionContext* context, PassOwnPtr action, int interval, bool singleShot, int timeoutID) @@ -147,7 +147,7 @@ void DOMTimer::fired() action->execute(context); - TRACE_EVENT_INSTANT1(TRACE_DISABLED_BY_DEFAULT("devtools.timeline"), "UpdateCounters", "data", InspectorUpdateCountersEvent::data()); + TRACE_EVENT_INSTANT1(TRACE_DISABLED_BY_DEFAULT("devtools.timeline"), "UpdateCounters", TRACE_EVENT_SCOPE_PROCESS, "data", InspectorUpdateCountersEvent::data()); timerNestingLevel = 0; } diff --git a/engine/core/frame/FrameView.cpp b/engine/core/frame/FrameView.cpp index 3363f9ace860421bf5cffb7724d3b5a69486175f..cf7c20599e88b854cd0f468eb5e81720b46e6cc8 100644 --- a/engine/core/frame/FrameView.cpp +++ b/engine/core/frame/FrameView.cpp @@ -344,7 +344,7 @@ void FrameView::layout(bool allowSubtree) RELEASE_ASSERT(!isPainting()); TRACE_EVENT_BEGIN1(TRACE_DISABLED_BY_DEFAULT("devtools.timeline"), "Layout", "beginData", InspectorLayoutEvent::beginData(this)); - TRACE_EVENT_INSTANT1(TRACE_DISABLED_BY_DEFAULT("devtools.timeline.stack"), "CallStack", "stack", InspectorCallStackEvent::currentCallStack()); + TRACE_EVENT_INSTANT1(TRACE_DISABLED_BY_DEFAULT("devtools.timeline.stack"), "CallStack", TRACE_EVENT_SCOPE_PROCESS, "stack", InspectorCallStackEvent::currentCallStack()); if (!allowSubtree && isSubtreeLayout()) { m_layoutSubtreeRoot->markContainingBlocksForLayout(false); @@ -445,7 +445,7 @@ void FrameView::invalidateTreeIfNeeded() RenderView& rootForPaintInvalidation = *renderView(); ASSERT(!rootForPaintInvalidation.needsLayout()); - TRACE_EVENT1("blink", "FrameView::invalidateTree", "root", rootForPaintInvalidation.debugName().ascii()); + TRACE_EVENT1("blink", "FrameView::invalidateTree", "root", rootForPaintInvalidation.debugName().ascii().data()); PaintInvalidationState rootPaintInvalidationState(rootForPaintInvalidation); @@ -605,8 +605,8 @@ void FrameView::scheduleRelayout() return; if (!m_frame->document()->shouldScheduleLayout()) return; - TRACE_EVENT_INSTANT1(TRACE_DISABLED_BY_DEFAULT("devtools.timeline"), "InvalidateLayout", "frame", m_frame.get()); - TRACE_EVENT_INSTANT1(TRACE_DISABLED_BY_DEFAULT("devtools.timeline.stack"), "CallStack", "stack", InspectorCallStackEvent::currentCallStack()); + TRACE_EVENT_INSTANT1(TRACE_DISABLED_BY_DEFAULT("devtools.timeline"), "InvalidateLayout", TRACE_EVENT_SCOPE_PROCESS, "frame", m_frame.get()); + TRACE_EVENT_INSTANT1(TRACE_DISABLED_BY_DEFAULT("devtools.timeline.stack"), "CallStack", TRACE_EVENT_SCOPE_PROCESS, "stack", InspectorCallStackEvent::currentCallStack()); if (m_hasPendingLayout) return; @@ -667,8 +667,8 @@ void FrameView::scheduleRelayoutOfSubtree(RenderObject* relayoutRoot) page()->animator().scheduleVisualUpdate(); lifecycle().ensureStateAtMost(DocumentLifecycle::StyleClean); } - TRACE_EVENT_INSTANT1(TRACE_DISABLED_BY_DEFAULT("devtools.timeline"), "InvalidateLayout", "frame", m_frame.get()); - TRACE_EVENT_INSTANT1(TRACE_DISABLED_BY_DEFAULT("devtools.timeline.stack"), "CallStack", "stack", InspectorCallStackEvent::currentCallStack()); + TRACE_EVENT_INSTANT1(TRACE_DISABLED_BY_DEFAULT("devtools.timeline"), "InvalidateLayout", TRACE_EVENT_SCOPE_PROCESS, "frame", m_frame.get()); + TRACE_EVENT_INSTANT1(TRACE_DISABLED_BY_DEFAULT("devtools.timeline.stack"), "CallStack", TRACE_EVENT_SCOPE_PROCESS, "stack", InspectorCallStackEvent::currentCallStack()); } bool FrameView::layoutPending() const @@ -913,7 +913,7 @@ void FrameView::paintContents(GraphicsContext* p, const IntRect& rect) ASSERT(document->lifecycle().state() >= DocumentLifecycle::CompositingClean); TRACE_EVENT1(TRACE_DISABLED_BY_DEFAULT("devtools.timeline"), "Paint", "data", InspectorPaintEvent::data(renderView, rect, 0)); - TRACE_EVENT_INSTANT1(TRACE_DISABLED_BY_DEFAULT("devtools.timeline.stack"), "CallStack", "stack", InspectorCallStackEvent::currentCallStack()); + TRACE_EVENT_INSTANT1(TRACE_DISABLED_BY_DEFAULT("devtools.timeline.stack"), "CallStack", TRACE_EVENT_SCOPE_PROCESS, "stack", InspectorCallStackEvent::currentCallStack()); bool isTopLevelPainter = !s_inPaintContents; s_inPaintContents = true; @@ -983,7 +983,7 @@ void FrameView::updateLayoutAndStyleForPainting() updateLayoutAndStyleIfNeededRecursive(); if (RenderView* view = renderView()) { - TRACE_EVENT_INSTANT1(TRACE_DISABLED_BY_DEFAULT("devtools.timeline"), "UpdateLayerTree", "frame", m_frame.get()); + TRACE_EVENT_INSTANT1(TRACE_DISABLED_BY_DEFAULT("devtools.timeline"), "UpdateLayerTree", TRACE_EVENT_SCOPE_PROCESS, "frame", m_frame.get()); view->compositor()->updateIfNeededRecursive(); if (view->compositor()->inCompositingMode()) @@ -1069,7 +1069,7 @@ void FrameView::setTracksPaintInvalidations(bool trackPaintInvalidations) renderView->compositor()->setTracksPaintInvalidations(trackPaintInvalidations); TRACE_EVENT_INSTANT1(TRACE_DISABLED_BY_DEFAULT("blink.invalidation"), - "FrameView::setTracksPaintInvalidations", "enabled", trackPaintInvalidations); + "FrameView::setTracksPaintInvalidations", TRACE_EVENT_SCOPE_PROCESS, "enabled", trackPaintInvalidations); resetTrackedPaintInvalidations(); m_isTrackingPaintInvalidations = trackPaintInvalidations; diff --git a/engine/core/frame/LocalDOMWindow.cpp b/engine/core/frame/LocalDOMWindow.cpp index b2f6c0c3f047aaa8914c76a877d846ffaae0c31a..650f420ec57aa18a53f5e00ea5c89a66e3e3f153 100644 --- a/engine/core/frame/LocalDOMWindow.cpp +++ b/engine/core/frame/LocalDOMWindow.cpp @@ -746,7 +746,7 @@ void LocalDOMWindow::dispatchLoadEvent() RefPtr loadEvent(Event::create(EventTypeNames::load)); dispatchEvent(loadEvent, document()); - TRACE_EVENT_INSTANT1(TRACE_DISABLED_BY_DEFAULT("devtools.timeline"), "MarkLoad", "data", InspectorMarkLoadEvent::data(frame())); + TRACE_EVENT_INSTANT1(TRACE_DISABLED_BY_DEFAULT("devtools.timeline"), "MarkLoad", TRACE_EVENT_SCOPE_PROCESS, "data", InspectorMarkLoadEvent::data(frame())); } bool LocalDOMWindow::dispatchEvent(PassRefPtr prpEvent, PassRefPtr prpTarget) diff --git a/engine/core/html/parser/HTMLDocumentParser.cpp b/engine/core/html/parser/HTMLDocumentParser.cpp index 5d1b5d8b45661c27030731142eb7f072251d1bfe..18d84cceaa19331effc66fd610fcb4311103a10a 100644 --- a/engine/core/html/parser/HTMLDocumentParser.cpp +++ b/engine/core/html/parser/HTMLDocumentParser.cpp @@ -272,7 +272,7 @@ void HTMLDocumentParser::pumpPendingSpeculations() // FIXME: Pass in current input length. TRACE_EVENT_BEGIN1(TRACE_DISABLED_BY_DEFAULT("devtools.timeline"), "ParseHTML", "beginData", InspectorParseHtmlEvent::beginData(document(), lineNumber().zeroBasedInt())); - TRACE_EVENT_INSTANT1(TRACE_DISABLED_BY_DEFAULT("devtools.timeline.stack"), "CallStack", "stack", InspectorCallStackEvent::currentCallStack()); + TRACE_EVENT_INSTANT1(TRACE_DISABLED_BY_DEFAULT("devtools.timeline.stack"), "CallStack", TRACE_EVENT_SCOPE_PROCESS, "stack", InspectorCallStackEvent::currentCallStack()); double startTime = currentTime(); @@ -290,7 +290,7 @@ void HTMLDocumentParser::pumpPendingSpeculations() } TRACE_EVENT_END1(TRACE_DISABLED_BY_DEFAULT("devtools.timeline"), "ParseHTML", "endLine", lineNumber().zeroBasedInt()); - TRACE_EVENT_INSTANT1(TRACE_DISABLED_BY_DEFAULT("devtools.timeline"), "UpdateCounters", "data", InspectorUpdateCountersEvent::data()); + TRACE_EVENT_INSTANT1(TRACE_DISABLED_BY_DEFAULT("devtools.timeline"), "UpdateCounters", TRACE_EVENT_SCOPE_PROCESS, "data", InspectorUpdateCountersEvent::data()); } Document* HTMLDocumentParser::contextForParsingSession() diff --git a/engine/core/loader/FrameFetchContext.cpp b/engine/core/loader/FrameFetchContext.cpp index e9fd294af964aaed7c67c1b8da3905690ba0d796..834c0dd409b6125dfa36bfbac881a1a37ff7221e 100644 --- a/engine/core/loader/FrameFetchContext.cpp +++ b/engine/core/loader/FrameFetchContext.cpp @@ -68,8 +68,8 @@ void FrameFetchContext::dispatchDidChangeResourcePriority(unsigned long identifi void FrameFetchContext::dispatchWillSendRequest(Document* document, unsigned long identifier, ResourceRequest& request, const ResourceResponse& redirectResponse, const FetchInitiatorInfo& initiatorInfo) { m_frame->loaderClient()->dispatchWillSendRequest(document, identifier, request, redirectResponse); - TRACE_EVENT_INSTANT1(TRACE_DISABLED_BY_DEFAULT("devtools.timeline"), "ResourceSendRequest", "data", InspectorSendRequestEvent::data(identifier, m_frame, request)); - TRACE_EVENT_INSTANT1(TRACE_DISABLED_BY_DEFAULT("devtools.timeline.stack"), "CallStack", "stack", InspectorCallStackEvent::currentCallStack()); + TRACE_EVENT_INSTANT1(TRACE_DISABLED_BY_DEFAULT("devtools.timeline"), "ResourceSendRequest", TRACE_EVENT_SCOPE_PROCESS, "data", InspectorSendRequestEvent::data(identifier, m_frame, request)); + TRACE_EVENT_INSTANT1(TRACE_DISABLED_BY_DEFAULT("devtools.timeline.stack"), "CallStack", TRACE_EVENT_SCOPE_PROCESS, "stack", InspectorCallStackEvent::currentCallStack()); } void FrameFetchContext::dispatchDidLoadResourceFromMemoryCache(const ResourceRequest& request, const ResourceResponse& response) @@ -80,29 +80,29 @@ void FrameFetchContext::dispatchDidLoadResourceFromMemoryCache(const ResourceReq void FrameFetchContext::dispatchDidReceiveResponse(Document* document, unsigned long identifier, const ResourceResponse& r, ResourceLoader* resourceLoader) { m_frame->loaderClient()->dispatchDidReceiveResponse(document, identifier, r); - TRACE_EVENT_INSTANT1(TRACE_DISABLED_BY_DEFAULT("devtools.timeline"), "ResourceReceiveResponse", "data", InspectorReceiveResponseEvent::data(identifier, m_frame, r)); + TRACE_EVENT_INSTANT1(TRACE_DISABLED_BY_DEFAULT("devtools.timeline"), "ResourceReceiveResponse", TRACE_EVENT_SCOPE_PROCESS, "data", InspectorReceiveResponseEvent::data(identifier, m_frame, r)); m_frame->console().reportResourceResponseReceived(document, identifier, r); } void FrameFetchContext::dispatchDidReceiveData(Document*, unsigned long identifier, const char* data, int dataLength, int encodedDataLength) { - TRACE_EVENT_INSTANT1(TRACE_DISABLED_BY_DEFAULT("devtools.timeline"), "ResourceReceivedData", "data", InspectorReceiveDataEvent::data(identifier, m_frame, encodedDataLength)); + TRACE_EVENT_INSTANT1(TRACE_DISABLED_BY_DEFAULT("devtools.timeline"), "ResourceReceivedData", TRACE_EVENT_SCOPE_PROCESS, "data", InspectorReceiveDataEvent::data(identifier, m_frame, encodedDataLength)); } void FrameFetchContext::dispatchDidDownloadData(Document*, unsigned long identifier, int dataLength, int encodedDataLength) { - TRACE_EVENT_INSTANT1(TRACE_DISABLED_BY_DEFAULT("devtools.timeline"), "ResourceReceivedData", "data", InspectorReceiveDataEvent::data(identifier, m_frame, encodedDataLength)); + TRACE_EVENT_INSTANT1(TRACE_DISABLED_BY_DEFAULT("devtools.timeline"), "ResourceReceivedData", TRACE_EVENT_SCOPE_PROCESS, "data", InspectorReceiveDataEvent::data(identifier, m_frame, encodedDataLength)); } void FrameFetchContext::dispatchDidFinishLoading(Document* document, unsigned long identifier, double finishTime, int64_t encodedDataLength) { m_frame->loaderClient()->dispatchDidFinishLoading(document, identifier); - TRACE_EVENT_INSTANT1(TRACE_DISABLED_BY_DEFAULT("devtools.timeline"), "ResourceFinish", "data", InspectorResourceFinishEvent::data(identifier, finishTime, false)); + TRACE_EVENT_INSTANT1(TRACE_DISABLED_BY_DEFAULT("devtools.timeline"), "ResourceFinish", TRACE_EVENT_SCOPE_PROCESS, "data", InspectorResourceFinishEvent::data(identifier, finishTime, false)); } void FrameFetchContext::dispatchDidFail(Document* document, unsigned long identifier, const ResourceError& error) { - TRACE_EVENT_INSTANT1(TRACE_DISABLED_BY_DEFAULT("devtools.timeline"), "ResourceFinish", "data", InspectorResourceFinishEvent::data(identifier, 0, true)); + TRACE_EVENT_INSTANT1(TRACE_DISABLED_BY_DEFAULT("devtools.timeline"), "ResourceFinish", TRACE_EVENT_SCOPE_PROCESS, "data", InspectorResourceFinishEvent::data(identifier, 0, true)); } void FrameFetchContext::sendRemainingDelegateMessages(Document* document, unsigned long identifier, const ResourceResponse& response, int dataLength) diff --git a/engine/core/rendering/RenderObject.cpp b/engine/core/rendering/RenderObject.cpp index f7bdd2ade8a44befbcf695e967963fe1d21b0c7e..3362c77633296d2d63daa5b424a4f7f600e95afb 100644 --- a/engine/core/rendering/RenderObject.cpp +++ b/engine/core/rendering/RenderObject.cpp @@ -1293,7 +1293,7 @@ void RenderObject::invalidatePaintUsingContainer(const RenderLayerModelObject* p return; TRACE_EVENT2(TRACE_DISABLED_BY_DEFAULT("blink.invalidation"), "RenderObject::invalidatePaintUsingContainer()", - "object", this->debugName().ascii(), + "object", this->debugName().ascii().data(), "info", jsonObjectForPaintInvalidationInfo(r, invalidationReasonToString(invalidationReason))); if (paintInvalidationContainer->hasFilter() && paintInvalidationContainer->layer()->requiresFullLayerImageForFilters()) { @@ -1422,7 +1422,7 @@ InvalidationReason RenderObject::invalidatePaintIfNeeded(const RenderLayerModelO ASSERT(newBounds == boundsRectForPaintInvalidation(&paintInvalidationContainer, &paintInvalidationState)); TRACE_EVENT2(TRACE_DISABLED_BY_DEFAULT("blink.invalidation"), "RenderObject::invalidatePaintIfNeeded()", - "object", this->debugName().ascii(), + "object", this->debugName().ascii().data(), "info", jsonObjectForOldAndNewRects(oldBounds, newBounds)); InvalidationReason invalidationReason = getPaintInvalidationReason(paintInvalidationContainer, oldBounds, oldLocation, newBounds, newLocation); diff --git a/engine/core/rendering/compositing/CompositedLayerMapping.cpp b/engine/core/rendering/compositing/CompositedLayerMapping.cpp index 1454904c2104b9b7b085b98334b76ce894f3806a..8caa7625c9ec87274f477bc303d58471c75e7349 100644 --- a/engine/core/rendering/compositing/CompositedLayerMapping.cpp +++ b/engine/core/rendering/compositing/CompositedLayerMapping.cpp @@ -2032,7 +2032,7 @@ void CompositedLayerMapping::paintContents(const GraphicsLayer* graphicsLayer, G page->setIsPainting(true); #endif TRACE_EVENT1(TRACE_DISABLED_BY_DEFAULT("devtools.timeline"), "Paint", "data", InspectorPaintEvent::data(m_owningLayer.renderer(), clip, graphicsLayer)); - TRACE_EVENT_INSTANT1(TRACE_DISABLED_BY_DEFAULT("devtools.timeline.stack"), "CallStack", "stack", InspectorCallStackEvent::currentCallStack()); + TRACE_EVENT_INSTANT1(TRACE_DISABLED_BY_DEFAULT("devtools.timeline.stack"), "CallStack", TRACE_EVENT_SCOPE_PROCESS, "stack", InspectorCallStackEvent::currentCallStack()); PaintLayerFlags paintLayerFlags = 0; if (graphicsLayerPaintingPhase & GraphicsLayerPaintBackground) diff --git a/engine/platform/EventTracer.h b/engine/platform/EventTracer.h index 81a79367d205b1098b6e730c3eb6f27d42631202..32790e5c58d60c938d1e73d713feb0bce09ebdee 100644 --- a/engine/platform/EventTracer.h +++ b/engine/platform/EventTracer.h @@ -38,10 +38,6 @@ #include -// This will mark the trace event as disabled by default. The user will need -// to explicitly enable the event. -#define TRACE_DISABLED_BY_DEFAULT(name) "disabled-by-default-" name - namespace blink { namespace TraceEvent { diff --git a/engine/platform/TraceEvent.h b/engine/platform/TraceEvent.h index 6bddc14b77ff51bdfbaee86e23300e302dd6a688..bd0c344673cd3de311f13f6abffbee3c36630c92 100644 --- a/engine/platform/TraceEvent.h +++ b/engine/platform/TraceEvent.h @@ -1,1014 +1,5 @@ -/* - * Copyright (C) 2011 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: - * - * 1. Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * 2. Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer in the - * documentation and/or other materials provided with the distribution. - * - * THIS SOFTWARE IS PROVIDED BY APPLE AND ITS CONTRIBUTORS "AS IS" AND ANY - * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED - * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE - * DISCLAIMED. IN NO EVENT SHALL APPLE OR ITS CONTRIBUTORS BE LIABLE FOR ANY - * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES - * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; - * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND - * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT - * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF - * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - */ +// Copyright 2014 The Chromium Authors. All rights reserved. +// Use of this source code is governed by a BSD-style license that can be +// found in the LICENSE file. -// Trace events are for tracking application performance and resource usage. -// Macros are provided to track: -// Begin and end of function calls -// Counters -// -// Events are issued against categories. Whereas LOG's -// categories are statically defined, TRACE categories are created -// implicitly with a string. For example: -// TRACE_EVENT_INSTANT0("MY_SUBSYSTEM", "SomeImportantEvent") -// -// Events can be INSTANT, or can be pairs of BEGIN and END in the same scope: -// TRACE_EVENT_BEGIN0("MY_SUBSYSTEM", "SomethingCostly") -// doSomethingCostly() -// TRACE_EVENT_END0("MY_SUBSYSTEM", "SomethingCostly") -// Note: our tools can't always determine the correct BEGIN/END pairs unless -// these are used in the same scope. Use ASYNC_BEGIN/ASYNC_END macros if you need them -// to be in separate scopes. -// -// A common use case is to trace entire function scopes. This -// issues a trace BEGIN and END automatically: -// void doSomethingCostly() { -// TRACE_EVENT0("MY_SUBSYSTEM", "doSomethingCostly"); -// ... -// } -// -// Additional parameters can be associated with an event: -// void doSomethingCostly2(int howMuch) { -// TRACE_EVENT1("MY_SUBSYSTEM", "doSomethingCostly", -// "howMuch", howMuch); -// ... -// } -// -// The trace system will automatically add to this information the -// current process id, thread id, and a timestamp in microseconds. -// -// To trace an asynchronous procedure such as an IPC send/receive, use ASYNC_BEGIN and -// ASYNC_END: -// [single threaded sender code] -// static int send_count = 0; -// ++send_count; -// TRACE_EVENT_ASYNC_BEGIN0("ipc", "message", send_count); -// Send(new MyMessage(send_count)); -// [receive code] -// void OnMyMessage(send_count) { -// TRACE_EVENT_ASYNC_END0("ipc", "message", send_count); -// } -// The third parameter is a unique ID to match ASYNC_BEGIN/ASYNC_END pairs. -// ASYNC_BEGIN and ASYNC_END can occur on any thread of any traced process. Pointers can -// be used for the ID parameter, and they will be mangled internally so that -// the same pointer on two different processes will not match. For example: -// class MyTracedClass { -// public: -// MyTracedClass() { -// TRACE_EVENT_ASYNC_BEGIN0("category", "MyTracedClass", this); -// } -// ~MyTracedClass() { -// TRACE_EVENT_ASYNC_END0("category", "MyTracedClass", this); -// } -// } -// -// Trace event also supports counters, which is a way to track a quantity -// as it varies over time. Counters are created with the following macro: -// TRACE_COUNTER1("MY_SUBSYSTEM", "myCounter", g_myCounterValue); -// -// Counters are process-specific. The macro itself can be issued from any -// thread, however. -// -// Sometimes, you want to track two counters at once. You can do this with two -// counter macros: -// TRACE_COUNTER1("MY_SUBSYSTEM", "myCounter0", g_myCounterValue[0]); -// TRACE_COUNTER1("MY_SUBSYSTEM", "myCounter1", g_myCounterValue[1]); -// Or you can do it with a combined macro: -// TRACE_COUNTER2("MY_SUBSYSTEM", "myCounter", -// "bytesPinned", g_myCounterValue[0], -// "bytesAllocated", g_myCounterValue[1]); -// This indicates to the tracing UI that these counters should be displayed -// in a single graph, as a summed area chart. -// -// Since counters are in a global namespace, you may want to disembiguate with a -// unique ID, by using the TRACE_COUNTER_ID* variations. -// -// By default, trace collection is compiled in, but turned off at runtime. -// Collecting trace data is the responsibility of the embedding -// application. In Chrome's case, navigating to about:tracing will turn on -// tracing and display data collected across all active processes. -// -// -// Memory scoping note: -// Tracing copies the pointers, not the string content, of the strings passed -// in for category, name, and arg_names. Thus, the following code will -// cause problems: -// char* str = strdup("impprtantName"); -// TRACE_EVENT_INSTANT0("SUBSYSTEM", str); // BAD! -// free(str); // Trace system now has dangling pointer -// -// To avoid this issue with the |name| and |arg_name| parameters, use the -// TRACE_EVENT_COPY_XXX overloads of the macros at additional runtime overhead. -// Notes: The category must always be in a long-lived char* (i.e. static const). -// The |arg_values|, when used, are always deep copied with the _COPY -// macros. -// -// When are string argument values copied: -// const char* arg_values are only referenced by default: -// TRACE_EVENT1("category", "name", -// "arg1", "literal string is only referenced"); -// Use TRACE_STR_COPY to force copying of a const char*: -// TRACE_EVENT1("category", "name", -// "arg1", TRACE_STR_COPY("string will be copied")); -// std::string arg_values are always copied: -// TRACE_EVENT1("category", "name", -// "arg1", std::string("string will be copied")); -// -// -// Thread Safety: -// A thread safe singleton and mutex are used for thread safety. Category -// enabled flags are used to limit the performance impact when the system -// is not enabled. -// -// TRACE_EVENT macros first cache a pointer to a category. The categories are -// statically allocated and safe at all times, even after exit. Fetching a -// category is protected by the TraceLog::lock_. Multiple threads initializing -// the static variable is safe, as they will be serialized by the lock and -// multiple calls will return the same pointer to the category. -// -// Then the category_enabled flag is checked. This is a unsigned char, and -// not intended to be multithread safe. It optimizes access to addTraceEvent -// which is threadsafe internally via TraceLog::lock_. The enabled flag may -// cause some threads to incorrectly call or skip calling addTraceEvent near -// the time of the system being enabled or disabled. This is acceptable as -// we tolerate some data loss while the system is being enabled/disabled and -// because addTraceEvent is threadsafe internally and checks the enabled state -// again under lock. -// -// Without the use of these static category pointers and enabled flags all -// trace points would carry a significant performance cost of aquiring a lock -// and resolving the category. - -#ifndef TraceEvent_h -#define TraceEvent_h - -#include "platform/EventTracer.h" - -#include "wtf/DynamicAnnotations.h" -#include "wtf/PassRefPtr.h" -#include "wtf/text/CString.h" - -// By default, const char* argument values are assumed to have long-lived scope -// and will not be copied. Use this macro to force a const char* to be copied. -#define TRACE_STR_COPY(str) \ - blink::TraceEvent::TraceStringWithCopy(str) - -// By default, uint64 ID argument values are not mangled with the Process ID in -// TRACE_EVENT_ASYNC macros. Use this macro to force Process ID mangling. -#define TRACE_ID_MANGLE(id) \ - blink::TraceEvent::TraceID::ForceMangle(id) - -// By default, pointers are mangled with the Process ID in TRACE_EVENT_ASYNC -// macros. Use this macro to prevent Process ID mangling. -#define TRACE_ID_DONT_MANGLE(id) \ - blink::TraceEvent::TraceID::DontMangle(id) - -// Records a pair of begin and end events called "name" for the current -// scope, with 0, 1 or 2 associated arguments. If the category is not -// enabled, then this does nothing. -// - category and name strings must have application lifetime (statics or -// literals). They may not include " chars. -#define TRACE_EVENT0(category, name) \ - INTERNAL_TRACE_EVENT_ADD_SCOPED(category, name) -#define TRACE_EVENT1(category, name, arg1_name, arg1_val) \ - INTERNAL_TRACE_EVENT_ADD_SCOPED(category, name, arg1_name, arg1_val) -#define TRACE_EVENT2(category, name, arg1_name, arg1_val, arg2_name, arg2_val) \ - INTERNAL_TRACE_EVENT_ADD_SCOPED(category, name, arg1_name, arg1_val, \ - arg2_name, arg2_val) - -// Records a single event called "name" immediately, with 0, 1 or 2 -// associated arguments. If the category is not enabled, then this -// does nothing. -// - category and name strings must have application lifetime (statics or -// literals). They may not include " chars. -#define TRACE_EVENT_INSTANT0(category, name) \ - INTERNAL_TRACE_EVENT_ADD(TRACE_EVENT_PHASE_INSTANT, \ - category, name, TRACE_EVENT_FLAG_NONE) -#define TRACE_EVENT_INSTANT1(category, name, arg1_name, arg1_val) \ - INTERNAL_TRACE_EVENT_ADD(TRACE_EVENT_PHASE_INSTANT, \ - category, name, TRACE_EVENT_FLAG_NONE, arg1_name, arg1_val) -#define TRACE_EVENT_INSTANT2(category, name, arg1_name, arg1_val, \ - arg2_name, arg2_val) \ - INTERNAL_TRACE_EVENT_ADD(TRACE_EVENT_PHASE_INSTANT, \ - category, name, TRACE_EVENT_FLAG_NONE, arg1_name, arg1_val, \ - arg2_name, arg2_val) -#define TRACE_EVENT_COPY_INSTANT0(category, name) \ - INTERNAL_TRACE_EVENT_ADD(TRACE_EVENT_PHASE_INSTANT, \ - category, name, TRACE_EVENT_FLAG_COPY) -#define TRACE_EVENT_COPY_INSTANT1(category, name, arg1_name, arg1_val) \ - INTERNAL_TRACE_EVENT_ADD(TRACE_EVENT_PHASE_INSTANT, \ - category, name, TRACE_EVENT_FLAG_COPY, arg1_name, arg1_val) -#define TRACE_EVENT_COPY_INSTANT2(category, name, arg1_name, arg1_val, \ - arg2_name, arg2_val) \ - INTERNAL_TRACE_EVENT_ADD(TRACE_EVENT_PHASE_INSTANT, \ - category, name, TRACE_EVENT_FLAG_COPY, arg1_name, arg1_val, \ - arg2_name, arg2_val) - -// Records a single BEGIN event called "name" immediately, with 0, 1 or 2 -// associated arguments. If the category is not enabled, then this -// does nothing. -// - category and name strings must have application lifetime (statics or -// literals). They may not include " chars. -#define TRACE_EVENT_BEGIN0(category, name) \ - INTERNAL_TRACE_EVENT_ADD(TRACE_EVENT_PHASE_BEGIN, \ - category, name, TRACE_EVENT_FLAG_NONE) -#define TRACE_EVENT_BEGIN1(category, name, arg1_name, arg1_val) \ - INTERNAL_TRACE_EVENT_ADD(TRACE_EVENT_PHASE_BEGIN, \ - category, name, TRACE_EVENT_FLAG_NONE, arg1_name, arg1_val) -#define TRACE_EVENT_BEGIN2(category, name, arg1_name, arg1_val, \ - arg2_name, arg2_val) \ - INTERNAL_TRACE_EVENT_ADD(TRACE_EVENT_PHASE_BEGIN, \ - category, name, TRACE_EVENT_FLAG_NONE, arg1_name, arg1_val, \ - arg2_name, arg2_val) -#define TRACE_EVENT_COPY_BEGIN0(category, name) \ - INTERNAL_TRACE_EVENT_ADD(TRACE_EVENT_PHASE_BEGIN, \ - category, name, TRACE_EVENT_FLAG_COPY) -#define TRACE_EVENT_COPY_BEGIN1(category, name, arg1_name, arg1_val) \ - INTERNAL_TRACE_EVENT_ADD(TRACE_EVENT_PHASE_BEGIN, \ - category, name, TRACE_EVENT_FLAG_COPY, arg1_name, arg1_val) -#define TRACE_EVENT_COPY_BEGIN2(category, name, arg1_name, arg1_val, \ - arg2_name, arg2_val) \ - INTERNAL_TRACE_EVENT_ADD(TRACE_EVENT_PHASE_BEGIN, \ - category, name, TRACE_EVENT_FLAG_COPY, arg1_name, arg1_val, \ - arg2_name, arg2_val) - -// Records a single END event for "name" immediately. If the category -// is not enabled, then this does nothing. -// - category and name strings must have application lifetime (statics or -// literals). They may not include " chars. -#define TRACE_EVENT_END0(category, name) \ - INTERNAL_TRACE_EVENT_ADD(TRACE_EVENT_PHASE_END, \ - category, name, TRACE_EVENT_FLAG_NONE) -#define TRACE_EVENT_END1(category, name, arg1_name, arg1_val) \ - INTERNAL_TRACE_EVENT_ADD(TRACE_EVENT_PHASE_END, \ - category, name, TRACE_EVENT_FLAG_NONE, arg1_name, arg1_val) -#define TRACE_EVENT_END2(category, name, arg1_name, arg1_val, \ - arg2_name, arg2_val) \ - INTERNAL_TRACE_EVENT_ADD(TRACE_EVENT_PHASE_END, \ - category, name, TRACE_EVENT_FLAG_NONE, arg1_name, arg1_val, \ - arg2_name, arg2_val) -#define TRACE_EVENT_COPY_END0(category, name) \ - INTERNAL_TRACE_EVENT_ADD(TRACE_EVENT_PHASE_END, \ - category, name, TRACE_EVENT_FLAG_COPY) -#define TRACE_EVENT_COPY_END1(category, name, arg1_name, arg1_val) \ - INTERNAL_TRACE_EVENT_ADD(TRACE_EVENT_PHASE_END, \ - category, name, TRACE_EVENT_FLAG_COPY, arg1_name, arg1_val) -#define TRACE_EVENT_COPY_END2(category, name, arg1_name, arg1_val, \ - arg2_name, arg2_val) \ - INTERNAL_TRACE_EVENT_ADD(TRACE_EVENT_PHASE_END, \ - category, name, TRACE_EVENT_FLAG_COPY, arg1_name, arg1_val, \ - arg2_name, arg2_val) - -// Records the value of a counter called "name" immediately. Value -// must be representable as a 32 bit integer. -// - category and name strings must have application lifetime (statics or -// literals). They may not include " chars. -#define TRACE_COUNTER1(category, name, value) \ - INTERNAL_TRACE_EVENT_ADD(TRACE_EVENT_PHASE_COUNTER, \ - category, name, TRACE_EVENT_FLAG_NONE, \ - "value", static_cast(value)) -#define TRACE_COPY_COUNTER1(category, name, value) \ - INTERNAL_TRACE_EVENT_ADD(TRACE_EVENT_PHASE_COUNTER, \ - category, name, TRACE_EVENT_FLAG_COPY, \ - "value", static_cast(value)) - -// Records the values of a multi-parted counter called "name" immediately. -// The UI will treat value1 and value2 as parts of a whole, displaying their -// values as a stacked-bar chart. -// - category and name strings must have application lifetime (statics or -// literals). They may not include " chars. -#define TRACE_COUNTER2(category, name, value1_name, value1_val, \ - value2_name, value2_val) \ - INTERNAL_TRACE_EVENT_ADD(TRACE_EVENT_PHASE_COUNTER, \ - category, name, TRACE_EVENT_FLAG_NONE, \ - value1_name, static_cast(value1_val), \ - value2_name, static_cast(value2_val)) -#define TRACE_COPY_COUNTER2(category, name, value1_name, value1_val, \ - value2_name, value2_val) \ - INTERNAL_TRACE_EVENT_ADD(TRACE_EVENT_PHASE_COUNTER, \ - category, name, TRACE_EVENT_FLAG_COPY, \ - value1_name, static_cast(value1_val), \ - value2_name, static_cast(value2_val)) - -// Records the value of a counter called "name" immediately. Value -// must be representable as a 32 bit integer. -// - category and name strings must have application lifetime (statics or -// literals). They may not include " chars. -// - |id| is used to disambiguate counters with the same name. It must either -// be a pointer or an integer value up to 64 bits. If it's a pointer, the bits -// will be xored with a hash of the process ID so that the same pointer on -// two different processes will not collide. -#define TRACE_COUNTER_ID1(category, name, id, value) \ - INTERNAL_TRACE_EVENT_ADD_WITH_ID(TRACE_EVENT_PHASE_COUNTER, \ - category, name, id, TRACE_EVENT_FLAG_NONE, \ - "value", static_cast(value)) -#define TRACE_COPY_COUNTER_ID1(category, name, id, value) \ - INTERNAL_TRACE_EVENT_ADD_WITH_ID(TRACE_EVENT_PHASE_COUNTER, \ - category, name, id, TRACE_EVENT_FLAG_COPY, \ - "value", static_cast(value)) - -// Records the values of a multi-parted counter called "name" immediately. -// The UI will treat value1 and value2 as parts of a whole, displaying their -// values as a stacked-bar chart. -// - category and name strings must have application lifetime (statics or -// literals). They may not include " chars. -// - |id| is used to disambiguate counters with the same name. It must either -// be a pointer or an integer value up to 64 bits. If it's a pointer, the bits -// will be xored with a hash of the process ID so that the same pointer on -// two different processes will not collide. -#define TRACE_COUNTER_ID2(category, name, id, value1_name, value1_val, \ - value2_name, value2_val) \ - INTERNAL_TRACE_EVENT_ADD_WITH_ID(TRACE_EVENT_PHASE_COUNTER, \ - category, name, id, TRACE_EVENT_FLAG_NONE, \ - value1_name, static_cast(value1_val), \ - value2_name, static_cast(value2_val)) -#define TRACE_COPY_COUNTER_ID2(category, name, id, value1_name, value1_val, \ - value2_name, value2_val) \ - INTERNAL_TRACE_EVENT_ADD_WITH_ID(TRACE_EVENT_PHASE_COUNTER, \ - category, name, id, TRACE_EVENT_FLAG_COPY, \ - value1_name, static_cast(value1_val), \ - value2_name, static_cast(value2_val)) - -// Records a single ASYNC_BEGIN event called "name" immediately, with 0, 1 or 2 -// associated arguments. If the category is not enabled, then this -// does nothing. -// - category and name strings must have application lifetime (statics or -// literals). They may not include " chars. -// - |id| is used to match the ASYNC_BEGIN event with the ASYNC_END event. ASYNC -// events are considered to match if their category, name and id values all -// match. |id| must either be a pointer or an integer value up to 64 bits. If -// it's a pointer, the bits will be xored with a hash of the process ID so -// that the same pointer on two different processes will not collide. -// -// An asynchronous operation can consist of multiple phases. The first phase is -// defined by the ASYNC_BEGIN calls. Additional phases can be defined using the -// ASYNC_STEP_INTO or ASYNC_STEP_PAST macros. The ASYNC_STEP_INTO macro will -// annotate the block following the call. The ASYNC_STEP_PAST macro will -// annotate the block prior to the call. Note that any particular event must use -// only STEP_INTO or STEP_PAST macros; they can not mix and match. When the -// operation completes, call ASYNC_END. -// -// An ASYNC trace typically occurs on a single thread (if not, they will only be -// drawn on the thread defined in the ASYNC_BEGIN event), but all events in that -// operation must use the same |name| and |id|. Each step can have its own -#define TRACE_EVENT_ASYNC_BEGIN0(category, name, id) \ - INTERNAL_TRACE_EVENT_ADD_WITH_ID(TRACE_EVENT_PHASE_ASYNC_BEGIN, \ - category, name, id, TRACE_EVENT_FLAG_NONE) -#define TRACE_EVENT_ASYNC_BEGIN1(category, name, id, arg1_name, arg1_val) \ - INTERNAL_TRACE_EVENT_ADD_WITH_ID(TRACE_EVENT_PHASE_ASYNC_BEGIN, \ - category, name, id, TRACE_EVENT_FLAG_NONE, arg1_name, arg1_val) -#define TRACE_EVENT_ASYNC_BEGIN2(category, name, id, arg1_name, arg1_val, \ - arg2_name, arg2_val) \ - INTERNAL_TRACE_EVENT_ADD_WITH_ID(TRACE_EVENT_PHASE_ASYNC_BEGIN, \ - category, name, id, TRACE_EVENT_FLAG_NONE, \ - arg1_name, arg1_val, arg2_name, arg2_val) -#define TRACE_EVENT_COPY_ASYNC_BEGIN0(category, name, id) \ - INTERNAL_TRACE_EVENT_ADD_WITH_ID(TRACE_EVENT_PHASE_ASYNC_BEGIN, \ - category, name, id, TRACE_EVENT_FLAG_COPY) -#define TRACE_EVENT_COPY_ASYNC_BEGIN1(category, name, id, arg1_name, arg1_val) \ - INTERNAL_TRACE_EVENT_ADD_WITH_ID(TRACE_EVENT_PHASE_ASYNC_BEGIN, \ - category, name, id, TRACE_EVENT_FLAG_COPY, \ - arg1_name, arg1_val) -#define TRACE_EVENT_COPY_ASYNC_BEGIN2(category, name, id, arg1_name, arg1_val, \ - arg2_name, arg2_val) \ - INTERNAL_TRACE_EVENT_ADD_WITH_ID(TRACE_EVENT_PHASE_ASYNC_BEGIN, \ - category, name, id, TRACE_EVENT_FLAG_COPY, \ - arg1_name, arg1_val, arg2_name, arg2_val) - -// Records a single ASYNC_STEP_INTO event for |step| immediately. If the -// category is not enabled, then this does nothing. The |name| and |id| must -// match the ASYNC_BEGIN event above. The |step| param identifies this step -// within the async event. This should be called at the beginning of the next -// phase of an asynchronous operation. The ASYNC_BEGIN event must not have any -// ASYNC_STEP_PAST events. -#define TRACE_EVENT_ASYNC_STEP_INTO0(category, name, id, step) \ - INTERNAL_TRACE_EVENT_ADD_WITH_ID(TRACE_EVENT_PHASE_ASYNC_STEP_INTO, \ - category, name, id, TRACE_EVENT_FLAG_NONE, "step", step) -#define TRACE_EVENT_ASYNC_STEP_INTO1(category, name, id, step, \ - arg1_name, arg1_val) \ - INTERNAL_TRACE_EVENT_ADD_WITH_ID(TRACE_EVENT_PHASE_ASYNC_STEP_INTO, \ - category, name, id, TRACE_EVENT_FLAG_NONE, "step", step, \ - arg1_name, arg1_val) - -// Records a single ASYNC_STEP_PAST event for |step| immediately. If the -// category is not enabled, then this does nothing. The |name| and |id| must -// match the ASYNC_BEGIN event above. The |step| param identifies this step -// within the async event. This should be called at the beginning of the next -// phase of an asynchronous operation. The ASYNC_BEGIN event must not have any -// ASYNC_STEP_INTO events. -#define TRACE_EVENT_ASYNC_STEP_PAST0(category_group, name, id, step) \ - INTERNAL_TRACE_EVENT_ADD_WITH_ID(TRACE_EVENT_PHASE_ASYNC_STEP_PAST, \ - category_group, name, id, TRACE_EVENT_FLAG_NONE, "step", step) -#define TRACE_EVENT_ASYNC_STEP_PAST1(category_group, name, id, step, arg1_name, arg1_val) \ - INTERNAL_TRACE_EVENT_ADD_WITH_ID(TRACE_EVENT_PHASE_ASYNC_STEP_PAST, \ - category_group, name, id, TRACE_EVENT_FLAG_NONE, "step", step, \ - arg1_name, arg1_val) - -// Records a single ASYNC_END event for "name" immediately. If the category -// is not enabled, then this does nothing. -#define TRACE_EVENT_ASYNC_END0(category, name, id) \ - INTERNAL_TRACE_EVENT_ADD_WITH_ID(TRACE_EVENT_PHASE_ASYNC_END, \ - category, name, id, TRACE_EVENT_FLAG_NONE) -#define TRACE_EVENT_ASYNC_END1(category, name, id, arg1_name, arg1_val) \ - INTERNAL_TRACE_EVENT_ADD_WITH_ID(TRACE_EVENT_PHASE_ASYNC_END, \ - category, name, id, TRACE_EVENT_FLAG_NONE, arg1_name, arg1_val) -#define TRACE_EVENT_ASYNC_END2(category, name, id, arg1_name, arg1_val, \ - arg2_name, arg2_val) \ - INTERNAL_TRACE_EVENT_ADD_WITH_ID(TRACE_EVENT_PHASE_ASYNC_END, \ - category, name, id, TRACE_EVENT_FLAG_NONE, \ - arg1_name, arg1_val, arg2_name, arg2_val) -#define TRACE_EVENT_COPY_ASYNC_END0(category, name, id) \ - INTERNAL_TRACE_EVENT_ADD_WITH_ID(TRACE_EVENT_PHASE_ASYNC_END, \ - category, name, id, TRACE_EVENT_FLAG_COPY) -#define TRACE_EVENT_COPY_ASYNC_END1(category, name, id, arg1_name, arg1_val) \ - INTERNAL_TRACE_EVENT_ADD_WITH_ID(TRACE_EVENT_PHASE_ASYNC_END, \ - category, name, id, TRACE_EVENT_FLAG_COPY, \ - arg1_name, arg1_val) -#define TRACE_EVENT_COPY_ASYNC_END2(category, name, id, arg1_name, arg1_val, \ - arg2_name, arg2_val) \ - INTERNAL_TRACE_EVENT_ADD_WITH_ID(TRACE_EVENT_PHASE_ASYNC_END, \ - category, name, id, TRACE_EVENT_FLAG_COPY, \ - arg1_name, arg1_val, arg2_name, arg2_val) - -// Creates a scope of a sampling state with the given category and name (both must -// be constant strings). These states are intended for a sampling profiler. -// Implementation note: we store category and name together because we don't -// want the inconsistency/expense of storing two pointers. -// |thread_bucket| is [0..2] and is used to statically isolate samples in one -// thread from others. -// -// { // The sampling state is set within this scope. -// TRACE_EVENT_SAMPLING_STATE_SCOPE_FOR_BUCKET(0, "category", "name"); -// ...; -// } -#define TRACE_EVENT_SCOPED_SAMPLING_STATE_FOR_BUCKET(bucket_number, category, name) \ - TraceEvent::SamplingStateScope traceEventSamplingScope(category "\0" name); - -// Returns a current sampling state of the given bucket. -// The format of the returned string is "category\0name". -#define TRACE_EVENT_GET_SAMPLING_STATE_FOR_BUCKET(bucket_number) \ - TraceEvent::SamplingStateScope::current() - -// Sets a current sampling state of the given bucket. -// |category| and |name| have to be constant strings. -#define TRACE_EVENT_SET_SAMPLING_STATE_FOR_BUCKET(bucket_number, category, name) \ - TraceEvent::SamplingStateScope::set(category "\0" name) - -// Sets a current sampling state of the given bucket. -// |categoryAndName| doesn't need to be a constant string. -// The format of the string is "category\0name". -#define TRACE_EVENT_SET_NONCONST_SAMPLING_STATE_FOR_BUCKET(bucket_number, categoryAndName) \ - TraceEvent::SamplingStateScope::set(categoryAndName) - -// Syntactic sugars for the sampling tracing in the main thread. -#define TRACE_EVENT_SCOPED_SAMPLING_STATE(category, name) \ - TRACE_EVENT_SCOPED_SAMPLING_STATE_FOR_BUCKET(0, category, name) -#define TRACE_EVENT_GET_SAMPLING_STATE() \ - TRACE_EVENT_GET_SAMPLING_STATE_FOR_BUCKET(0) -#define TRACE_EVENT_SET_SAMPLING_STATE(category, name) \ - TRACE_EVENT_SET_SAMPLING_STATE_FOR_BUCKET(0, category, name) -#define TRACE_EVENT_SET_NONCONST_SAMPLING_STATE(categoryAndName) \ - TRACE_EVENT_SET_NONCONST_SAMPLING_STATE_FOR_BUCKET(0, categoryAndName) - -// Macros to track the life time and value of arbitrary client objects. -// See also TraceTrackableObject. -#define TRACE_EVENT_OBJECT_CREATED_WITH_ID(categoryGroup, name, id) \ - INTERNAL_TRACE_EVENT_ADD_WITH_ID(TRACE_EVENT_PHASE_CREATE_OBJECT, \ - categoryGroup, name, TRACE_ID_DONT_MANGLE(id), TRACE_EVENT_FLAG_NONE) - -#define TRACE_EVENT_OBJECT_SNAPSHOT_WITH_ID(categoryGroup, name, id, snapshot) \ - INTERNAL_TRACE_EVENT_ADD_WITH_ID(TRACE_EVENT_PHASE_SNAPSHOT_OBJECT, \ - categoryGroup, name, TRACE_ID_DONT_MANGLE(id), TRACE_EVENT_FLAG_NONE, \ - "snapshot", snapshot) - -#define TRACE_EVENT_OBJECT_DELETED_WITH_ID(categoryGroup, name, id) \ - INTERNAL_TRACE_EVENT_ADD_WITH_ID(TRACE_EVENT_PHASE_DELETE_OBJECT, \ - categoryGroup, name, TRACE_ID_DONT_MANGLE(id), TRACE_EVENT_FLAG_NONE) - -// Macro to efficiently determine if a given category group is enabled. -#define TRACE_EVENT_CATEGORY_GROUP_ENABLED(categoryGroup, ret) \ - do { \ - INTERNAL_TRACE_EVENT_GET_CATEGORY_INFO(categoryGroup); \ - if (INTERNAL_TRACE_EVENT_CATEGORY_GROUP_ENABLED_FOR_RECORDING_MODE()) { \ - *ret = true; \ - } else { \ - *ret = false; \ - } \ - } while (0) - -// This will mark the trace event as disabled by default. The user will need -// to explicitly enable the event. -#define TRACE_DISABLED_BY_DEFAULT(name) "disabled-by-default-" name - -//////////////////////////////////////////////////////////////////////////////// -// Implementation specific tracing API definitions. - -// Get a pointer to the enabled state of the given trace category. Only -// long-lived literal strings should be given as the category name. The returned -// pointer can be held permanently in a local static for example. If the -// unsigned char is non-zero, tracing is enabled. If tracing is enabled, -// TRACE_EVENT_API_ADD_TRACE_EVENT can be called. It's OK if tracing is disabled -// between the load of the tracing state and the call to -// TRACE_EVENT_API_ADD_TRACE_EVENT, because this flag only provides an early out -// for best performance when tracing is disabled. -// const unsigned char* -// TRACE_EVENT_API_GET_CATEGORY_ENABLED(const char* category_name) -#define TRACE_EVENT_API_GET_CATEGORY_ENABLED \ - blink::EventTracer::getTraceCategoryEnabledFlag - -// Add a trace event to the platform tracing system. -// blink::TraceEvent::TraceEventHandle TRACE_EVENT_API_ADD_TRACE_EVENT( -// char phase, -// const unsigned char* category_enabled, -// const char* name, -// unsigned long long id, -// int num_args, -// const char** arg_names, -// const unsigned char* arg_types, -// const unsigned long long* arg_values, -// const RefPtr* convertableValues -// unsigned char flags) -#define TRACE_EVENT_API_ADD_TRACE_EVENT \ - blink::EventTracer::addTraceEvent - -// Set the duration field of a COMPLETE trace event. -// void TRACE_EVENT_API_UPDATE_TRACE_EVENT_DURATION( -// blink::TraceEvent::TraceEventHandle handle) -#define TRACE_EVENT_API_UPDATE_TRACE_EVENT_DURATION \ - blink::EventTracer::updateTraceEventDuration - -//////////////////////////////////////////////////////////////////////////////// - -// Implementation detail: trace event macros create temporary variables -// to keep instrumentation overhead low. These macros give each temporary -// variable a unique name based on the line number to prevent name collissions. -#define INTERNAL_TRACE_EVENT_UID3(a, b) \ - trace_event_unique_##a##b -#define INTERNAL_TRACE_EVENT_UID2(a, b) \ - INTERNAL_TRACE_EVENT_UID3(a, b) -#define INTERNALTRACEEVENTUID(name_prefix) \ - INTERNAL_TRACE_EVENT_UID2(name_prefix, __LINE__) - -// Implementation detail: internal macro to create static category. -// - WTF_ANNOTATE_BENIGN_RACE, see Thread Safety above. - -#define INTERNAL_TRACE_EVENT_GET_CATEGORY_INFO(category) \ - static const unsigned char* INTERNALTRACEEVENTUID(categoryGroupEnabled) = 0; \ - WTF_ANNOTATE_BENIGN_RACE(&INTERNALTRACEEVENTUID(categoryGroupEnabled), \ - "trace_event category"); \ - if (!INTERNALTRACEEVENTUID(categoryGroupEnabled)) { \ - INTERNALTRACEEVENTUID(categoryGroupEnabled) = \ - TRACE_EVENT_API_GET_CATEGORY_ENABLED(category); \ - } - -// Implementation detail: internal macro to create static category and add -// event if the category is enabled. -#define INTERNAL_TRACE_EVENT_ADD(phase, category, name, flags, ...) \ - do { \ - INTERNAL_TRACE_EVENT_GET_CATEGORY_INFO(category); \ - if (INTERNAL_TRACE_EVENT_CATEGORY_GROUP_ENABLED_FOR_RECORDING_MODE()) { \ - blink::TraceEvent::addTraceEvent( \ - phase, INTERNALTRACEEVENTUID(categoryGroupEnabled), name, \ - blink::TraceEvent::noEventId, flags, ##__VA_ARGS__); \ - } \ - } while (0) - -// Implementation detail: internal macro to create static category and add begin -// event if the category is enabled. Also adds the end event when the scope -// ends. -#define INTERNAL_TRACE_EVENT_ADD_SCOPED(category, name, ...) \ - INTERNAL_TRACE_EVENT_GET_CATEGORY_INFO(category); \ - blink::TraceEvent::ScopedTracer INTERNALTRACEEVENTUID(scopedTracer); \ - if (INTERNAL_TRACE_EVENT_CATEGORY_GROUP_ENABLED_FOR_RECORDING_MODE()) { \ - blink::TraceEvent::TraceEventHandle h = \ - blink::TraceEvent::addTraceEvent( \ - TRACE_EVENT_PHASE_COMPLETE, \ - INTERNALTRACEEVENTUID(categoryGroupEnabled), \ - name, blink::TraceEvent::noEventId, \ - TRACE_EVENT_FLAG_NONE, ##__VA_ARGS__); \ - INTERNALTRACEEVENTUID(scopedTracer).initialize( \ - INTERNALTRACEEVENTUID(categoryGroupEnabled), name, h); \ - } - -// Implementation detail: internal macro to create static category and add -// event if the category is enabled. -#define INTERNAL_TRACE_EVENT_ADD_WITH_ID(phase, category, name, id, flags, \ - ...) \ - do { \ - INTERNAL_TRACE_EVENT_GET_CATEGORY_INFO(category); \ - if (INTERNAL_TRACE_EVENT_CATEGORY_GROUP_ENABLED_FOR_RECORDING_MODE()) { \ - unsigned char traceEventFlags = flags | TRACE_EVENT_FLAG_HAS_ID; \ - blink::TraceEvent::TraceID traceEventTraceID( \ - id, &traceEventFlags); \ - blink::TraceEvent::addTraceEvent( \ - phase, INTERNALTRACEEVENTUID(categoryGroupEnabled), \ - name, traceEventTraceID.data(), traceEventFlags, \ - ##__VA_ARGS__); \ - } \ - } while (0) - -// Notes regarding the following definitions: -// New values can be added and propagated to third party libraries, but existing -// definitions must never be changed, because third party libraries may use old -// definitions. - -// Phase indicates the nature of an event entry. E.g. part of a begin/end pair. -#define TRACE_EVENT_PHASE_BEGIN ('B') -#define TRACE_EVENT_PHASE_END ('E') -#define TRACE_EVENT_PHASE_COMPLETE ('X') -#define TRACE_EVENT_PHASE_INSTANT ('I') -#define TRACE_EVENT_PHASE_ASYNC_BEGIN ('S') -#define TRACE_EVENT_PHASE_ASYNC_STEP_INTO ('T') -#define TRACE_EVENT_PHASE_ASYNC_STEP_PAST ('p') -#define TRACE_EVENT_PHASE_ASYNC_END ('F') -#define TRACE_EVENT_PHASE_METADATA ('M') -#define TRACE_EVENT_PHASE_COUNTER ('C') -#define TRACE_EVENT_PHASE_SAMPLE ('P') -#define TRACE_EVENT_PHASE_CREATE_OBJECT ('N') -#define TRACE_EVENT_PHASE_SNAPSHOT_OBJECT ('O') -#define TRACE_EVENT_PHASE_DELETE_OBJECT ('D') - -// Flags for changing the behavior of TRACE_EVENT_API_ADD_TRACE_EVENT. -#define TRACE_EVENT_FLAG_NONE (static_cast(0)) -#define TRACE_EVENT_FLAG_COPY (static_cast(1 << 0)) -#define TRACE_EVENT_FLAG_HAS_ID (static_cast(1 << 1)) -#define TRACE_EVENT_FLAG_MANGLE_ID (static_cast(1 << 2)) - -// Type values for identifying types in the TraceValue union. -#define TRACE_VALUE_TYPE_BOOL (static_cast(1)) -#define TRACE_VALUE_TYPE_UINT (static_cast(2)) -#define TRACE_VALUE_TYPE_INT (static_cast(3)) -#define TRACE_VALUE_TYPE_DOUBLE (static_cast(4)) -#define TRACE_VALUE_TYPE_POINTER (static_cast(5)) -#define TRACE_VALUE_TYPE_STRING (static_cast(6)) -#define TRACE_VALUE_TYPE_COPY_STRING (static_cast(7)) -#define TRACE_VALUE_TYPE_CONVERTABLE (static_cast(8)) - -// These values must be in sync with base::debug::TraceLog::CategoryGroupEnabledFlags. -#define ENABLED_FOR_RECORDING (1 << 0) -#define ENABLED_FOR_EVENT_CALLBACK (1 << 2) - -#define INTERNAL_TRACE_EVENT_CATEGORY_GROUP_ENABLED_FOR_RECORDING_MODE() \ - (*INTERNALTRACEEVENTUID(categoryGroupEnabled) & (ENABLED_FOR_RECORDING | ENABLED_FOR_EVENT_CALLBACK)) - -namespace blink { - -namespace TraceEvent { - -// Specify these values when the corresponding argument of addTraceEvent is not -// used. -const int zeroNumArgs = 0; -const unsigned long long noEventId = 0; - -// TraceID encapsulates an ID that can either be an integer or pointer. Pointers -// are mangled with the Process ID so that they are unlikely to collide when the -// same pointer is used on different processes. -class TraceID { -public: - template class MangleBehavior { - public: - template explicit MangleBehavior(T id) : m_data(reinterpret_cast(id)) { } - unsigned long long data() const { return m_data; } - private: - unsigned long long m_data; - }; - typedef MangleBehavior DontMangle; - typedef MangleBehavior ForceMangle; - - TraceID(const void* id, unsigned char* flags) : - m_data(static_cast(reinterpret_cast(id))) - { - *flags |= TRACE_EVENT_FLAG_MANGLE_ID; - } - TraceID(ForceMangle id, unsigned char* flags) : m_data(id.data()) - { - *flags |= TRACE_EVENT_FLAG_MANGLE_ID; - } - TraceID(DontMangle id, unsigned char*) : m_data(id.data()) { } - TraceID(unsigned long long id, unsigned char*) : m_data(id) { } - TraceID(unsigned long id, unsigned char*) : m_data(id) { } - TraceID(unsigned id, unsigned char*) : m_data(id) { } - TraceID(unsigned short id, unsigned char*) : m_data(id) { } - TraceID(unsigned char id, unsigned char*) : m_data(id) { } - TraceID(long long id, unsigned char*) : - m_data(static_cast(id)) { } - TraceID(long id, unsigned char*) : - m_data(static_cast(id)) { } - TraceID(int id, unsigned char*) : - m_data(static_cast(id)) { } - TraceID(short id, unsigned char*) : - m_data(static_cast(id)) { } - TraceID(signed char id, unsigned char*) : - m_data(static_cast(id)) { } - - unsigned long long data() const { return m_data; } - -private: - unsigned long long m_data; -}; - -// Simple union to store various types as unsigned long long. -union TraceValueUnion { - bool m_bool; - unsigned long long m_uint; - long long m_int; - double m_double; - const void* m_pointer; - const char* m_string; -}; - -// Simple container for const char* that should be copied instead of retained. -class TraceStringWithCopy { -public: - explicit TraceStringWithCopy(const char* str) : m_str(str) { } - const char* str() const { return m_str; } -private: - const char* m_str; -}; - -// Define setTraceValue for each allowed type. It stores the type and -// value in the return arguments. This allows this API to avoid declaring any -// structures so that it is portable to third_party libraries. -#define INTERNAL_DECLARE_SET_TRACE_VALUE(actualType, argExpression, unionMember, valueTypeId) \ - static inline void setTraceValue(actualType arg, unsigned char* type, unsigned long long* value) { \ - TraceValueUnion typeValue; \ - typeValue.unionMember = argExpression; \ - *type = valueTypeId; \ - *value = typeValue.m_uint; \ - } -// Simpler form for int types that can be safely casted. -#define INTERNAL_DECLARE_SET_TRACE_VALUE_INT(actualType, valueTypeId) \ - static inline void setTraceValue(actualType arg, \ - unsigned char* type, \ - unsigned long long* value) { \ - *type = valueTypeId; \ - *value = static_cast(arg); \ - } - -INTERNAL_DECLARE_SET_TRACE_VALUE_INT(unsigned long long, TRACE_VALUE_TYPE_UINT) -INTERNAL_DECLARE_SET_TRACE_VALUE_INT(unsigned, TRACE_VALUE_TYPE_UINT) -INTERNAL_DECLARE_SET_TRACE_VALUE_INT(unsigned short, TRACE_VALUE_TYPE_UINT) -INTERNAL_DECLARE_SET_TRACE_VALUE_INT(unsigned char, TRACE_VALUE_TYPE_UINT) -INTERNAL_DECLARE_SET_TRACE_VALUE_INT(long long, TRACE_VALUE_TYPE_INT) -INTERNAL_DECLARE_SET_TRACE_VALUE_INT(int, TRACE_VALUE_TYPE_INT) -INTERNAL_DECLARE_SET_TRACE_VALUE_INT(short, TRACE_VALUE_TYPE_INT) -INTERNAL_DECLARE_SET_TRACE_VALUE_INT(signed char, TRACE_VALUE_TYPE_INT) -INTERNAL_DECLARE_SET_TRACE_VALUE(bool, arg, m_bool, TRACE_VALUE_TYPE_BOOL) -INTERNAL_DECLARE_SET_TRACE_VALUE(double, arg, m_double, TRACE_VALUE_TYPE_DOUBLE) -INTERNAL_DECLARE_SET_TRACE_VALUE(const void*, arg, m_pointer, TRACE_VALUE_TYPE_POINTER) -INTERNAL_DECLARE_SET_TRACE_VALUE(const char*, arg, m_string, TRACE_VALUE_TYPE_STRING) -INTERNAL_DECLARE_SET_TRACE_VALUE(const TraceStringWithCopy&, arg.str(), m_string, TRACE_VALUE_TYPE_COPY_STRING) - -#undef INTERNAL_DECLARE_SET_TRACE_VALUE -#undef INTERNAL_DECLARE_SET_TRACE_VALUE_INT - -// WTF::String version of setTraceValue so that trace arguments can be strings. -static inline void setTraceValue(const WTF::CString& arg, unsigned char* type, unsigned long long* value) -{ - TraceValueUnion typeValue; - typeValue.m_string = arg.data(); - *type = TRACE_VALUE_TYPE_COPY_STRING; - *value = typeValue.m_uint; -} - -static inline void setTraceValue(ConvertableToTraceFormat*, unsigned char* type, unsigned long long*) -{ - *type = TRACE_VALUE_TYPE_CONVERTABLE; -} - -template static inline void setTraceValue(const PassRefPtr& ptr, unsigned char* type, unsigned long long* value) -{ - setTraceValue(ptr.get(), type, value); -} - -template struct ConvertableToTraceFormatTraits { - static const bool isConvertable = false; - static void assignIfConvertable(ConvertableToTraceFormat*& left, const T&) - { - left = 0; - } -}; - -template struct ConvertableToTraceFormatTraits { - static const bool isConvertable = WTF::IsSubclass::value; - static void assignIfConvertable(ConvertableToTraceFormat*& left, ...) - { - left = 0; - } - static void assignIfConvertable(ConvertableToTraceFormat*& left, ConvertableToTraceFormat* const& right) - { - left = right; - } -}; - -template struct ConvertableToTraceFormatTraits > { - static const bool isConvertable = WTF::IsSubclass::value; - static void assignIfConvertable(ConvertableToTraceFormat*& left, const PassRefPtr& right) - { - ConvertableToTraceFormatTraits::assignIfConvertable(left, right.get()); - } -}; - -template bool isConvertableToTraceFormat(const T&) -{ - return ConvertableToTraceFormatTraits::isConvertable; -} - -template void assignIfConvertableToTraceFormat(ConvertableToTraceFormat*& left, const T& right) -{ - ConvertableToTraceFormatTraits::assignIfConvertable(left, right); -} - -// These addTraceEvent template functions are defined here instead of in the -// macro, because the arg values could be temporary string objects. In order to -// store pointers to the internal c_str and pass through to the tracing API, the -// arg values must live throughout these procedures. - -static inline TraceEventHandle addTraceEvent( - char phase, - const unsigned char* categoryEnabled, - const char* name, - unsigned long long id, - unsigned char flags) -{ - return TRACE_EVENT_API_ADD_TRACE_EVENT( - phase, categoryEnabled, name, id, - zeroNumArgs, 0, 0, 0, - flags); -} - -template -static inline TraceEventHandle addTraceEvent( - char phase, - const unsigned char* categoryEnabled, - const char* name, - unsigned long long id, - unsigned char flags, - const char* arg1Name, - const ARG1_TYPE& arg1Val) -{ - const int numArgs = 1; - unsigned char argTypes[1]; - unsigned long long argValues[1]; - setTraceValue(arg1Val, &argTypes[0], &argValues[0]); - if (isConvertableToTraceFormat(arg1Val)) { - ConvertableToTraceFormat* convertableValues[1]; - assignIfConvertableToTraceFormat(convertableValues[0], arg1Val); - return TRACE_EVENT_API_ADD_TRACE_EVENT( - phase, categoryEnabled, name, id, - numArgs, &arg1Name, argTypes, argValues, - convertableValues, - flags); - } - return TRACE_EVENT_API_ADD_TRACE_EVENT( - phase, categoryEnabled, name, id, - numArgs, &arg1Name, argTypes, argValues, - flags); -} - -template -static inline TraceEventHandle addTraceEvent( - char phase, - const unsigned char* categoryEnabled, - const char* name, - unsigned long long id, - unsigned char flags, - const char* arg1Name, - const ARG1_TYPE& arg1Val, - const char* arg2Name, - const ARG2_TYPE& arg2Val) -{ - const int numArgs = 2; - const char* argNames[2] = { arg1Name, arg2Name }; - unsigned char argTypes[2]; - unsigned long long argValues[2]; - setTraceValue(arg1Val, &argTypes[0], &argValues[0]); - setTraceValue(arg2Val, &argTypes[1], &argValues[1]); - if (isConvertableToTraceFormat(arg1Val) || isConvertableToTraceFormat(arg2Val)) { - ConvertableToTraceFormat* convertableValues[2]; - assignIfConvertableToTraceFormat(convertableValues[0], arg1Val); - assignIfConvertableToTraceFormat(convertableValues[1], arg2Val); - return TRACE_EVENT_API_ADD_TRACE_EVENT( - phase, categoryEnabled, name, id, - numArgs, argNames, argTypes, argValues, - convertableValues, - flags); - } - return TRACE_EVENT_API_ADD_TRACE_EVENT( - phase, categoryEnabled, name, id, - numArgs, argNames, argTypes, argValues, - flags); -} - -// Used by TRACE_EVENTx macro. Do not use directly. -class ScopedTracer { -public: - // Note: members of m_data intentionally left uninitialized. See initialize. - ScopedTracer() : m_pdata(0) { } - ~ScopedTracer() - { - if (m_pdata && *m_pdata->categoryGroupEnabled) - TRACE_EVENT_API_UPDATE_TRACE_EVENT_DURATION(m_data.categoryGroupEnabled, m_data.name, m_data.eventHandle); - } - - void initialize(const unsigned char* categoryGroupEnabled, const char* name, TraceEventHandle eventHandle) - { - m_data.categoryGroupEnabled = categoryGroupEnabled; - m_data.name = name; - m_data.eventHandle = eventHandle; - m_pdata = &m_data; - } - -private: - // This Data struct workaround is to avoid initializing all the members - // in Data during construction of this object, since this object is always - // constructed, even when tracing is disabled. If the members of Data were - // members of this class instead, compiler warnings occur about potential - // uninitialized accesses. - struct Data { - const unsigned char* categoryGroupEnabled; - const char* name; - TraceEventHandle eventHandle; - }; - Data* m_pdata; - Data m_data; -}; - -// TraceEventSamplingStateScope records the current sampling state -// and sets a new sampling state. When the scope exists, it restores -// the sampling state having recorded. -template -class SamplingStateScope { - WTF_MAKE_FAST_ALLOCATED; -public: - SamplingStateScope(const char* categoryAndName) - { - m_previousState = SamplingStateScope::current(); - SamplingStateScope::set(categoryAndName); - } - - ~SamplingStateScope() - { - SamplingStateScope::set(m_previousState); - } - - // FIXME: Make load/store to traceSamplingState[] thread-safe and atomic. - static inline const char* current() - { - return reinterpret_cast(*blink::traceSamplingState[BucketNumber]); - } - static inline void set(const char* categoryAndName) - { - *blink::traceSamplingState[BucketNumber] = reinterpret_cast(const_cast(categoryAndName)); - } - -private: - const char* m_previousState; -}; - -template class TraceScopedTrackableObject { - WTF_MAKE_NONCOPYABLE(TraceScopedTrackableObject); -public: - TraceScopedTrackableObject(const char* categoryGroup, const char* name, IDType id) - : m_categoryGroup(categoryGroup), m_name(name), m_id(id) - { - TRACE_EVENT_OBJECT_CREATED_WITH_ID(m_categoryGroup, m_name, m_id); - } - - ~TraceScopedTrackableObject() - { - TRACE_EVENT_OBJECT_DELETED_WITH_ID(m_categoryGroup, m_name, m_id); - } - -private: - const char* m_categoryGroup; - const char* m_name; - IDType m_id; -}; - -} // namespace TraceEvent - -} // namespace blink - -#endif +#include "base/debug/trace_event.h" diff --git a/engine/platform/graphics/Canvas2DLayerBridge.cpp b/engine/platform/graphics/Canvas2DLayerBridge.cpp index d61c62ca567dbfa950e139f71afc48cd8c98545f..deeaabcb4dd1348411fb49c6b36f6686797fbdc0 100644 --- a/engine/platform/graphics/Canvas2DLayerBridge.cpp +++ b/engine/platform/graphics/Canvas2DLayerBridge.cpp @@ -60,7 +60,7 @@ static PassRefPtr createSkSurface(GrContext* gr, const IntSize& size, PassRefPtr Canvas2DLayerBridge::create(const IntSize& size, OpacityMode opacityMode, int msaaSampleCount) { - TRACE_EVENT_INSTANT0("test_gpu", "Canvas2DLayerBridgeCreation"); + TRACE_EVENT_INSTANT0("test_gpu", "Canvas2DLayerBridgeCreation", TRACE_EVENT_SCOPE_NAME_PROCESS); OwnPtr contextProvider = adoptPtr(Platform::current()->createSharedOffscreenGraphicsContext3DProvider()); if (!contextProvider) return nullptr; @@ -96,7 +96,7 @@ Canvas2DLayerBridge::Canvas2DLayerBridge(PassOwnPtrcompositorSupport()->createExternalTextureLayer(this)); m_layer->setOpaque(opacityMode == Opaque); m_layer->setBlendBackgroundColor(opacityMode != Opaque); diff --git a/engine/platform/graphics/OpaqueRectTrackingContentLayerDelegate.cpp b/engine/platform/graphics/OpaqueRectTrackingContentLayerDelegate.cpp index 703c45c7f25299f97586f9d9fe781f04147c80a9..8266c25cd233e1deb31d28c6b17a9aff24d75b3d 100644 --- a/engine/platform/graphics/OpaqueRectTrackingContentLayerDelegate.cpp +++ b/engine/platform/graphics/OpaqueRectTrackingContentLayerDelegate.cpp @@ -26,6 +26,7 @@ #include "platform/graphics/OpaqueRectTrackingContentLayerDelegate.h" +#include "base/debug/trace_event.h" #include "platform/EventTracer.h" #include "platform/geometry/IntRect.h" #include "platform/graphics/GraphicsContext.h" diff --git a/engine/platform/graphics/gpu/DrawingBuffer.cpp b/engine/platform/graphics/gpu/DrawingBuffer.cpp index f7d54be6bec79b3853a9c8bceb87fc8ca1498b39..5f3cef7ce6c315fad7df50af94eed65ec0034730 100644 --- a/engine/platform/graphics/gpu/DrawingBuffer.cpp +++ b/engine/platform/graphics/gpu/DrawingBuffer.cpp @@ -150,7 +150,7 @@ DrawingBuffer::DrawingBuffer(PassOwnPtr context, , m_contextEvictionManager(contextEvictionManager) { // Used by browser tests to detect the use of a DrawingBuffer. - TRACE_EVENT_INSTANT0("test_gpu", "DrawingBufferCreation"); + TRACE_EVENT_INSTANT0("test_gpu", "DrawingBufferCreation", TRACE_EVENT_SCOPE_NAME_PROCESS); #ifndef NDEBUG drawingBufferCounter.increment(); #endif diff --git a/engine/web/WebViewImpl.cpp b/engine/web/WebViewImpl.cpp index 1dbcb64035181a7d5928c00d4404eead32ef8766..fd1768ff8127201ffb0b6ab8d9697b5f1cb932e4 100644 --- a/engine/web/WebViewImpl.cpp +++ b/engine/web/WebViewImpl.cpp @@ -1141,7 +1141,7 @@ static String inputTypeToName(WebInputEvent::Type type) bool WebViewImpl::handleInputEvent(const WebInputEvent& inputEvent) { - TRACE_EVENT1("input", "WebViewImpl::handleInputEvent", "type", inputTypeToName(inputEvent.type).ascii()); + TRACE_EVENT1("input", "WebViewImpl::handleInputEvent", "type", inputTypeToName(inputEvent.type).ascii().data()); // If we've started a drag and drop operation, ignore input events until // we're done. if (m_doingDragAndDrop)