Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(269)

Unified Diff: sdk/lib/_internal/pub/lib/src/dart.dart

Issue 27215002: Very simple version of Isolates. (Closed) Base URL: https://dart.googlecode.com/svn/branches/bleeding_edge/dart
Patch Set: Address comments. Created 7 years, 2 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: sdk/lib/_internal/pub/lib/src/dart.dart
diff --git a/sdk/lib/_internal/pub/lib/src/dart.dart b/sdk/lib/_internal/pub/lib/src/dart.dart
index 82686ca42bd40f9fc48b7e463d86668ad537a4ec..6b6a90965ff6069c49f5c5cf0295263507350a43 100644
--- a/sdk/lib/_internal/pub/lib/src/dart.dart
+++ b/sdk/lib/_internal/pub/lib/src/dart.dart
@@ -92,14 +92,18 @@ Future<SendPort> runInIsolate(String code) {
return withTempDir((dir) {
var dartPath = path.join(dir, 'runInIsolate.dart');
writeTextFile(dartPath, code, dontLogContents: true);
- var bufferPort = spawnFunction(_isolateBuffer);
- return bufferPort.call(path.toUri(dartPath).toString()).then((response) {
- if (response.first == 'error') {
- return new Future.error(
- new CrossIsolateException.deserialize(response.last));
- }
-
- return response.last;
+ var port = new ReceivePort();
+ var initialMessage = [path.toUri(dartPath).toString(), port.sendPort];
+ var isolate = Isolate.spawn(_isolateBuffer, initialMessage);
+ return isolate.then((_) {
+ return port.first.then((response) {
+ if (response.first == 'error') {
+ return new Future.error(
+ new CrossIsolateException.deserialize(response.last));
+ }
+
+ return response.last;
+ });
});
});
}
@@ -110,14 +114,18 @@ Future<SendPort> runInIsolate(String code) {
/// [spawnUri] synchronously loads the file and its imports, which can deadlock
/// the host isolate if there's an HTTP import pointing at a server in the host.
/// Adding an additional isolate in the middle works around this.
-void _isolateBuffer() {
- port.receive((uri, replyTo) {
- try {
- replyTo.send(['success', spawnUri(uri)]);
- } catch (e, stack) {
+void _isolateBuffer(initialMessage) {
+ var uri = initialMessage[0];
+ var replyTo = initialMessage[1];
+ try {
+ // TODO(floitsch): If we do it right we shouldn't need to have a try/catch
+ // and a catchError.
+ Isolate.spawnUri(Uri.parse(uri), [], replyTo).catchError((e, stack) {
replyTo.send(['error', CrossIsolateException.serialize(e, stack)]);
- }
- });
+ });
+ } catch (e, stack) {
+ replyTo.send(['error', CrossIsolateException.serialize(e, stack)]);
+ }
}
/// An exception that was originally raised in another isolate.

Powered by Google App Engine
This is Rietveld 408576698