OLD | NEW |
1 // Copyright (c) 2012, the Dart project authors. Please see the AUTHORS file | 1 // Copyright (c) 2012, 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 "include/dart_debugger_api.h" | 5 #include "include/dart_debugger_api.h" |
6 | 6 |
7 #include "vm/class_finalizer.h" | 7 #include "vm/class_finalizer.h" |
8 #include "vm/compiler.h" | 8 #include "vm/compiler.h" |
9 #include "vm/dart_api_impl.h" | 9 #include "vm/dart_api_impl.h" |
10 #include "vm/dart_api_state.h" | 10 #include "vm/dart_api_state.h" |
(...skipping 211 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
222 DARTSCOPE(isolate); | 222 DARTSCOPE(isolate); |
223 CHECK_NOT_NULL(trace); | 223 CHECK_NOT_NULL(trace); |
224 *trace = reinterpret_cast<Dart_StackTrace>(isolate->debugger()->StackTrace()); | 224 *trace = reinterpret_cast<Dart_StackTrace>(isolate->debugger()->StackTrace()); |
225 return Api::Success(); | 225 return Api::Success(); |
226 } | 226 } |
227 | 227 |
228 | 228 |
229 DART_EXPORT Dart_Handle Dart_ActivationFrameInfo( | 229 DART_EXPORT Dart_Handle Dart_ActivationFrameInfo( |
230 Dart_ActivationFrame activation_frame, | 230 Dart_ActivationFrame activation_frame, |
231 Dart_Handle* function_name, | 231 Dart_Handle* function_name, |
| 232 Dart_Handle* function, |
232 Dart_Handle* script_url, | 233 Dart_Handle* script_url, |
233 intptr_t* line_number, | 234 intptr_t* line_number, |
234 intptr_t* library_id) { | 235 intptr_t* library_id) { |
235 Isolate* isolate = Isolate::Current(); | 236 Isolate* isolate = Isolate::Current(); |
236 DARTSCOPE(isolate); | 237 DARTSCOPE(isolate); |
237 CHECK_AND_CAST(ActivationFrame, frame, activation_frame); | 238 CHECK_AND_CAST(ActivationFrame, frame, activation_frame); |
238 if (function_name != NULL) { | 239 if (function_name != NULL) { |
239 *function_name = Api::NewHandle(isolate, frame->QualifiedFunctionName()); | 240 *function_name = Api::NewHandle(isolate, frame->QualifiedFunctionName()); |
240 } | 241 } |
| 242 if (function != NULL) { |
| 243 *function = Api::NewHandle(isolate, frame->function().raw()); |
| 244 } |
241 if (script_url != NULL) { | 245 if (script_url != NULL) { |
242 *script_url = Api::NewHandle(isolate, frame->SourceUrl()); | 246 *script_url = Api::NewHandle(isolate, frame->SourceUrl()); |
243 } | 247 } |
244 if (line_number != NULL) { | 248 if (line_number != NULL) { |
245 *line_number = frame->LineNumber(); | 249 *line_number = frame->LineNumber(); |
246 } | 250 } |
247 if (library_id != NULL) { | 251 if (library_id != NULL) { |
248 const Library& lib = Library::Handle(frame->Library()); | 252 const Library& lib = Library::Handle(frame->Library()); |
249 *library_id = lib.index(); | 253 *library_id = lib.index(); |
250 } | 254 } |
(...skipping 636 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
887 | 891 |
888 | 892 |
889 DART_EXPORT char* Dart_GetVmStatus(const char* request) { | 893 DART_EXPORT char* Dart_GetVmStatus(const char* request) { |
890 if (strncmp(request, "/isolate/", 9) == 0) { | 894 if (strncmp(request, "/isolate/", 9) == 0) { |
891 return Isolate::GetStatus(request); | 895 return Isolate::GetStatus(request); |
892 } | 896 } |
893 return NULL; | 897 return NULL; |
894 } | 898 } |
895 | 899 |
896 } // namespace dart | 900 } // namespace dart |
OLD | NEW |