DevTools: use async operation id instead of AsyncCallChain

Source/core/inspector/AsyncCallTracker.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 35 matching lines @@
 #include <v8.h>
 
 namespace {
 
 static const char setTimeoutName[] = "setTimeout";
 static const char setIntervalName[] = "setInterval";
 static const char requestAnimationFrameName[] = "requestAnimationFrame";
 static const char xhrSendName[] = "XMLHttpRequest.send";
 static const char enqueueMutationRecordName[] = "Mutation";
 
+const int noOperationId = 0;

[aandrey, 2015/01/20 14:33:35]

noAsyncOperationId or nullAsyncOperationId?
make a public const?

[yurys, 2015/01/20 17:15:38]

Done.

+
 }
 
 namespace blink {
 
 class AsyncCallTracker::ExecutionContextData final : public NoBaseWillBeGarbageCollectedFinalized<ExecutionContextData>, public ContextLifecycleObserver {
     WILL_BE_USING_GARBAGE_COLLECTED_MIXIN(AsyncCallTracker::ExecutionContextData);
     WTF_MAKE_FAST_ALLOCATED_WILL_BE_REMOVED;
 public:
     ExecutionContextData(AsyncCallTracker* tracker, ExecutionContext* executionContext)
         : ContextLifecycleObserver(executionContext)
@@ skipping 51 matching lines @@
     }
 
     RawPtrWillBeMember<AsyncCallTracker> m_tracker;
     HashSet<int> m_intervalTimerIds;
     AsyncCallChainMap<int> m_timerCallChains;
     AsyncCallChainMap<int> m_animationFrameCallChains;
     AsyncCallChainMap<RawPtrWillBeMember<Event> > m_eventCallChains;
     AsyncCallChainMap<RawPtrWillBeMember<EventTarget> > m_xhrCallChains;
     AsyncCallChainMap<RawPtrWillBeMember<MutationObserver> > m_mutationObserverCallChains;
     AsyncCallChainMap<ExecutionContextTask*> m_executionContextTaskCallChains;
     AsyncCallChainMap<int> m_asyncOperationCallChains;

[aandrey, 2015/01/20 14:33:36]

remove?

[yurys, 2015/01/20 17:15:38]

Removed nextAsyncOperationUniqueId() instead and now reuse async operation id
generated by the debugger agent. Is used to track operations going on inside
this particular context.

 
 private:
     void disposeCallChains()
     {
         m_timerCallChains.dispose();
         m_animationFrameCallChains.dispose();
         m_eventCallChains.dispose();
         m_xhrCallChains.dispose();
         m_mutationObserverCallChains.dispose();
         m_executionContextTaskCallChains.dispose();
@@ skipping 33 matching lines @@
 {
     for (auto& it : m_executionContextDataMap)
         it.value->unobserve();
     m_executionContextDataMap.clear();
 }
 
 void AsyncCallTracker::didInstallTimer(ExecutionContext* context, int timerId, int timeout, bool singleShot)
 {
     ASSERT(context);
     ASSERT(m_debuggerAgent->trackingAsyncCalls());
-    RefPtrWillBeRawPtr<AsyncCallChain> callChain = m_debuggerAgent->traceAsyncOperationStarting(singleShot ? setTimeoutName : setIntervalName);
-    if (!callChain)
+    int operationId = m_debuggerAgent->traceAsyncOperationStarting(singleShot ? setTimeoutName : setIntervalName);
+    if (!operationId)
         return;
     ASSERT(timerId > 0);
     ExecutionContextData* data = createContextDataIfNeeded(context);
-    data->m_timerCallChains.set(timerId, callChain.release());
+    data->m_timerCallChains.set(timerId, operationId);
     if (!singleShot)
         data->m_intervalTimerIds.add(timerId);
 }
 
 void AsyncCallTracker::didRemoveTimer(ExecutionContext* context, int timerId)
 {
     ASSERT(context);
     ASSERT(m_debuggerAgent->trackingAsyncCalls());
     if (timerId <= 0)
         return;
     ExecutionContextData* data = m_executionContextDataMap.get(context);
     if (!data)
         return;
     data->m_intervalTimerIds.remove(timerId);
     data->m_timerCallChains.remove(timerId);
 }
 
 bool AsyncCallTracker::willFireTimer(ExecutionContext* context, int timerId)
 {
     ASSERT(context);
     ASSERT(m_debuggerAgent->trackingAsyncCalls());
     ASSERT(timerId > 0);
     ASSERT(!m_debuggerAgent->currentAsyncCallChain());
     if (ExecutionContextData* data = m_executionContextDataMap.get(context)) {
         setCurrentAsyncCallChain(context, data->m_timerCallChains.get(timerId));
         if (!data->m_intervalTimerIds.contains(timerId))
             data->m_timerCallChains.remove(timerId);
     } else {
-        setCurrentAsyncCallChain(context, nullptr);
+        setCurrentAsyncCallChain(context, noOperationId);
     }
     return true;
 }
 
 void AsyncCallTracker::didRequestAnimationFrame(ExecutionContext* context, int callbackId)
 {
     ASSERT(context);
     ASSERT(m_debuggerAgent->trackingAsyncCalls());
-    RefPtrWillBeRawPtr<AsyncCallChain> callChain = m_debuggerAgent->traceAsyncOperationStarting(requestAnimationFrameName);
-    if (!callChain)
+    int operationId = m_debuggerAgent->traceAsyncOperationStarting(requestAnimationFrameName);
+    if (!operationId)
         return;
     ASSERT(callbackId > 0);
     ExecutionContextData* data = createContextDataIfNeeded(context);
-    data->m_animationFrameCallChains.set(callbackId, callChain.release());
+    data->m_animationFrameCallChains.set(callbackId, operationId);
 }
 
 void AsyncCallTracker::didCancelAnimationFrame(ExecutionContext* context, int callbackId)
 {
     ASSERT(context);
     ASSERT(m_debuggerAgent->trackingAsyncCalls());
     if (callbackId <= 0)
         return;
     if (ExecutionContextData* data = m_executionContextDataMap.get(context))
         data->m_animationFrameCallChains.remove(callbackId);
 }
 
 bool AsyncCallTracker::willFireAnimationFrame(ExecutionContext* context, int callbackId)
 {
     ASSERT(context);
     ASSERT(m_debuggerAgent->trackingAsyncCalls());
     ASSERT(callbackId > 0);
     ASSERT(!m_debuggerAgent->currentAsyncCallChain());
     if (ExecutionContextData* data = m_executionContextDataMap.get(context)) {
         setCurrentAsyncCallChain(context, data->m_animationFrameCallChains.get(callbackId));
         data->m_animationFrameCallChains.remove(callbackId);
     } else {
-        setCurrentAsyncCallChain(context, nullptr);
+        setCurrentAsyncCallChain(context, noOperationId);
     }
     return true;
 }
 
 void AsyncCallTracker::didEnqueueEvent(EventTarget* eventTarget, Event* event)
 {
     ASSERT(eventTarget->executionContext());
     ASSERT(m_debuggerAgent->trackingAsyncCalls());
-    RefPtrWillBeRawPtr<AsyncCallChain> callChain = m_debuggerAgent->traceAsyncOperationStarting(event->type());
-    if (!callChain)
+    int operationId = m_debuggerAgent->traceAsyncOperationStarting(event->type());
+    if (!operationId)
         return;
     ExecutionContextData* data = createContextDataIfNeeded(eventTarget->executionContext());
-    data->m_eventCallChains.set(event, callChain.release());
+    data->m_eventCallChains.set(event, operationId);
 }
 
 void AsyncCallTracker::didRemoveEvent(EventTarget* eventTarget, Event* event)
 {
     ASSERT(eventTarget->executionContext());
     ASSERT(m_debuggerAgent->trackingAsyncCalls());
     if (ExecutionContextData* data = m_executionContextDataMap.get(eventTarget->executionContext()))
         data->m_eventCallChains.remove(event);
 }
 
 void AsyncCallTracker::willHandleEvent(EventTarget* eventTarget, Event* event, EventListener* listener, bool useCapture)
 {
     ASSERT(eventTarget->executionContext());
     ASSERT(m_debuggerAgent->trackingAsyncCalls());
     if (XMLHttpRequest* xhr = toXmlHttpRequest(eventTarget)) {
         willHandleXHREvent(xhr, event);
     } else {
         ExecutionContext* context = eventTarget->executionContext();
         if (ExecutionContextData* data = m_executionContextDataMap.get(context))
             setCurrentAsyncCallChain(context, data->m_eventCallChains.get(event));
         else
-            setCurrentAsyncCallChain(context, nullptr);
+            setCurrentAsyncCallChain(context, noOperationId);
     }
 }
 
 void AsyncCallTracker::willLoadXHR(XMLHttpRequest* xhr, ThreadableLoaderClient*, const AtomicString&, const KURL&, bool async, PassRefPtr<FormData>, const HTTPHeaderMap&, bool)
 {
     ASSERT(xhr->executionContext());
     ASSERT(m_debuggerAgent->trackingAsyncCalls());
     if (!async)
         return;
-    RefPtrWillBeRawPtr<AsyncCallChain> callChain = m_debuggerAgent->traceAsyncOperationStarting(xhrSendName);
-    if (!callChain)
+    int operationId = m_debuggerAgent->traceAsyncOperationStarting(xhrSendName);
+    if (!operationId)
         return;
     ExecutionContextData* data = createContextDataIfNeeded(xhr->executionContext());
-    data->m_xhrCallChains.set(xhr, callChain.release());
+    data->m_xhrCallChains.set(xhr, operationId);
 }
 
 void AsyncCallTracker::didDispatchXHRLoadendEvent(XMLHttpRequest* xhr)
 {
     ASSERT(xhr->executionContext());
     ASSERT(m_debuggerAgent->trackingAsyncCalls());
     if (ExecutionContextData* data = m_executionContextDataMap.get(xhr->executionContext()))
         data->m_xhrCallChains.remove(xhr);
 }
 
 void AsyncCallTracker::willHandleXHREvent(XMLHttpRequest* xhr, Event* event)
 {
     ExecutionContext* context = xhr->executionContext();
     ASSERT(context);
     ASSERT(m_debuggerAgent->trackingAsyncCalls());
     if (ExecutionContextData* data = m_executionContextDataMap.get(context))
         setCurrentAsyncCallChain(context, data->m_xhrCallChains.get(xhr));
     else
-        setCurrentAsyncCallChain(context, nullptr);
+        setCurrentAsyncCallChain(context, noOperationId);
 }
 
 void AsyncCallTracker::didEnqueueMutationRecord(ExecutionContext* context, MutationObserver* observer)
 {
     ASSERT(context);
     ASSERT(m_debuggerAgent->trackingAsyncCalls());
     ExecutionContextData* data = createContextDataIfNeeded(context);
     if (data->m_mutationObserverCallChains.contains(observer))
         return;
-    RefPtrWillBeRawPtr<AsyncCallChain> callChain = m_debuggerAgent->traceAsyncOperationStarting(enqueueMutationRecordName);
-    if (!callChain)
+    int operationId = m_debuggerAgent->traceAsyncOperationStarting(enqueueMutationRecordName);
+    if (!operationId)
         return;
-    data->m_mutationObserverCallChains.set(observer, callChain.release());
+    data->m_mutationObserverCallChains.set(observer, operationId);
 }
 
 void AsyncCallTracker::didClearAllMutationRecords(ExecutionContext* context, MutationObserver* observer)
 {
     ASSERT(context);
     ASSERT(m_debuggerAgent->trackingAsyncCalls());
     if (ExecutionContextData* data = m_executionContextDataMap.get(context))
         data->m_mutationObserverCallChains.remove(observer);
 }
 
 void AsyncCallTracker::willDeliverMutationRecords(ExecutionContext* context, MutationObserver* observer)
 {
     ASSERT(context);
     ASSERT(m_debuggerAgent->trackingAsyncCalls());
     if (ExecutionContextData* data = m_executionContextDataMap.get(context)) {
         setCurrentAsyncCallChain(context, data->m_mutationObserverCallChains.get(observer));
         data->m_mutationObserverCallChains.remove(observer);
     } else {
-        setCurrentAsyncCallChain(context, nullptr);
+        setCurrentAsyncCallChain(context, noOperationId);
     }
 }
 
 void AsyncCallTracker::didPostExecutionContextTask(ExecutionContext* context, ExecutionContextTask* task)
 {
     ASSERT(context);
     ASSERT(m_debuggerAgent->trackingAsyncCalls());
     if (task->taskNameForInstrumentation().isEmpty())
         return;
-    RefPtrWillBeRawPtr<AsyncCallChain> callChain = m_debuggerAgent->traceAsyncOperationStarting(task->taskNameForInstrumentation());
-    if (!callChain)
+    int operationId = m_debuggerAgent->traceAsyncOperationStarting(task->taskNameForInstrumentation());
+    if (!operationId)
         return;
     ExecutionContextData* data = createContextDataIfNeeded(context);
-    data->m_executionContextTaskCallChains.set(task, callChain.release());
+    data->m_executionContextTaskCallChains.set(task, operationId);
 }
 
 void AsyncCallTracker::didKillAllExecutionContextTasks(ExecutionContext* context)
 {
     ASSERT(context);
     ASSERT(m_debuggerAgent->trackingAsyncCalls());
     if (ExecutionContextData* data = m_executionContextDataMap.get(context))
         data->m_executionContextTaskCallChains.clear();
 }
 
 void AsyncCallTracker::willPerformExecutionContextTask(ExecutionContext* context, ExecutionContextTask* task)
 {
     ASSERT(context);
     ASSERT(m_debuggerAgent->trackingAsyncCalls());
     if (ExecutionContextData* data = m_executionContextDataMap.get(context)) {
         setCurrentAsyncCallChain(context, data->m_executionContextTaskCallChains.get(task));
         data->m_executionContextTaskCallChains.remove(task);
     } else {
-        setCurrentAsyncCallChain(context, nullptr);
+        setCurrentAsyncCallChain(context, noOperationId);
     }
 }
 
 int AsyncCallTracker::traceAsyncOperationStarting(ExecutionContext* context, const String& operationName, int prevOperationId)
 {
     ASSERT(context);
     ASSERT(m_debuggerAgent->trackingAsyncCalls());
     if (prevOperationId)
         traceAsyncOperationCompleted(context, prevOperationId);
-    RefPtrWillBeRawPtr<AsyncCallChain> callChain = m_debuggerAgent->traceAsyncOperationStarting(operationName);
-    if (!callChain)
+    int operationId = m_debuggerAgent->traceAsyncOperationStarting(operationName);
+    if (!operationId)
         return 0;
     ExecutionContextData* data = createContextDataIfNeeded(context);
     int id = data->nextAsyncOperationUniqueId();

[aandrey, 2015/01/20 14:33:35]

remove, use a Set of operationId's

[yurys, 2015/01/20 17:15:38]

Done.

-    data->m_asyncOperationCallChains.set(id, callChain.release());
+    data->m_asyncOperationCallChains.set(id, operationId);
     return id;
 }
 
 void AsyncCallTracker::traceAsyncOperationCompleted(ExecutionContext* context, int operationId)
 {
     ASSERT(context);
     ASSERT(m_debuggerAgent->trackingAsyncCalls());
     if (operationId <= 0)
         return;
     if (ExecutionContextData* data = m_executionContextDataMap.get(context))
         data->m_asyncOperationCallChains.remove(operationId);
 }
 
 void AsyncCallTracker::traceAsyncOperationCompletedCallbackStarting(ExecutionContext* context, int operationId)
 {
     traceAsyncCallbackStarting(context, operationId);
     traceAsyncOperationCompleted(context, operationId);
 }
 
 void AsyncCallTracker::traceAsyncCallbackStarting(ExecutionContext* context, int operationId)
 {
     ASSERT(context);
     ASSERT(m_debuggerAgent->trackingAsyncCalls());
     if (ExecutionContextData* data = m_executionContextDataMap.get(context))
-        setCurrentAsyncCallChain(context, operationId > 0 ? data->m_asyncOperationCallChains.get(operationId) : nullptr);
+        setCurrentAsyncCallChain(context, operationId > 0 ? data->m_asyncOperationCallChains.get(operationId) : noOperationId);
     else
-        setCurrentAsyncCallChain(context, nullptr);
+        setCurrentAsyncCallChain(context, noOperationId);
 }
 
 void AsyncCallTracker::didFireAsyncCall()
 {
     m_debuggerAgent->traceAsyncCallbackCompleted();
 }
 
-void AsyncCallTracker::setCurrentAsyncCallChain(ExecutionContext* context, PassRefPtrWillBeRawPtr<AsyncCallChain> chain)
+void AsyncCallTracker::setCurrentAsyncCallChain(ExecutionContext* context, int operationId)
 {
-    m_debuggerAgent->traceAsyncCallbackStarting(toIsolate(context), chain);
+    m_debuggerAgent->traceAsyncCallbackStarting(toIsolate(context), operationId);
 }
 
 AsyncCallTracker::ExecutionContextData* AsyncCallTracker::createContextDataIfNeeded(ExecutionContext* context)
 {
     ExecutionContextData* data = m_executionContextDataMap.get(context);
     if (!data) {
         data = m_executionContextDataMap.set(context, adoptPtrWillBeNoop(new AsyncCallTracker::ExecutionContextData(this, context)))
             .storedValue->value.get();
     }
     return data;
 }
 
 void AsyncCallTracker::trace(Visitor* visitor)
 {
 #if ENABLE(OILPAN)
     visitor->trace(m_executionContextDataMap);
     visitor->trace(m_debuggerAgent);
     visitor->trace(m_instrumentingAgents);
 #endif
     InspectorDebuggerAgent::AsyncCallTrackingListener::trace(visitor);
 }
 
 } // namespace blink