Support merged Dart-JS callstacks

Source/bindings/dart/DartScriptDebugServer.cpp

 /*
  * Copyright (C) 2014 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 443 matching lines @@
             return it->value;
     }
     return "";
 }
 
 DartScriptDebugServer::DartScriptDebugServer()
     : m_pauseOnExceptionState(DontPauseOnExceptions)
     , m_breakpointsActivated(true)
     , m_runningNestedMessageLoop(false)
     , m_executionState(0)
+    , m_isPaused(false)
     , m_pausedIsolate(0)
     , m_pausedPage(0)
     , m_clientMessageLoop(0)
     , m_nextPageId(1)
 {
 }
 
 DartScriptDebugServer::~DartScriptDebugServer()
 {
     for (DebugDataMap::iterator it = m_pageIdToDebugDataMap.begin(); it != m_pageIdToDebugDataMap.end(); ++it)
@@ skipping 152 matching lines @@
         return;
 
     // FIXME: determine if this method needs to be implemented for Dart.
 }
 
 void DartScriptDebugServer::continueProgram()
 {
     if (isPaused())
         quitMessageLoopOnPause();
     m_executionState = 0;
+    m_isPaused = false;
     m_pausedIsolate = 0;
 }
 
 void DartScriptDebugServer::stepIntoStatement()
 {
     ASSERT(isPaused());
     Dart_SetStepInto();
     continueProgram();
 }
 
@@ skipping 36 matching lines @@
 int DartScriptDebugServer::frameCount()
 {
     ASSERT(isPaused());
     intptr_t length = 0;
     Dart_StackTraceLength(m_executionState, &length);
     return length;
 }
 
 StackTrace DartScriptDebugServer::currentCallFrames()
 {
-    return StackTrace(m_executionState);
+    return StackTrace(m_peer->currentCallFramesForVm(), currentCallFramesForVm());
+}
+
+StackTrace DartScriptDebugServer::currentCallFramesForVm()
+{
+    if (!m_executionState && Dart_CurrentIsolate()) {
+        ASSERT(!m_isPaused);
+        // We are not paused at a Dart breakpoint but there may be Dart frames
+        // on the call stack.
+        DartDOMData* dartDOMData = DartDOMData::current();

[vsm, 2014/08/13 14:26:45]

Will this ever be NULL if Dart_CurrentIsolate is not NULL?

[Jacob, 2014/08/13 21:36:15]

It won't be null. Removed that check. There are plenty of other places where we
rely on valid dartDOMData.  when we support non-dom isolates perhaps we will
need to change that.

+        if (!dartDOMData || dartDOMData->stackTraceTimestampTracker()->recursionLevel() == 0)
+            return StackTrace();
+
+        Dart_Handle ALLOW_UNUSED result = Dart_GetStackTrace(&m_executionState);
+        ASSERT(!Dart_IsError(result));
+        if (!m_executionState)
+            return StackTrace();
+        intptr_t length = 0;
+        Dart_StackTraceLength(m_executionState, &length);
+        ASSERT(length);

[vsm, 2014/08/13 14:26:45]

nit: you could drop an ASSERT_NOT_REACHED() into the if right below instead.

[Jacob, 2014/08/13 21:36:15]

Done.

+        if (!length) {
+            m_executionState = 0;
+            return StackTrace();
+        }
+    }
+    return StackTrace(m_executionState, DartUtilities::currentScriptState());
 }
 
 StackTrace DartScriptDebugServer::currentCallFramesForAsyncStack()
 {
     // FIXMEDART: implement propertly. These are the regular not Async call frames.
-    return StackTrace(m_executionState);
+    return StackTrace(m_executionState, DartUtilities::currentScriptState());
 }
 
 bool DartScriptDebugServer::isPaused()
 {
-    return !!m_executionState;
+    return m_isPaused;
 }
 
 void DartScriptDebugServer::clearCompiledScripts()
 {
     // FIXMEDART: is this meaningful for Dart?
     // Currently tracking what scripts have been compiled is handled by a
     // different class.
 }
 
 void DartScriptDebugServer::setPreprocessorSource(const String& preprocessorSource)
@@ skipping 240 matching lines @@
 
 DartPageDebug* DartScriptDebugServer::lookupPageDebugForCurrentIsolate()
 {
     Page* page = DartUtilities::domWindowForCurrentIsolate()->document()->page();
     return lookupPageDebug(page);
 }
 
 void DartScriptDebugServer::handleProgramBreak(Dart_Isolate isolate, Dart_StackTrace stackTrace, intptr_t dartBreakpointId, Dart_Handle exception, const Dart_CodeLocation& location)
 {
     ASSERT(isolate == Dart_CurrentIsolate());
+
     // Don't allow nested breaks.
     if (isAnyScriptPaused())
         return;
 
     DartPageDebug* pageDebug = lookupPageDebugForCurrentIsolate();
     if (!pageDebug)
         return;
     ScriptDebugListener* listener = pageDebug->listener();
 
     if (!listener)
         return;
 
     // Required as some Dart code executes outside of a valid V8 scope when
     // the program is paused due to interrupting a Dart isolate.
     V8Scope v8Scope(DartDOMData::current());
 
     Vector<String> breakpointIds;
     breakpointIds.append(pageDebug->lookupBreakpointId(dartBreakpointId));
     m_executionState = stackTrace;
+    m_isPaused = true;
     m_pausedIsolate = isolate;
     DartScriptState* scriptState = DartUtilities::currentScriptState();
     ScriptDebugListener::SkipPauseRequest result = listener->didPause(scriptState, currentCallFrames(), exception ? DartUtilities::dartToScriptValue(exception) : ScriptValue(), breakpointIds);
 
     if (result == ScriptDebugListener::NoSkip) {
         m_runningNestedMessageLoop = true;
         runMessageLoopOnPause(isolate);
         m_runningNestedMessageLoop = false;
     }
     if (result == ScriptDebugListener::StepInto) {
@@ skipping 161 matching lines @@
 }
 
 void UnifiedScriptDebugServer::setPauseOnExceptionsState(ScriptDebugServer::PauseOnExceptionsState pauseOnExceptionsState)
 {
     m_dart->setPauseOnExceptionsState(pauseOnExceptionsState);
     m_v8->setPauseOnExceptionsState(pauseOnExceptionsState);
 }
 
 void UnifiedScriptDebugServer::setPauseOnNextStatement(bool pause)
 {
-    if (isPaused()) {
+    if (isPaused())
         return;
-    }
     m_v8->setPauseOnNextStatement(pause);
     m_dart->setPauseOnNextStatement(pause);
 }
 
 bool UnifiedScriptDebugServer::canBreakProgram()
 {
     return m_v8->canBreakProgram() || m_dart->canBreakProgram();
 }
 
 void UnifiedScriptDebugServer::breakProgram()
@@ skipping 56 matching lines @@
 int UnifiedScriptDebugServer::frameCount()
 {
     // FIXMEDART: Implement cases where both JS and Dart are paused correctly.
     if (m_v8->isPaused()) {
         return m_v8->frameCount();
     }
     return m_dart->frameCount();
 }
 
 
+StackTrace UnifiedScriptDebugServer::currentCallFramesForVm()
+{
+    return currentCallFrames();
+}
+
 StackTrace UnifiedScriptDebugServer::currentCallFrames()
 {
-    // FIXMEDART: we need to figure out how to interleave stack traces where possible.
-    StackTrace v8StackTrace = m_v8->currentCallFrames();
-    if (!v8StackTrace.isNull())
-        return v8StackTrace;
-    return m_dart->currentCallFrames();
+    return StackTrace(m_v8->currentCallFramesForVm(), m_dart->currentCallFramesForVm());
 }
 
 StackTrace UnifiedScriptDebugServer::currentCallFramesForAsyncStack()
 {
-    // FIXMEDART: we need to figure out how to interleave stack traces where possible.
+    // FIXMEDART: figure out how to interleave async stack traces once we
+    // actually support async stack traces properly for Dart.
     StackTrace v8StackTrace = m_v8->currentCallFramesForAsyncStack();
     if (!v8StackTrace.isNull())
         return v8StackTrace;
     return m_dart->currentCallFramesForAsyncStack();
 }
 
 
 bool UnifiedScriptDebugServer::isPaused()
 {
     return m_v8->isPaused() || m_dart->isPaused();
@@ skipping 71 matching lines @@
     MessageQueue<ScriptDebugServer::Task>& tasks = debugTaskQueue();
     tasks.append(task);
     // The first VM interrupt method triggered will drain the task queue.
     // FIXMEDART: refactor the V8 code to have an interruptAndRunAllTasks
     // method.
     PageScriptDebugServer::interruptAndRun(adoptPtr(new DrainQueueTask(&tasks)));
     DartScriptDebugServer::interruptAndRunAllTasks();
 }
 
 }