Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Set up secondary isolates with all kernel buffers rather than just one buffer. #6832

Merged
merged 6 commits into from
Nov 14, 2018
Merged

Set up secondary isolates with all kernel buffers rather than just one buffer. #6832

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
9ebf8af
Set up secondary isolates with all kernel buffers rather than just on…
aam Nov 13, 2018
6e03de4
Capture copy of the list
aam Nov 13, 2018
3029e89
Make sure child_isolate_preparer_ is initialized only once
aam Nov 14, 2018
d5edfa7
Comment and formatting
aam Nov 14, 2018
6a77c12
Clarify comment
aam Nov 14, 2018
f22b31c
Formatting
aam Nov 14, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
19 changes: 16 additions & 3 deletions runtime/dart_isolate.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -348,9 +348,22 @@ bool DartIsolate::PrepareForRunningFromKernel(
return false;
}

child_isolate_preparer_ = [mapping](DartIsolate* isolate) {
return isolate->PrepareForRunningFromKernel(mapping);
};
// Child isolate shares root isolate embedder_isolate (lines 691 and 693
// below). Re-initializing child_isolate_preparer_ lambda while it is being
// executed leads to crashes.
if (child_isolate_preparer_ == nullptr) {
child_isolate_preparer_ = [buffers =
kernel_buffers_](DartIsolate* isolate) {
for (unsigned long i = 0; i < buffers.size(); i++) {
bool last_piece = i + 1 == buffers.size();
const std::shared_ptr<const fml::Mapping>& buffer = buffers.at(i);
if (!isolate->PrepareForRunningFromKernel(buffer, last_piece)) {
return false;
}
}
return true;
};
}
phase_ = Phase::Ready;
return true;
}
Expand Down
2 changes: 1 addition & 1 deletion runtime/dart_isolate.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -117,7 +117,7 @@ class DartIsolate : public UIDartState {
const fml::RefPtr<DartSnapshot> shared_snapshot_;
std::vector<std::shared_ptr<const fml::Mapping>> kernel_buffers_;
std::vector<std::unique_ptr<AutoFireClosure>> shutdown_callbacks_;
ChildIsolatePreparer child_isolate_preparer_;
ChildIsolatePreparer child_isolate_preparer_ = nullptr;

FML_WARN_UNUSED_RESULT
bool Initialize(Dart_Isolate isolate, bool is_root_isolate);
Expand Down