[inspector] introduced debug::SetAsyncTaskListener

src/inspector/v8-debugger.cc

 // Copyright 2016 the V8 project authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "src/inspector/v8-debugger.h"
 
 #include "src/inspector/debugger-script.h"
 #include "src/inspector/inspected-context.h"
 #include "src/inspector/protocol/Protocol.h"
 #include "src/inspector/script-breakpoint.h"
@@ skipping 52 matching lines @@
       m_wasmTranslation(isolate) {}
 
 V8Debugger::~V8Debugger() {}
 
 void V8Debugger::enable() {
   if (m_enableCount++) return;
   DCHECK(!enabled());
   v8::HandleScope scope(m_isolate);
   v8::debug::SetDebugEventListener(m_isolate, &V8Debugger::v8DebugEventCallback,
                                    v8::External::New(m_isolate, this));
+  v8::debug::SetAsyncTaskListener(m_isolate, &V8Debugger::v8AsyncTaskListener,
+                                  this);
   m_debuggerContext.Reset(m_isolate, v8::debug::GetDebugContext(m_isolate));
   v8::debug::ChangeBreakOnException(m_isolate, v8::debug::NoBreakOnException);
   m_pauseOnExceptionsState = v8::debug::NoBreakOnException;
   compileDebuggerScript();
 }
 
 void V8Debugger::disable() {
   if (--m_enableCount) return;
   DCHECK(enabled());
   clearBreakpoints();
   m_debuggerScript.Reset();
   m_debuggerContext.Reset();
   allAsyncTasksCanceled();
   m_wasmTranslation.Clear();
   v8::debug::SetDebugEventListener(m_isolate, nullptr);
+  v8::debug::SetAsyncTaskListener(m_isolate, nullptr, nullptr);
 }
 
 bool V8Debugger::enabled() const { return !m_debuggerScript.IsEmpty(); }
 
 void V8Debugger::getCompiledScripts(
     int contextGroupId,
     std::vector<std::unique_ptr<V8DebuggerScript>>& result) {
   v8::HandleScope scope(m_isolate);
   v8::PersistentValueVector<v8::debug::Script> scripts(m_isolate);
   v8::debug::GetLoadedScripts(m_isolate, scripts);
@@ skipping 428 matching lines @@
       ->Call(m_isolate->GetCurrentContext(), object, 0, nullptr)
       .ToLocalChecked();
 }
 
 void V8Debugger::handleV8DebugEvent(
     const v8::debug::EventDetails& eventDetails) {
   if (!enabled()) return;
   v8::HandleScope scope(m_isolate);
 
   v8::DebugEvent event = eventDetails.GetEvent();
-  if (event != v8::AsyncTaskEvent && event != v8::Break &&
-      event != v8::Exception && event != v8::AfterCompile &&
-      event != v8::CompileError)
+  if (event != v8::Break && event != v8::Exception &&
+      event != v8::AfterCompile && event != v8::CompileError)
     return;
 
-  if (event == v8::AsyncTaskEvent) {
-    handleV8AsyncTaskEvent(eventDetails.GetEventData());
-    return;
-  }
-
   v8::Local<v8::Context> eventContext = eventDetails.GetEventContext();
   DCHECK(!eventContext.IsEmpty());
   V8DebuggerAgentImpl* agent = m_inspector->enabledDebuggerAgentForGroup(
       m_inspector->contextGroupId(eventContext));
   if (!agent) return;
 
   if (event == v8::AfterCompile || event == v8::CompileError) {
     v8::Context::Scope contextScope(debuggerContext());
     // Determine if the script is a wasm script.
     v8::Local<v8::Value> scriptMirror =
@@ skipping 33 matching lines @@
     v8::Local<v8::Value> hitBreakpoints;
     if (!callDebuggerMethod("getBreakpointNumbers", 1, argv)
              .ToLocal(&hitBreakpoints))
       return;
     DCHECK(hitBreakpoints->IsArray());
     handleProgramBreak(eventContext, eventDetails.GetExecutionState(),
                        v8::Local<v8::Value>(), hitBreakpoints.As<v8::Array>());
   }
 }
 
