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 53 matching lines @@
     ExecutionContextData(AsyncCallTracker* tracker, ExecutionContext* executionContext)
         : ContextLifecycleObserver(executionContext)
         , m_tracker(tracker)
         , m_timerCallChains(tracker->m_debuggerAgent)
         , m_animationFrameCallChains(tracker->m_debuggerAgent)
         , m_eventCallChains(tracker->m_debuggerAgent)
         , m_xhrCallChains(tracker->m_debuggerAgent)
         , m_mutationObserverCallChains(tracker->m_debuggerAgent)
         , m_executionContextTaskCallChains(tracker->m_debuggerAgent)
         , m_asyncOperationCallChains(tracker->m_debuggerAgent)
-        , m_circularSequentialId(0)
     {
     }
 
     virtual void contextDestroyed() override
     {
         ASSERT(executionContext());
         OwnPtrWillBeRawPtr<ExecutionContextData> self = m_tracker->m_executionContextDataMap.take(executionContext());
         ASSERT_UNUSED(self, self == this);
         ContextLifecycleObserver::contextDestroyed();
         clearLifecycleContext();
         disposeCallChains();
     }
 
     void unobserve()
     {
         disposeCallChains();
         dispose();
     }
 
-    int nextAsyncOperationUniqueId()
-    {
-        do {
-            ++m_circularSequentialId;
-            if (m_circularSequentialId <= 0)
-                m_circularSequentialId = 1;
-        } while (m_asyncOperationCallChains.contains(m_circularSequentialId));
-        return m_circularSequentialId;
-    }
-
     virtual void trace(Visitor* visitor) override
     {
         visitor->trace(m_tracker);
 #if ENABLE(OILPAN)
         visitor->trace(m_timerCallChains);
         visitor->trace(m_animationFrameCallChains);
         visitor->trace(m_eventCallChains);
         visitor->trace(m_xhrCallChains);
         visitor->trace(m_mutationObserverCallChains);
         visitor->trace(m_executionContextTaskCallChains);
@@ skipping 16 matching lines @@
     void disposeCallChains()
     {
         m_timerCallChains.dispose();
         m_animationFrameCallChains.dispose();
         m_eventCallChains.dispose();
         m_xhrCallChains.dispose();
         m_mutationObserverCallChains.dispose();
         m_executionContextTaskCallChains.dispose();
         m_asyncOperationCallChains.dispose();
     }
-
-    int m_circularSequentialId;
 };
 
 static XMLHttpRequest* toXmlHttpRequest(EventTarget* eventTarget)
 {
     const AtomicString& interfaceName = eventTarget->interfaceName();
     if (interfaceName == EventTargetNames::XMLHttpRequest)
         return static_cast<XMLHttpRequest*>(eventTarget);
     if (interfaceName == EventTargetNames::XMLHttpRequestUpload)
         return static_cast<XMLHttpRequestUpload*>(eventTarget)->xmlHttpRequest();
     return nullptr;
@@ skipping 19 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)
-        return;
+    int operationId = m_debuggerAgent->traceAsyncOperationStarting(singleShot ? setTimeoutName : setIntervalName);
     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, InspectorDebuggerAgent::unknownAsyncOperationId);
     }
     return true;
 }
 
 void AsyncCallTracker::didRequestAnimationFrame(ExecutionContext* context, int callbackId)
 {
     ASSERT(context);
     ASSERT(m_debuggerAgent->trackingAsyncCalls());
-    RefPtrWillBeRawPtr<AsyncCallChain> callChain = m_debuggerAgent->traceAsyncOperationStarting(requestAnimationFrameName);
-    if (!callChain)
-        return;
+    int operationId = m_debuggerAgent->traceAsyncOperationStarting(requestAnimationFrameName);
     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, InspectorDebuggerAgent::unknownAsyncOperationId);
     }
     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)
-        return;
+    int operationId = m_debuggerAgent->traceAsyncOperationStarting(event->type());
     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, InspectorDebuggerAgent::unknownAsyncOperationId);
     }
 }
 
 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)
-        return;
+    int operationId = m_debuggerAgent->traceAsyncOperationStarting(xhrSendName);
     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, InspectorDebuggerAgent::unknownAsyncOperationId);
 }
 
 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)
-        return;
-    data->m_mutationObserverCallChains.set(observer, callChain.release());
+    int operationId = m_debuggerAgent->traceAsyncOperationStarting(enqueueMutationRecordName);
+    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, InspectorDebuggerAgent::unknownAsyncOperationId);
     }
 }
 
 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)
-        return;
+    int operationId = m_debuggerAgent->traceAsyncOperationStarting(task->taskNameForInstrumentation());
     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, InspectorDebuggerAgent::unknownAsyncOperationId);
     }
 }
 
 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)
-        return 0;
+    int operationId = m_debuggerAgent->traceAsyncOperationStarting(operationName);
     ExecutionContextData* data = createContextDataIfNeeded(context);
-    int id = data->nextAsyncOperationUniqueId();
-    data->m_asyncOperationCallChains.set(id, callChain.release());
-    return id;
+    data->m_asyncOperationCallChains.set(operationId, operationId);
+    return operationId;
 }
 
 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) : InspectorDebuggerAgent::unknownAsyncOperationId);
     else
-        setCurrentAsyncCallChain(context, nullptr);
+        setCurrentAsyncCallChain(context, InspectorDebuggerAgent::unknownAsyncOperationId);
 }
 
 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