Sane asynchronous debugging and stack traces

runtime/observatory/lib/src/elements/debugger.dart

 // Copyright (c) 2014, the Dart project authors.  Please see the AUTHORS file
 // for details. All rights reserved. Use of this source code is governed by a
 // BSD-style license that can be found in the LICENSE file.
 
 library debugger_page_element;
 
 import 'dart:async';
 import 'dart:svg';
 import 'dart:html';
 import 'dart:math';
@@ skipping 586 matching lines @@
     'break-on-exception': [
       _boeValues,
       _setBreakOnException,
       (debugger, _) => debugger.breakOnException
     ],
     'up-is-down': [
       _boolValues,
       _setUpIsDown,
       (debugger, _) => debugger.upIsDown
     ],
+    'sane-async-stacks': [
+      _boolValues,
+      _setSaneAsyncStacks,
+      (debugger, _) => debugger.saneAsyncStacks
+    ]
   };
 
   static Future _setBreakOnException(debugger, name, value) async {
     var result = await debugger.isolate.setExceptionPauseMode(value);
     if (result.isError) {
       debugger.console.print(result.toString());
     } else {
       // Printing will occur elsewhere.
       debugger.breakOnException = value;
     }
   }
 
   static Future _setUpIsDown(debugger, name, value) async {
     if (value == 'true') {
       debugger.upIsDown = true;
     } else {
       debugger.upIsDown = false;
     }
     debugger.console.print('${name} = ${value}');
   }
 
