| OLD | NEW |
| 1 // Copyright (c) 2013, the Dart project authors. Please see the AUTHORS file | 1 // Copyright (c) 2013, 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; | 5 part of vmservice; |
| 6 | 6 |
| 7 class RunningIsolates implements ServiceRequestRouter { | 7 class RunningIsolates implements ServiceRequestRouter { |
| 8 final Map<int, RunningIsolate> isolates = new Map<int, RunningIsolate>(); | 8 final Map<int, RunningIsolate> isolates = new Map<int, RunningIsolate>(); |
| 9 | 9 |
| 10 RunningIsolates(); | 10 RunningIsolates(); |
| 11 | 11 |
| 12 void isolateStartup(SendPort sp, String name) { | 12 void isolateStartup(int portId, SendPort sp, String name) { |
| 13 if (isolates[sp.hashCode] != null) { | 13 if (isolates[portId] != null) { |
| 14 throw new StateError('Duplicate isolate startup.'); | 14 throw new StateError('Duplicate isolate startup.'); |
| 15 } | 15 } |
| 16 var ri = new RunningIsolate(sp, name); | 16 var ri = new RunningIsolate(portId, sp, name); |
| 17 isolates[sp.hashCode] = ri; | 17 isolates[portId] = ri; |
| 18 } | 18 } |
| 19 | 19 |
| 20 void isolateShutdown(SendPort sp) { | 20 void isolateShutdown(int portId, SendPort sp) { |
| 21 if (isolates[sp.hashCode] == null) { | 21 if (isolates[portId] == null) { |
| 22 throw new StateError('Unknown isolate.'); | 22 throw new StateError('Unknown isolate.'); |
| 23 } | 23 } |
| 24 isolates.remove(sp.hashCode); | 24 isolates.remove(portId); |
| 25 } | 25 } |
| 26 | 26 |
| 27 void _isolateCollectionRequest(ServiceRequest request) { | 27 void _isolateCollectionRequest(ServiceRequest request) { |
| 28 var members = []; | 28 var members = []; |
| 29 var result = {}; | 29 var result = {}; |
| 30 isolates.forEach((sp, ri) { | 30 isolates.forEach((portId, runningIsolate) { |
| 31 members.add({ | 31 members.add({ |
| 32 'id': sp, | 32 'id': portId, |
| 33 'name': ri.name | 33 'name': runningIsolate.name |
| 34 }); | 34 }); |
| 35 }); | 35 }); |
| 36 result['type'] = 'IsolateList'; | 36 result['type'] = 'IsolateList'; |
| 37 result['members'] = members; | 37 result['members'] = members; |
| 38 request.setResponse(JSON.encode(result)); | 38 request.setResponse(JSON.encode(result)); |
| 39 } | 39 } |
| 40 | 40 |
| 41 Future route(ServiceRequest request) { | 41 Future route(ServiceRequest request) { |
| 42 if (request.pathSegments.length == 0) { | 42 if (request.pathSegments.length == 0) { |
| 43 return null; | 43 return null; |
| (...skipping 21 matching lines...) Expand all Loading... |
| 65 // Consume '/isolates/isolateId' | 65 // Consume '/isolates/isolateId' |
| 66 request.pathSegments.removeRange(0, 2); | 66 request.pathSegments.removeRange(0, 2); |
| 67 if (request.pathSegments.length == 0) { | 67 if (request.pathSegments.length == 0) { |
| 68 // The request is now empty. | 68 // The request is now empty. |
| 69 request.setErrorResponse('No request for isolate: /isolates/$isolateId'); | 69 request.setErrorResponse('No request for isolate: /isolates/$isolateId'); |
| 70 return new Future.value(request); | 70 return new Future.value(request); |
| 71 } | 71 } |
| 72 return isolate.route(request); | 72 return isolate.route(request); |
| 73 } | 73 } |
| 74 } | 74 } |
| OLD | NEW |