OLD | NEW |
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/service.h" | 5 #include "vm/service.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/globals.h" | 9 #include "platform/globals.h" |
10 | 10 |
(...skipping 978 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
989 break; | 989 break; |
990 } | 990 } |
991 if (!ServiceIsolate::IsRunning()) { | 991 if (!ServiceIsolate::IsRunning()) { |
992 OS::PrintErr(" Start the vm-service to debug.\n"); | 992 OS::PrintErr(" Start the vm-service to debug.\n"); |
993 } else if (ServiceIsolate::server_address() == NULL) { | 993 } else if (ServiceIsolate::server_address() == NULL) { |
994 OS::PrintErr(" Connect to Observatory to debug.\n"); | 994 OS::PrintErr(" Connect to Observatory to debug.\n"); |
995 } else { | 995 } else { |
996 OS::PrintErr(" Connect to Observatory at %s to debug.\n", | 996 OS::PrintErr(" Connect to Observatory at %s to debug.\n", |
997 ServiceIsolate::server_address()); | 997 ServiceIsolate::server_address()); |
998 } | 998 } |
| 999 const Error& err = Error::Handle(Thread::Current()->sticky_error()); |
| 1000 if (!err.IsNull()) { |
| 1001 OS::PrintErr("%s\n", err.ToErrorCString()); |
| 1002 } |
999 } | 1003 } |
1000 | 1004 |
1001 | 1005 |
1002 void Service::HandleEvent(ServiceEvent* event) { | 1006 void Service::HandleEvent(ServiceEvent* event) { |
1003 if (event->isolate() != NULL && | 1007 if (event->isolate() != NULL && |
1004 ServiceIsolate::IsServiceIsolateDescendant(event->isolate())) { | 1008 ServiceIsolate::IsServiceIsolateDescendant(event->isolate())) { |
1005 return; | 1009 return; |
1006 } | 1010 } |
1007 if (FLAG_warn_on_pause_with_no_debugger && | 1011 if (FLAG_warn_on_pause_with_no_debugger && |
1008 event->IsPause() && !Service::debug_stream.enabled()) { | 1012 event->IsPause() && !Service::debug_stream.enabled()) { |
(...skipping 2988 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
3997 if (strcmp(method_name, method.name) == 0) { | 4001 if (strcmp(method_name, method.name) == 0) { |
3998 return &method; | 4002 return &method; |
3999 } | 4003 } |
4000 } | 4004 } |
4001 return NULL; | 4005 return NULL; |
4002 } | 4006 } |
4003 | 4007 |
4004 #endif // !PRODUCT | 4008 #endif // !PRODUCT |
4005 | 4009 |
4006 } // namespace dart | 4010 } // namespace dart |
OLD | NEW |