-void V8Debugger::handleV8AsyncTaskEvent(v8::Local<v8::Object> eventData) {
-  if (!m_maxAsyncCallStackDepth) return;
+void V8Debugger::v8AsyncTaskListener(v8::debug::PromiseDebugActionType type,
+                                     int id, void* data) {
+  V8Debugger* debugger = static_cast<V8Debugger*>(data);
 
-  // TODO(kozyatinskiy): remove usage of current context as soon as async event
-  // is migrated to pure C++ API.
-  v8::debug::PromiseDebugActionType type =
-      static_cast<v8::debug::PromiseDebugActionType>(
-          eventData
-              ->Get(m_isolate->GetCurrentContext(),
-                    toV8StringInternalized(m_isolate, "type_"))
-              .ToLocalChecked()
-              ->ToInteger(m_isolate->GetCurrentContext())
-              .ToLocalChecked()
-              ->Value());
-  String16 name = toProtocolStringWithTypeCheck(
-      eventData
-          ->Get(m_isolate->GetCurrentContext(),
-                toV8StringInternalized(m_isolate, "name_"))
-          .ToLocalChecked());
-  int id = static_cast<int>(eventData
-                                ->Get(m_isolate->GetCurrentContext(),
-                                      toV8StringInternalized(m_isolate, "id_"))
-                                .ToLocalChecked()
-                                ->ToInteger(m_isolate->GetCurrentContext())
-                                .ToLocalChecked()
-                                ->Value());
   // Async task events from Promises are given misaligned pointers to prevent
   // from overlapping with other Blink task identifiers. There is a single
   // namespace of such ids, managed by src/js/promise.js.
   void* ptr = reinterpret_cast<void*>(id * 2 + 1);
   switch (type) {
-    case v8::debug::kDebugEnqueueRecurring:
-      asyncTaskScheduled(name, ptr, true);
+    case v8::debug::kDebugEnqueueAsyncFunction:

[jgruber, 2017/01/13 16:38:38]

OTOH, if it's too messy with splitting out promises from this CL, I'm fine with
keeping them together.

[kozy, 2017/01/13 17:05:08]

extracted :)

+      debugger->asyncTaskScheduled("async function", ptr, true);
       break;
-    case v8::debug::kDebugCancel:
-      asyncTaskCanceled(ptr);
+    case v8::debug::kDebugEnqueuePromiseResolve:
+      debugger->asyncTaskScheduled("Promise.resolve", ptr, true);
+      break;
+    case v8::debug::kDebugEnqueuePromiseReject:
+      debugger->asyncTaskScheduled("Promise.reject", ptr, true);
+      break;
+    case v8::debug::kDebugEnqueuePromiseResolveThenableJob:
+      debugger->asyncTaskScheduled("PromiseResolveThenableJob", ptr, true);
+      break;
+    case v8::debug::kDebugPromiseCollected:
+      debugger->asyncTaskCanceled(ptr);
       break;
     case v8::debug::kDebugWillHandle:
-      asyncTaskStarted(ptr);
+      debugger->asyncTaskStarted(ptr);
       break;
     case v8::debug::kDebugDidHandle:
-      asyncTaskFinished(ptr);
+      debugger->asyncTaskFinished(ptr);
       break;
   }
 }
 
 V8StackTraceImpl* V8Debugger::currentAsyncCallChain() {
   if (!m_currentStacks.size()) return nullptr;
   return m_currentStacks.back().get();
 }
 
 void V8Debugger::compileDebuggerScript() {
@@ skipping 359 matching lines @@
 
   size_t stackSize =
       fullStack ? V8StackTraceImpl::maxCallStackSizeToCapture : 1;
   if (m_inspector->enabledRuntimeAgentForGroup(contextGroupId))
     stackSize = V8StackTraceImpl::maxCallStackSizeToCapture;
 
   return V8StackTraceImpl::capture(this, contextGroupId, stackSize);
 }
 
 }  // namespace v8_inspector