Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(384)

Side by Side Diff: runtime/vm/isolate.cc

Issue 2172683003: Include an empty breakpoints list on the Isolate response when the debugger is disabled. (Closed) Base URL: git@github.com:dart-lang/sdk.git@master
Patch Set: Created 4 years, 5 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
« no previous file with comments | « no previous file | no next file » | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright (c) 2013, the Dart project authors. Please see the AUTHORS file 1 // Copyright (c) 2013, the Dart project authors. Please see the AUTHORS file
2 // for details. All rights reserved. Use of this source code is governed by a 2 // for details. All rights reserved. Use of this source code is governed by a
3 // BSD-style license that can be found in the LICENSE file. 3 // BSD-style license that can be found in the LICENSE file.
4 4
5 #include "vm/isolate.h" 5 #include "vm/isolate.h"
6 6
7 #include "include/dart_api.h" 7 #include "include/dart_api.h"
8 #include "include/dart_native_api.h" 8 #include "include/dart_native_api.h"
9 #include "platform/assert.h" 9 #include "platform/assert.h"
10 #include "platform/text_buffer.h" 10 #include "platform/text_buffer.h"
(...skipping 1978 matching lines...) Expand 10 before | Expand all | Expand 10 after
1989 Library& lib = Library::Handle(); 1989 Library& lib = Library::Handle();
1990 1990
1991 JSONArray lib_array(&jsobj, "libraries"); 1991 JSONArray lib_array(&jsobj, "libraries");
1992 for (intptr_t i = 0; i < num_libs; i++) { 1992 for (intptr_t i = 0; i < num_libs; i++) {
1993 lib ^= libs.At(i); 1993 lib ^= libs.At(i);
1994 ASSERT(!lib.IsNull()); 1994 ASSERT(!lib.IsNull());
1995 lib_array.AddValue(lib); 1995 lib_array.AddValue(lib);
1996 } 1996 }
1997 } 1997 }
1998 1998
1999 {
2000 JSONArray breakpoints(&jsobj, "breakpoints");
2001 if (debugger() != NULL) {
2002 debugger()->PrintBreakpointsToJSONArray(&breakpoints);
2003 }
2004 }
2005
1999 if (debugger() != NULL) { 2006 if (debugger() != NULL) {
2000 { 2007 JSONObject jssettings(&jsobj, "_debuggerSettings");
2001 JSONArray breakpoints(&jsobj, "breakpoints"); 2008 debugger()->PrintSettingsToJSONObject(&jssettings);
2002 debugger()->PrintBreakpointsToJSONArray(&breakpoints);
2003 }
2004
2005 {
2006 JSONObject jssettings(&jsobj, "_debuggerSettings");
2007 debugger()->PrintSettingsToJSONObject(&jssettings);
2008 }
2009 } 2009 }
2010 2010
2011 { 2011 {
2012 GrowableObjectArray& handlers = 2012 GrowableObjectArray& handlers =
2013 GrowableObjectArray::Handle(registered_service_extension_handlers()); 2013 GrowableObjectArray::Handle(registered_service_extension_handlers());
2014 if (!handlers.IsNull()) { 2014 if (!handlers.IsNull()) {
2015 JSONArray extensions(&jsobj, "extensionRPCs"); 2015 JSONArray extensions(&jsobj, "extensionRPCs");
2016 String& handler_name = String::Handle(); 2016 String& handler_name = String::Handle();
2017 for (intptr_t i = 0; i < handlers.Length(); i += kRegisteredEntrySize) { 2017 for (intptr_t i = 0; i < handlers.Length(); i += kRegisteredEntrySize) {
2018 handler_name ^= handlers.At(i + kRegisteredNameIndex); 2018 handler_name ^= handlers.At(i + kRegisteredNameIndex);
(...skipping 857 matching lines...) Expand 10 before | Expand all | Expand 10 after
2876 void IsolateSpawnState::DecrementSpawnCount() { 2876 void IsolateSpawnState::DecrementSpawnCount() {
2877 ASSERT(spawn_count_monitor_ != NULL); 2877 ASSERT(spawn_count_monitor_ != NULL);
2878 ASSERT(spawn_count_ != NULL); 2878 ASSERT(spawn_count_ != NULL);
2879 MonitorLocker ml(spawn_count_monitor_); 2879 MonitorLocker ml(spawn_count_monitor_);
2880 ASSERT(*spawn_count_ > 0); 2880 ASSERT(*spawn_count_ > 0);
2881 *spawn_count_ = *spawn_count_ - 1; 2881 *spawn_count_ = *spawn_count_ - 1;
2882 ml.Notify(); 2882 ml.Notify();
2883 } 2883 }
2884 2884
2885 } // namespace dart 2885 } // namespace dart
OLDNEW
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698