OLD | NEW |
1 // Copyright (c) 2015, the Dart project authors. Please see the AUTHORS file | 1 // Copyright (c) 2015, 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 "bin/vmservice_dartium.h" | 5 #include "bin/vmservice_dartium.h" |
6 | 6 |
7 #include "bin/builtin.h" | 7 #include "bin/builtin.h" |
8 #include "bin/dartutils.h" | 8 #include "bin/dartutils.h" |
9 #include "bin/eventhandler.h" | 9 #include "bin/eventhandler.h" |
10 #include "bin/platform.h" | 10 #include "bin/platform.h" |
(...skipping 46 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
57 Builtin::SetNativeResolver(Builtin::kIOLibrary); | 57 Builtin::SetNativeResolver(Builtin::kIOLibrary); |
58 | 58 |
59 Dart_Handle builtin_lib = | 59 Dart_Handle builtin_lib = |
60 Builtin::LoadAndCheckLibrary(Builtin::kBuiltinLibrary); | 60 Builtin::LoadAndCheckLibrary(Builtin::kBuiltinLibrary); |
61 CHECK_RESULT(builtin_lib); | 61 CHECK_RESULT(builtin_lib); |
62 | 62 |
63 Dart_Handle result; | 63 Dart_Handle result; |
64 | 64 |
65 // Prepare for script loading by setting up the 'print' and 'timer' | 65 // Prepare for script loading by setting up the 'print' and 'timer' |
66 // closures and setting up 'package root' for URI resolution. | 66 // closures and setting up 'package root' for URI resolution. |
67 result = DartUtils::PrepareForScriptLoading(NULL, true, false, builtin_lib); | 67 result = DartUtils::PrepareForScriptLoading( |
| 68 NULL, NULL, true, false, builtin_lib); |
68 CHECK_RESULT(result); | 69 CHECK_RESULT(result); |
69 | 70 |
70 ASSERT(Dart_IsServiceIsolate(isolate)); | 71 ASSERT(Dart_IsServiceIsolate(isolate)); |
71 if (!VmService::Setup(DEFAULT_VM_SERVICE_SERVER_IP, | 72 if (!VmService::Setup(DEFAULT_VM_SERVICE_SERVER_IP, |
72 DEFAULT_VM_SERVICE_SERVER_PORT)) { | 73 DEFAULT_VM_SERVICE_SERVER_PORT)) { |
73 fprintf(stderr, | 74 fprintf(stderr, |
74 "Vmservice::Setup failed: %s\n", VmService::GetErrorMessage()); | 75 "Vmservice::Setup failed: %s\n", VmService::GetErrorMessage()); |
75 isolate = NULL; | 76 isolate = NULL; |
76 } | 77 } |
77 Dart_ExitScope(); | 78 Dart_ExitScope(); |
(...skipping 13 matching lines...) Expand all Loading... |
91 | 92 |
92 | 93 |
93 /* DISALLOW_ALLOCATION */ | 94 /* DISALLOW_ALLOCATION */ |
94 void VmServiceServer::operator delete(void* pointer) { | 95 void VmServiceServer::operator delete(void* pointer) { |
95 fprintf(stderr, "unreachable code\n"); | 96 fprintf(stderr, "unreachable code\n"); |
96 abort(); | 97 abort(); |
97 } | 98 } |
98 | 99 |
99 } // namespace bin | 100 } // namespace bin |
100 } // namespace dart | 101 } // namespace dart |
OLD | NEW |