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 "vm/service_isolate.h" | 5 #include "vm/service_isolate.h" |
6 | 6 |
7 #include "vm/compiler.h" | 7 #include "vm/compiler.h" |
8 #include "vm/dart_api_impl.h" | 8 #include "vm/dart_api_impl.h" |
9 #include "vm/dart_entry.h" | 9 #include "vm/dart_entry.h" |
10 #include "vm/isolate.h" | 10 #include "vm/isolate.h" |
(...skipping 607 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
618 | 618 |
619 Dart_IsolateCreateCallback create_callback = | 619 Dart_IsolateCreateCallback create_callback = |
620 ServiceIsolate::create_callback(); | 620 ServiceIsolate::create_callback(); |
621 // TODO(johnmccutchan): Support starting up service isolate without embedder | 621 // TODO(johnmccutchan): Support starting up service isolate without embedder |
622 // provided isolate creation callback. | 622 // provided isolate creation callback. |
623 if (create_callback == NULL) { | 623 if (create_callback == NULL) { |
624 ServiceIsolate::FinishedInitializing(); | 624 ServiceIsolate::FinishedInitializing(); |
625 return; | 625 return; |
626 } | 626 } |
627 | 627 |
| 628 Isolate::Flags default_flags; |
| 629 Dart_IsolateFlags api_flags; |
| 630 default_flags.CopyTo(&api_flags); |
| 631 |
628 isolate = | 632 isolate = |
629 reinterpret_cast<Isolate*>(create_callback(ServiceIsolate::kName, | 633 reinterpret_cast<Isolate*>(create_callback(ServiceIsolate::kName, |
630 NULL, | 634 NULL, |
631 NULL, | 635 NULL, |
| 636 &api_flags, |
632 NULL, | 637 NULL, |
633 &error)); | 638 &error)); |
634 if (isolate == NULL) { | 639 if (isolate == NULL) { |
635 OS::PrintErr("vm-service: Isolate creation error: %s\n", error); | 640 OS::PrintErr("vm-service: Isolate creation error: %s\n", error); |
636 ServiceIsolate::FinishedInitializing(); | 641 ServiceIsolate::FinishedInitializing(); |
637 return; | 642 return; |
638 } | 643 } |
639 | 644 |
640 Thread::ExitIsolate(); | 645 Thread::ExitIsolate(); |
641 | 646 |
(...skipping 157 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
799 return result; | 804 return result; |
800 } | 805 } |
801 Dart_Handle source = GetSource(url_string); | 806 Dart_Handle source = GetSource(url_string); |
802 if (Dart_IsError(source)) { | 807 if (Dart_IsError(source)) { |
803 return source; | 808 return source; |
804 } | 809 } |
805 return Dart_LoadSource(library, url, source, 0, 0); | 810 return Dart_LoadSource(library, url, source, 0, 0); |
806 } | 811 } |
807 | 812 |
808 } // namespace dart | 813 } // namespace dart |
OLD | NEW |