+  static Future _setSaneAsyncStacks(debugger, name, value) async {
+    if (value == 'true') {
+      debugger.saneAsyncStacks = true;
+    } else {
+      debugger.saneAsyncStacks = false;
+    }
+    debugger.refreshStack();
+    debugger.console.print('${name} = ${value}');
+  }
+
   Future run(List<String> args) async {
     if (args.length == 0) {
       for (var name in _options.keys) {
         var getHandler = _options[name][2];
         var value = await getHandler(debugger, name);
         debugger.console.print("${name} = ${value}");
       }
     } else if (args.length == 1) {
       var name = args[0].trim();
       var optionInfo = _options[name];
@@ skipping 736 matching lines @@
   int _currentFrame = null;
 
   bool get upIsDown => _upIsDown;
   void set upIsDown(bool value) {
     settings.set('up-is-down', value);
     _upIsDown = value;
   }
 
   bool _upIsDown;
 
+  bool get saneAsyncStacks => _saneAsyncStacks;
+  void set saneAsyncStacks(bool value) {
+    settings.set('sane-async-stacks', value);
+    _saneAsyncStacks = value;
+  }
+
+  bool _saneAsyncStacks;
+
+  static const String kAsyncStackFrames = 'asyncFrames';
+  static const String kStackFrames = 'frames';
+
   void upFrame(int count) {
     if (_upIsDown) {
       currentFrame += count;
     } else {
       currentFrame -= count;
     }
   }
 
   void downFrame(int count) {
     if (_upIsDown) {
       currentFrame -= count;
     } else {
       currentFrame += count;
     }
   }
 
-  int get stackDepth => stack['frames'].length;
+  int get stackDepth {
+    if (saneAsyncStacks) {
+      return stack[kAsyncStackFrames].length;
+    } else {
+      return stack[kStackFrames].length;
+    }
+  }
+
+  List get stackFrames {
+    if (saneAsyncStacks) {
+      return stack[kAsyncStackFrames] ?? [];
+    } else {
+      return stack[kStackFrames] ?? [];
+    }
+  }
 
   static final _history = [''];
 
   ObservatoryDebugger(this.isolate) {
     _loadSettings();
     cmd = new RootCommand([
       new AsyncNextCommand(this),
       new BreakCommand(this),
       new ClearCommand(this),
       new ClsCommand(this),
@@ skipping 16 matching lines @@
       new StepCommand(this),
       new SyncNextCommand(this),
       new UpCommand(this),
       new VmCommand(this),
     ], _history);
     _consolePrinter = new _ConsoleStreamPrinter(this);
   }
 
   void _loadSettings() {
     _upIsDown = settings.get('up-is-down');
+    _saneAsyncStacks = settings.get('sane-async-stacks') ?? true;
+    print('saneAsyncStacks -> $_saneAsyncStacks');
   }
 
   S.VM get vm => page.app.vm;
 
   void init() {
     console.printBold('Debugging isolate isolate ${isolate.number} '
         '\'${isolate.name}\' ');
     console.printBold('Type \'h\' for help');
     // Wait a bit and if polymer still hasn't set up the isolate,
     // report this to the user.
@@ skipping 61 matching lines @@
 
   Future<S.ServiceMap> _refreshStack(M.DebugEvent pauseEvent) {
     return isolate.getStack().then((result) {
       if (result.isSentinel) {
         // The isolate has gone away.  The IsolateExit event will
         // clear the isolate for the debugger page.
         return;
       }
       stack = result;
       stackElement.updateStack(stack, pauseEvent);
-      if (stack['frames'].length > 0) {
+      List frames =
+          saneAsyncStacks ? stack[kAsyncStackFrames] : stack[kStackFrames];
+      if (frames.length > 0) {
         currentFrame = 0;
       } else {
         currentFrame = null;
       }
       input.focus();
     });
   }
 
   void reportStatus() {
     flushStdio();
@@ skipping 49 matching lines @@
       console.print("Paused at isolate start "
           "(type 'continue' [F7] or 'step' [F10] to start the isolate')");
     } else if (event is M.PauseExitEvent) {
       console.print("Paused at isolate exit "
           "(type 'continue' or [F7] to exit the isolate')");
       _reportIsolateError(isolate, event);
     } else if (event is M.PauseExceptionEvent) {
       console.print("Paused at an unhandled exception "
           "(type 'continue' or [F7] to exit the isolate')");
       _reportIsolateError(isolate, event);
-    } else if (stack['frames'].length > 0) {
-      S.Frame frame = stack['frames'][0];
+    } else if (stackFrames.length > 0) {
+      S.Frame frame = stackFrames[0];
       var script = frame.location.script;
       script.load().then((_) {
         var line = script.tokenToLine(frame.location.tokenPos);
         var col = script.tokenToCol(frame.location.tokenPos);
         if ((event is M.PauseBreakpointEvent) && (event.breakpoint != null)) {
           var bpId = event.breakpoint.number;
           console.print('Paused at breakpoint ${bpId} at '
               '${script.name}:${line}:${col}');
         } else if ((event is M.PauseExceptionEvent) &&
             (event.exception != null)) {
@@ skipping 644 matching lines @@
     li.classes.add('list-group-item');
     li.children.insert(0, messageElement);
 
     messageList.add(li);
   }
 
   ObservatoryApplication get app => ObservatoryApplication.app;
 
   void updateStackFrames(S.ServiceMap newStack) {
     List frameElements = _frameList.children;
-    List newFrames = newStack['frames'];
+    List newFrames = _debugger.saneAsyncStacks ?
+        newStack[ObservatoryDebugger.kAsyncStackFrames] :
+        newStack[ObservatoryDebugger.kStackFrames];
 
     // Remove any frames whose functions don't match, starting from
     // bottom of stack.
     int oldPos = frameElements.length - 1;
     int newPos = newFrames.length - 1;
     while (oldPos >= 0 && newPos >= 0) {
       if (!frameElements[oldPos].children[0].matchFrame(newFrames[newPos])) {
         // The rest of the frame elements no longer match.  Remove them.
         for (int i = 0; i <= oldPos; i++) {
           // NOTE(turnidge): removeRange is missing, sadly.
@@ skipping 107 matching lines @@
 
   // Is this the current frame?
   bool _current = false;
 
   // Has this frame been pinned open?
   bool _pinned = false;
 
   bool _expanded = false;
 
   void setCurrent(bool value) {
-    _frame.function.load().then((func) {
+    Future load =
+        (_frame.function != null) ?
+        _frame.function.load() :
+        new Future.value(null);
+    load.then((func) {
       _current = value;
       if (_current) {
         _expand();
         scrollIntoView();
       } else {
         if (_pinned) {
           _expand();
         } else {
           _unexpand();
         }
@@ skipping 32 matching lines @@
     if (_pinned) {
       classes.add('shadow');
     } else {
       classes.remove('shadow');
     }
     if (_current) {
       classes.add('current');
     } else {
       classes.remove('current');
     }
+    if (_frame.kind == M.FrameKind.marker) {
+      final content = <Element>[
+        new SpanElement()..children = _createMarkerHeader(_frame.marker)
+      ];
+      children = content;
+      return;
+    }
     ButtonElement expandButton;
     final content = <Element>[
       expandButton = new ButtonElement()
         ..children = _createHeader()
         ..onClick.listen((e) async {
           if (e.target is AnchorElement) {
             return;
           }
           expandButton.disabled = true;
           await _toggleExpand();
@@ skipping 82 matching lines @@
                     collapseButton.disabled = false;
                   })
                   ..children = [iconExpandLess.clone(true)]
               ]
           ]
       ]);
     }
     children = content;
   }
 
+  List<Element> _createMarkerHeader(String marker) {
+    final content = [
+      new DivElement()
+        ..classes = ['frameSummaryText']
+        ..children = [
+          new DivElement()
+            ..classes = ['frameId']
+            ..text = 'Frame ${_frame.index}',
+          new SpanElement()..text = '$marker',
+        ]
+    ];
+    return [
+      new DivElement()
+        ..classes = ['frameSummary']
+        ..children = content
+    ];
+  }
+
   List<Element> _createHeader() {
     final content = [
       new DivElement()
         ..classes = ['frameSummaryText']
         ..children = [
           new DivElement()
             ..classes = ['frameId']
             ..text = 'Frame ${_frame.index}',
           new SpanElement()
             ..children = _frame.function == null
@@ skipping 24 matching lines @@
         ..classes = ['frameSummary']
         ..children = content
     ];
   }
 
   String makeExpandKey(String key) {
     return '${_frame.function.qualifiedName}/${key}';
   }
 
   bool matchFrame(S.Frame newFrame) {
+    if (newFrame.function == null) {
+      return frame.function == null;
+    }
     return (newFrame.function.id == _frame.function.id &&
             newFrame.location.script.id ==
             frame.location.script.id);
   }
 
   void updateFrame(S.Frame newFrame) {
     assert(matchFrame(newFrame));
     _frame = newFrame;
   }
 
@@ skipping 666 matching lines @@
   ..setAttribute('height', '24')
   ..children = [
     new PathElement()
       ..setAttribute(
           'd',
           'M11 17h2v-6h-2v6zm1-15C6.48 2 2 6.48 2 12s4.48 10 '
           '10 10 10-4.48 10-10S17.52 2 12 2zm0 18c-4.41 '
           '0-8-3.59-8-8s3.59-8 8-8 8 3.59 8 8-3.59 8-8 8zM11 '
           '9h2V7h-2v2z')
   ];