Debugger break on TypeError, AssertionError

runtime/bin/dbg_connection.cc

 // Copyright (c) 2012, 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.
 
 #include "bin/dbg_connection.h"
 #include "bin/dartutils.h"
 #include "bin/socket.h"
 #include "bin/thread.h"
 #include "bin/utils.h"
 
@@ skipping 391 matching lines @@
     ASSERT(Dart_IsString(lib_url));
     msg.Printf("%s{\"id\":%d,\"url\":", (i == 0) ? "" : ", ", lib_id);
     FormatEncodedString(&msg, lib_url);
     msg.Printf("}");
   }
   msg.Printf("]}}");
   SendMsg(&msg);
 }
 
 
-static void FormatField(dart::TextBuffer* buf,
-                        Dart_Handle object_name,
-                        Dart_Handle object) {
-  ASSERT(Dart_IsString(object_name));
-  buf->Printf("{\"name\":\"%s\",", GetStringChars(object_name));
+static void FormatRemoteObj(dart::TextBuffer* buf, Dart_Handle object) {
   intptr_t obj_id = Dart_CacheObject(object);
   ASSERT(obj_id >= 0);
-  buf->Printf("\"value\":{\"objectId\":%d,", obj_id);
+  buf->Printf("{\"objectId\":%d,", obj_id);
   const char* kind = "object";
   if (Dart_IsInteger(object)) {
     kind = "integer";
   } else if (Dart_IsString(object)) {
     kind = "string";
   } else if (Dart_IsBoolean(object)) {
     kind = "boolean";
   }
   buf->Printf("\"kind\":\"%s\",", kind);
   buf->Printf("\"text\":");
   Dart_Handle text;
   if (Dart_IsNull(object)) {
     text = Dart_Null();
   } else {
     text = Dart_ToString(object);
   }
   if (Dart_IsNull(text)) {
     buf->Printf("null");
   } else if (Dart_IsError(text)) {
     FormatErrorMsg(buf, text);
   } else {
     FormatEncodedString(buf, text);
   }
-  buf->Printf("}}");
+  buf->Printf("}");
+}
+
+
+static void FormatField(dart::TextBuffer* buf,
+                        Dart_Handle object_name,
+                        Dart_Handle object) {
+  ASSERT(Dart_IsString(object_name));
+  buf->Printf("{\"name\":\"%s\",", GetStringChars(object_name));
+  buf->Printf("\"value\":");
+  FormatRemoteObj(buf, object);
+  buf->Printf("}");
 }
 
 
 static void FormatFieldList(dart::TextBuffer* buf,
                             Dart_Handle obj_list) {
   ASSERT(Dart_IsList(obj_list));
   intptr_t list_length = 0;
   Dart_Handle res = Dart_ListLength(obj_list, &list_length);
   ASSERT_NOT_ERROR(res);
   ASSERT(list_length % 2 == 0);
@@ skipping 287 matching lines @@
     }
     if (!is_handled) {
       printf("unrecognized command received: '%s'\n", msgbuf_->buf());
       HandleUnknownMsg(msgbuf_->buf());
       msgbuf_->PopMessage();
     }
   }
 }
 
 
-void DebuggerConnectionHandler::SendBreakpointEvent(Dart_Breakpoint bpt,
-                                                    Dart_StackTrace trace) {
+void DebuggerConnectionHandler::WaitForConnection() {
+  MonitorLocker ml(&is_connected_);
+  while (!IsConnected()) {
+    printf("Waiting for debugger connection...\n");
+    dart::Monitor::WaitResult res = ml.Wait(dart::Monitor::kNoTimeout);
+    ASSERT(res == dart::Monitor::kNotified);
+  }
+}
+
+
+void DebuggerConnectionHandler::SendBreakpointEvent(Dart_StackTrace trace) {
   dart::TextBuffer msg(128);
   msg.Printf("{ \"event\": \"paused\", \"params\": { ");
+  msg.Printf("\"reason\": \"breakpoint\", ");
   FormatCallFrames(&msg, trace);
   msg.Printf("}}");
   SendMsg(&msg);
 }
 
 
 void DebuggerConnectionHandler::BreakpointHandler(Dart_Breakpoint bpt,
                                                   Dart_StackTrace trace) {
-  {
-    MonitorLocker ml(&is_connected_);
-    while (!IsConnected()) {
-      printf("Waiting for debugger connection...\n");
-      dart::Monitor::WaitResult res = ml.Wait(dart::Monitor::kNoTimeout);
-      ASSERT(res == dart::Monitor::kNotified);
-    }
-  }
+  WaitForConnection();
   Dart_EnterScope();
   SendQueuedMsgs();
-  SendBreakpointEvent(bpt, trace);
+  SendBreakpointEvent(trace);
   HandleMessages();
   if (!msgbuf_->Alive()) {
     CloseDbgConnection();
+  }
+  Dart_ExitScope();
+}
+
+
+void DebuggerConnectionHandler::SendExceptionEvent(
+                                    Dart_Handle exception,
+                                    Dart_StackTrace stack_trace) {
+  intptr_t exception_id = Dart_CacheObject(exception);
+  ASSERT(exception_id >= 0);
+  dart::TextBuffer msg(128);
+  msg.Printf("{ \"event\": \"paused\", \"params\": {");
+  msg.Printf("\"reason\": \"exception\", ");
+  msg.Printf("\"exception\":");
+  FormatRemoteObj(&msg, exception);
+  msg.Printf(", ");
+  FormatCallFrames(&msg, stack_trace);
+  msg.Printf("}}");
+  SendMsg(&msg);
+}
+
+
+void DebuggerConnectionHandler::ExceptionThrownHandler(
+                                    Dart_Handle exception,
+                                    Dart_StackTrace stack_trace) {
+  WaitForConnection();
+  Dart_EnterScope();
+  SendQueuedMsgs();
+  SendExceptionEvent(exception, stack_trace);
+  HandleMessages();
+  if (!msgbuf_->Alive()) {
+    CloseDbgConnection();
   }
   Dart_ExitScope();
 }
 
 
 void DebuggerConnectionHandler::BptResolvedHandler(intptr_t bp_id,
                                                    Dart_Handle url,
                                                    intptr_t line_number) {
   Dart_EnterScope();
   dart::TextBuffer msg(128);
@@ skipping 35 matching lines @@
   if (handler_started_) {
     return;
   }
   ASSERT(listener_fd_ == -1);
   listener_fd_ = ServerSocket::CreateBindListen(address, port_number, 1);
 
   handler_started_ = true;
   DebuggerConnectionImpl::StartHandler(port_number);
   Dart_SetBreakpointHandler(BreakpointHandler);
   Dart_SetBreakpointResolvedHandler(BptResolvedHandler);
+  Dart_SetExceptionThrownHandler(ExceptionThrownHandler);
 }
 
 
 DebuggerConnectionHandler::~DebuggerConnectionHandler() {
   CloseDbgConnection();
 }