DevTools: use async operation id instead of AsyncCallChain

Source/core/inspector/InspectorDebuggerAgent.cpp

 /*
  * Copyright (C) 2010 Apple Inc. All rights reserved.
  * 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:
  *
  * 1.  Redistributions of source code must retain the above copyright
  *     notice, this list of conditions and the following disclaimer.
@@ skipping 74 matching lines @@
 static const char skipContentScripts[] = "skipContentScripts";
 static const char skipAllPauses[] = "skipAllPauses";
 static const char skipAllPausesExpiresOnReload[] = "skipAllPausesExpiresOnReload";
 
 };
 
 static const int maxSkipStepFrameCount = 128;
 
 const char InspectorDebuggerAgent::backtraceObjectGroup[] = "backtrace";
 
+const int InspectorDebuggerAgent::unknownAsyncOperationId = 0;
+
 static String breakpointIdSuffix(InspectorDebuggerAgent::BreakpointSource source)
 {
     switch (source) {
     case InspectorDebuggerAgent::UserBreakpointSource:
         break;
     case InspectorDebuggerAgent::DebugCommandBreakpointSource:
         return ":debug";
     case InspectorDebuggerAgent::MonitorCommandBreakpointSource:
         return ":monitor";
     }
@@ skipping 18 matching lines @@
     , m_pausingOnNativeEvent(false)
     , m_inAsyncOperationForStepInto(false)
     , m_listener(nullptr)
     , m_skippedStepFrameCount(0)
     , m_recursionLevelForStepOut(0)
     , m_recursionLevelForStepFrame(0)
     , m_skipAllPauses(false)
     , m_skipContentScripts(false)
     , m_cachedSkipStackGeneration(0)
     , m_promiseTracker(PromiseTracker::create())
+    , m_lastAsyncOperationId(1)

[aandrey, 2015/01/21 08:39:45]

1 -> 0

[yurys, 2015/01/21 08:50:04]

Done.

     , m_maxAsyncCallStackDepth(0)
     , m_currentAsyncCallChain(nullptr)
     , m_nestedAsyncCallCount(0)
     , m_performingAsyncStepIn(false)
 {
     m_v8AsyncCallTracker = V8AsyncCallTracker::create(this);
 }
 
 InspectorDebuggerAgent::~InspectorDebuggerAgent()
 {
@@ skipping 911 matching lines @@
     }
     InjectedScript injectedScript = m_injectedScriptManager->injectedScriptFor(value.scriptState());
     promise = injectedScript.wrapObject(value, objectGroup ? *objectGroup : "");
 }
 
 const AsyncCallChain* InspectorDebuggerAgent::currentAsyncCallChain() const
 {
     return m_currentAsyncCallChain.get();
 }
 
-PassRefPtrWillBeRawPtr<AsyncCallChain> InspectorDebuggerAgent::traceAsyncOperationStarting(const String& description)
+int InspectorDebuggerAgent::traceAsyncOperationStarting(const String& description)
 {
     ScriptValue callFrames = scriptDebugServer().currentCallFramesForAsyncStack();
+    RefPtrWillBeRawPtr<AsyncCallChain> chain;

[aandrey, 2015/01/21 08:39:45]

= nullptr (otherwise Oilpan will complain)

[yurys, 2015/01/21 08:50:05]

Done.

     if (callFrames.isEmpty()) {
-        if (!m_currentAsyncCallChain)
-            return nullptr;
-        RefPtrWillBeRawPtr<AsyncCallChain> chain = AsyncCallChain::create(nullptr, m_currentAsyncCallChain.get(), m_maxAsyncCallStackDepth);
-        didCreateAsyncCallChain(chain.get());
-        return chain.release(); // Propagate async call stack chain.
+        if (m_currentAsyncCallChain)
+            chain = AsyncCallChain::create(nullptr, m_currentAsyncCallChain.get(), m_maxAsyncCallStackDepth);
+    } else {
+        chain = AsyncCallChain::create(adoptRefWillBeNoop(new AsyncCallStack(description, callFrames)), m_currentAsyncCallChain.get(), m_maxAsyncCallStackDepth);
     }
-    RefPtrWillBeRawPtr<AsyncCallChain> chain = AsyncCallChain::create(adoptRefWillBeNoop(new AsyncCallStack(description, callFrames)), m_currentAsyncCallChain.get(), m_maxAsyncCallStackDepth);
-    didCreateAsyncCallChain(chain.get());
-    return chain.release();
-}
-
-void InspectorDebuggerAgent::didCreateAsyncCallChain(AsyncCallChain* chain)
-{
-    if (!m_performingAsyncStepIn)
-        return;
-    if (m_inAsyncOperationForStepInto || m_asyncOperationsForStepInto.isEmpty())
-        m_asyncOperationsForStepInto.add(chain);
+    while (true) {

[aandrey, 2015/01/21 08:39:45]

nit: maybe do-while loop as it was in AsyncCallTracker?

[yurys, 2015/01/21 08:50:05]

Done.

+        ++m_lastAsyncOperationId;
+        if (m_lastAsyncOperationId <= 0)
+            m_lastAsyncOperationId = 1;
+        if (!m_asyncOperations.contains(m_lastAsyncOperationId))
+            break;
+    }
+    m_asyncOperations.set(m_lastAsyncOperationId, chain);
+    if (m_performingAsyncStepIn) {
+        if (m_inAsyncOperationForStepInto || m_asyncOperationsForStepInto.isEmpty())
+            m_asyncOperationsForStepInto.add(m_lastAsyncOperationId);
+    }
+    return m_lastAsyncOperationId;
 }
 
 void InspectorDebuggerAgent::traceAsyncCallbackCompleted()
 {
     if (!m_nestedAsyncCallCount)
         return;
     ASSERT(m_currentAsyncCallChain);
     --m_nestedAsyncCallCount;
     if (!m_nestedAsyncCallCount) {
         m_currentAsyncCallChain.clear();
         if (!m_performingAsyncStepIn)
             return;
         if (!m_inAsyncOperationForStepInto)
             return;
         m_inAsyncOperationForStepInto = false;
         m_scheduledDebuggerStep = NoStep;
         scriptDebugServer().setPauseOnNextStatement(false);
         if (m_asyncOperationsForStepInto.isEmpty())
             clearStepIntoAsync();
     }
 }
 
-void InspectorDebuggerAgent::traceAsyncCallbackStarting(v8::Isolate* isolate, PassRefPtrWillBeRawPtr<AsyncCallChain> chain)
+void InspectorDebuggerAgent::traceAsyncCallbackStarting(v8::Isolate* isolate, int operationId)
 {
+    ASSERT(operationId > 0 || operationId == unknownAsyncOperationId);
+    AsyncCallChain* chain = operationId > 0 ? m_asyncOperations.get(operationId) : nullptr;
     int recursionLevel = V8RecursionScope::recursionLevel(isolate);
     if (chain && (!recursionLevel || (recursionLevel == 1 && Microtask::performingCheckpoint(isolate)))) {
         // Current AsyncCallChain corresponds to the bottommost JS call frame.
         m_currentAsyncCallChain = chain;
         m_nestedAsyncCallCount = 1;
         if (!m_performingAsyncStepIn)
             return;
-        if (!m_asyncOperationsForStepInto.contains(m_currentAsyncCallChain.get()))
+        if (!m_asyncOperationsForStepInto.contains(operationId))
             return;
         m_inAsyncOperationForStepInto = true;
         m_scheduledDebuggerStep = StepInto;
         m_skippedStepFrameCount = 0;
         m_recursionLevelForStepFrame = 0;
         scriptDebugServer().setPauseOnNextStatement(true);
     } else {
         if (m_currentAsyncCallChain)
             ++m_nestedAsyncCallCount;
     }
 }
 
-void InspectorDebuggerAgent::traceAsyncOperationCompleted(AsyncCallChain* chain)
+void InspectorDebuggerAgent::traceAsyncOperationCompleted(int operationId)
 {
+    ASSERT(operationId > 0 || operationId == unknownAsyncOperationId);
     if (!m_performingAsyncStepIn)
         return;
-    m_asyncOperationsForStepInto.remove(chain);
+    if (operationId > 0)
+        m_asyncOperationsForStepInto.remove(operationId);
     if (!m_inAsyncOperationForStepInto && m_asyncOperationsForStepInto.isEmpty())
         clearStepIntoAsync();
 }
 
 void InspectorDebuggerAgent::resetAsyncCallTracker()
 {
     m_currentAsyncCallChain.clear();
     m_nestedAsyncCallCount = 0;
     for (auto& listener: m_asyncCallTrackingListeners)
         listener->resetAsyncCallChains();
+    m_asyncOperations.clear();
 }
 
 void InspectorDebuggerAgent::scriptExecutionBlockedByCSP(const String& directiveText)
 {
     if (scriptDebugServer().pauseOnExceptionsState() != ScriptDebugServer::DontPauseOnExceptions) {
         RefPtr<JSONObject> directive = JSONObject::create();
         directive->setString("directiveText", directiveText);
         breakProgram(InspectorFrontend::Debugger::Reason::CSPViolation, directive.release());
     }
 }
@@ skipping 384 matching lines @@
     visitor->trace(m_v8AsyncCallTracker);
     visitor->trace(m_promiseTracker);
     visitor->trace(m_asyncOperationsForStepInto);
     visitor->trace(m_currentAsyncCallChain);
     visitor->trace(m_asyncCallTrackingListeners);
 #endif
     InspectorBaseAgent::trace(visitor);
 }
 
 } // namespace blink