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

Run embedded compilations across multiple isolates #1981

Merged
merged 12 commits into from
Jun 6, 2023
Merged

Run embedded compilations across multiple isolates #1981

Changes from 1 commit
Commits
Show all changes
12 commits
Select commit Hold shift + click to select a range
bb26e53
Run embedded compilations across multiple isolates
nex3 May 31, 2023
3472b8d
Add missing files, format, improve logic
nex3 May 31, 2023
de8aaa9
Better error handling
nex3 May 31, 2023
52a2b95
Get embedded tests passing
nex3 Jun 2, 2023
c413f94
Reformat with newest formatter
nex3 Jun 2, 2023
be0448e
Update sass_api SDK version
nex3 Jun 2, 2023
c2be3d9
Don't recompile protobuf in JS actions
nex3 Jun 2, 2023
d6050c1
Add tests to verify that exit after stdin closes
nex3 Jun 2, 2023
9213ed0
Gracefully close the compiler in tests when possible
nex3 Jun 3, 2023
0250b4b
Reformat and fix method reference
nex3 Jun 3, 2023
00e543a
Fix a race condition when closing the isolate dispatcher
nex3 Jun 5, 2023
a353161
Track all isolates in isolate_dispatcher
nex3 Jun 5, 2023
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
12 changes: 10 additions & 2 deletions lib/src/embedded/isolate_dispatcher.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -55,6 +55,10 @@ class IsolateDispatcher {
/// even across isolates. See sass/dart-sass#1959.
final _isolatePool = Pool(15);

/// Whether the underlying channel has closed and the dispatcher is shutting
/// down.
var _closed = false;

IsolateDispatcher(this._channel);

void listen() {
Expand Down Expand Up @@ -98,6 +102,7 @@ class IsolateDispatcher {
}, onError: (Object error, StackTrace stackTrace) {
_handleError(error, stackTrace);
}, onDone: () {
_closed = true;
for (var isolate in _allIsolates) {
nex3 marked this conversation as resolved.
Show resolved Hide resolved
isolate.kill();
}
Expand Down Expand Up @@ -156,9 +161,12 @@ class IsolateDispatcher {
_handleError(error, stackTrace),
onDone: () {
_activeIsolates.remove(compilationId);
_inactiveIsolates.add(isolate);
if (_closed) {
isolate.sink.close();
} else {
_inactiveIsolates.add(isolate);
}
resource.release();
channel.sink.close();
});
_activeIsolates[compilationId] = channel.sink;
return channel.sink;
Expand Down