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

Unified Diff: runtime/vm/debugger_api_impl.cc

Issue 271153002: Add pause/resume for isolates in vmservice/observatory. (Closed) Base URL: https://dart.googlecode.com/svn/branches/bleeding_edge/dart
Patch Set: gen js Created 6 years, 7 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 side-by-side diff with in-line comments
Download patch
« no previous file with comments | « runtime/vm/debugger.cc ('k') | runtime/vm/debugger_test.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: runtime/vm/debugger_api_impl.cc
diff --git a/runtime/vm/debugger_api_impl.cc b/runtime/vm/debugger_api_impl.cc
index 2a82818034c16670e4128299e05e8072a3fb9825..cabf9e7439a889a7b03235be93c6ba0921dc072f 100644
--- a/runtime/vm/debugger_api_impl.cc
+++ b/runtime/vm/debugger_api_impl.cc
@@ -109,34 +109,34 @@ static Dart_IsolateEventHandler* isolate_event_handler = NULL;
static Dart_BreakpointHandler* legacy_bp_handler = NULL;
-static void DebuggerEventHandler(Debugger::DebuggerEvent* event) {
+static void DebuggerEventHandler(DebuggerEvent* event) {
Isolate* isolate = Isolate::Current();
ASSERT(isolate != NULL);
ASSERT(isolate->debugger() != NULL);
Dart_EnterScope();
Dart_IsolateId isolate_id = isolate->debugger()->GetIsolateId();
- if (event->type == Debugger::kBreakpointReached) {
+ if (event->type() == DebuggerEvent::kBreakpointReached) {
if (legacy_bp_handler != NULL) {
Dart_StackTrace stack_trace =
reinterpret_cast<Dart_StackTrace>(isolate->debugger()->StackTrace());
(*legacy_bp_handler)(isolate_id, NULL, stack_trace);
} else if (paused_event_handler != NULL) {
Dart_CodeLocation location;
- ActivationFrame* top_frame = event->top_frame;
+ ActivationFrame* top_frame = event->top_frame();
location.script_url = Api::NewHandle(isolate, top_frame->SourceUrl());
const Library& lib = Library::Handle(top_frame->Library());
location.library_id = lib.index();
location.token_pos = top_frame->TokenPos();
intptr_t bp_id = 0;
- if (event->breakpoint != NULL) {
- ASSERT(event->breakpoint->id() != ILLEGAL_BREAKPOINT_ID);
- bp_id = event->breakpoint->id();
+ if (event->breakpoint() != NULL) {
+ ASSERT(event->breakpoint()->id() != ILLEGAL_BREAKPOINT_ID);
+ bp_id = event->breakpoint()->id();
}
(*paused_event_handler)(isolate_id, bp_id, location);
}
- } else if (event->type == Debugger::kBreakpointResolved) {
+ } else if (event->type() == DebuggerEvent::kBreakpointResolved) {
if (bp_resolved_handler != NULL) {
- SourceBreakpoint* bpt = event->breakpoint;
+ SourceBreakpoint* bpt = event->breakpoint();
ASSERT(bpt != NULL);
Dart_CodeLocation location;
Library& library = Library::Handle(isolate);
@@ -148,24 +148,25 @@ static void DebuggerEventHandler(Debugger::DebuggerEvent* event) {
location.token_pos = token_pos;
(*bp_resolved_handler)(isolate_id, bpt->id(), location);
}
- } else if (event->type == Debugger::kExceptionThrown) {
+ } else if (event->type() == DebuggerEvent::kExceptionThrown) {
if (exc_thrown_handler != NULL) {
- Dart_Handle exception = Api::NewHandle(isolate, event->exception->raw());
+ Dart_Handle exception =
+ Api::NewHandle(isolate, event->exception()->raw());
Dart_StackTrace trace =
reinterpret_cast<Dart_StackTrace>(isolate->debugger()->StackTrace());
(*exc_thrown_handler)(isolate_id, exception, trace);
}
- } else if (event->type == Debugger::kIsolateCreated) {
+ } else if (event->type() == DebuggerEvent::kIsolateCreated) {
if (isolate_event_handler != NULL) {
- (*isolate_event_handler)(event->isolate_id, kCreated);
+ (*isolate_event_handler)(event->isolate_id(), kCreated);
}
- } else if (event->type == Debugger::kIsolateInterrupted) {
+ } else if (event->type() == DebuggerEvent::kIsolateInterrupted) {
if (isolate_event_handler != NULL) {
- (*isolate_event_handler)(event->isolate_id, kInterrupted);
+ (*isolate_event_handler)(event->isolate_id(), kInterrupted);
}
- } else if (event->type == Debugger::kIsolateShutdown) {
+ } else if (event->type() == DebuggerEvent::kIsolateShutdown) {
if (isolate_event_handler != NULL) {
- (*isolate_event_handler)(event->isolate_id, kShutdown);
+ (*isolate_event_handler)(event->isolate_id(), kShutdown);
}
} else {
UNIMPLEMENTED();
« no previous file with comments | « runtime/vm/debugger.cc ('k') | runtime/vm/debugger_test.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698