| 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 part of vmservice_io; | 5 part of vmservice_io; |
| 6 | 6 |
| 7 _sanitizeWindowsPath(path) { | 7 _sanitizeWindowsPath(path) { |
| 8 // For Windows we need to massage the paths a bit according to | 8 // For Windows we need to massage the paths a bit according to |
| 9 // http://blogs.msdn.com/b/ie/archive/2006/12/06/file-uris-in-windows.aspx | 9 // http://blogs.msdn.com/b/ie/archive/2006/12/06/file-uris-in-windows.aspx |
| 10 // | 10 // |
| (...skipping 44 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 55 | 55 |
| 56 class FileRequest { | 56 class FileRequest { |
| 57 final SendPort sp; | 57 final SendPort sp; |
| 58 final int tag; | 58 final int tag; |
| 59 final Uri uri; | 59 final Uri uri; |
| 60 final Uri resolvedUri; | 60 final Uri resolvedUri; |
| 61 final String libraryUrl; | 61 final String libraryUrl; |
| 62 FileRequest(this.sp, this.tag, this.uri, this.resolvedUri, this.libraryUrl); | 62 FileRequest(this.sp, this.tag, this.uri, this.resolvedUri, this.libraryUrl); |
| 63 } | 63 } |
| 64 | 64 |
| 65 bool _traceLoading = false; |
| 66 |
| 65 // State associated with the isolate that is used for loading. | 67 // State associated with the isolate that is used for loading. |
| 66 class IsolateLoaderState extends IsolateEmbedderData { | 68 class IsolateLoaderState extends IsolateEmbedderData { |
| 67 IsolateLoaderState(this.isolateId); | 69 IsolateLoaderState(this.isolateId); |
| 68 | 70 |
| 69 final int isolateId; | 71 final int isolateId; |
| 70 | 72 |
| 71 SendPort sp; | 73 SendPort sp; |
| 72 | 74 |
| 73 void init(String packageRootFlag, String packagesConfigFlag, | 75 void init(String packageRootFlag, String packagesConfigFlag, |
| 74 String workingDirectory, String rootScript) { | 76 String workingDirectory, String rootScript) { |
| (...skipping 19 matching lines...) Expand all Loading... |
| 94 _packagesPort = null; | 96 _packagesPort = null; |
| 95 } | 97 } |
| 96 } | 98 } |
| 97 | 99 |
| 98 // The working directory when the embedder started. | 100 // The working directory when the embedder started. |
| 99 Uri _workingDirectory; | 101 Uri _workingDirectory; |
| 100 | 102 |
| 101 // The root script's uri. | 103 // The root script's uri. |
| 102 Uri _rootScript; | 104 Uri _rootScript; |
| 103 | 105 |
| 104 bool _traceLoading = false; | |
| 105 | |
| 106 // Packages are either resolved looking up in a map or resolved from within a | 106 // Packages are either resolved looking up in a map or resolved from within a |
| 107 // package root. | 107 // package root. |
| 108 bool get _packagesReady => | 108 bool get _packagesReady => |
| 109 (_packageRoot != null) || | 109 (_packageRoot != null) || |
| 110 (_packageMap != null) || | 110 (_packageMap != null) || |
| 111 (_packageError != null); | 111 (_packageError != null); |
| 112 | 112 |
| 113 // Error string set if there was an error resolving package configuration. | 113 // Error string set if there was an error resolving package configuration. |
| 114 // For example not finding a .packages file or packages/ directory, malformed | 114 // For example not finding a .packages file or packages/ directory, malformed |
| 115 // .packages file or any other related error. | 115 // .packages file or any other related error. |
| (...skipping 1023 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1139 msg[2] = resolvedUri.toString(); | 1139 msg[2] = resolvedUri.toString(); |
| 1140 msg[3] = null; | 1140 msg[3] = null; |
| 1141 msg[4] = e.toString(); | 1141 msg[4] = e.toString(); |
| 1142 sp.send(msg); | 1142 sp.send(msg); |
| 1143 } | 1143 } |
| 1144 break; | 1144 break; |
| 1145 default: | 1145 default: |
| 1146 _log('Unknown loader request tag=$tag from $isolateId'); | 1146 _log('Unknown loader request tag=$tag from $isolateId'); |
| 1147 } | 1147 } |
| 1148 } | 1148 } |
| OLD | NEW |