| 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 library vmservice; | 5 library vmservice; |
| 6 | 6 |
| 7 import 'dart:async'; | 7 import 'dart:async'; |
| 8 import "dart:convert"; | 8 import 'dart:convert'; |
| 9 import 'dart:isolate'; | 9 import 'dart:isolate'; |
| 10 import 'dart:typed_data'; | 10 import 'dart:typed_data'; |
| 11 | 11 |
| 12 part 'constants.dart'; | 12 part 'constants.dart'; |
| 13 part 'resources.dart'; | 13 part 'resources.dart'; |
| 14 part 'running_isolate.dart'; | 14 part 'running_isolate.dart'; |
| 15 part 'running_isolates.dart'; | 15 part 'running_isolates.dart'; |
| 16 part 'service_request.dart'; | 16 part 'service_request.dart'; |
| 17 part 'service_request_router.dart'; | 17 part 'service_request_router.dart'; |
| 18 | 18 |
| 19 class VMService { | 19 class VMService { |
| 20 static VMService _instance; | 20 static VMService _instance; |
| 21 RunningIsolates runningIsolates = new RunningIsolates(); | 21 RunningIsolates runningIsolates = new RunningIsolates(); |
| 22 final RawReceivePort receivePort; |
| 22 | 23 |
| 23 void controlMessageHandler(int code, SendPort sp, String name) { | 24 void controlMessageHandler(int code, int port_id, SendPort sp, String name) { |
| 24 switch (code) { | 25 switch (code) { |
| 25 case Constants.ISOLATE_STARTUP_MESSAGE_ID: | 26 case Constants.ISOLATE_STARTUP_MESSAGE_ID: |
| 26 runningIsolates.isolateStartup(sp, name); | 27 runningIsolates.isolateStartup(port_id, sp, name); |
| 27 break; | 28 break; |
| 28 case Constants.ISOLATE_SHUTDOWN_MESSAGE_ID: | 29 case Constants.ISOLATE_SHUTDOWN_MESSAGE_ID: |
| 29 runningIsolates.isolateShutdown(sp); | 30 runningIsolates.isolateShutdown(port_id, sp); |
| 30 break; | 31 break; |
| 31 } | 32 } |
| 32 } | 33 } |
| 33 | 34 |
| 34 void messageHandler(message) { | 35 void messageHandler(message) { |
| 35 if (message is List && message.length == 3) { | 36 assert(message is List); |
| 36 controlMessageHandler(message[0], message[1], message[2]); | 37 assert(message.length == 4); |
| 38 if (message is List && message.length == 4) { |
| 39 controlMessageHandler(message[0], message[1], message[2], message[3]); |
| 37 } | 40 } |
| 38 } | 41 } |
| 39 | 42 |
| 40 VMService._internal() { | 43 VMService._internal() : receivePort = new RawReceivePort() { |
| 41 port.listen(messageHandler); | 44 receivePort.handler = messageHandler; |
| 42 } | 45 } |
| 43 | 46 |
| 44 factory VMService() { | 47 factory VMService() { |
| 45 if (VMService._instance == null) { | 48 if (VMService._instance == null) { |
| 46 VMService._instance = new VMService._internal(); | 49 VMService._instance = new VMService._internal(); |
| 47 } | 50 } |
| 48 return _instance; | 51 return _instance; |
| 49 } | 52 } |
| 50 } | 53 } |
| 51 | 54 |
| 52 void sendServiceMessage(SendPort sp, ReceivePort rp, Object m) | 55 void sendServiceMessage(SendPort sp, ReceivePort rp, Object m) |
| 53 native "SendServiceMessage"; | 56 native "SendServiceMessage"; |
| OLD | NEW |