Shutdown the service isolate when shutting down the VM

runtime/bin/vmservice/vmservice_io.dart

Index: runtime/bin/vmservice/vmservice_io.dart
diff --git a/runtime/bin/vmservice/vmservice_io.dart b/runtime/bin/vmservice/vmservice_io.dart
index 2d99e17eb85787fab4fe322e4732688083870545..070a25c3dc62aa963153abcd6f9e864a5bfdab2d 100644
--- a/runtime/bin/vmservice/vmservice_io.dart
+++ b/runtime/bin/vmservice/vmservice_io.dart
@@ -23,25 +23,37 @@ bool _autoStart;
 bool _isWindows = false;
 
 var _signalWatch;
+var _signalSubscription;
 
 // HTTP servr.
 Server server;
 Future<Server> serverFuture;
 
-void _bootServer() {
+_onShutdown() {
+  if (server != null) {
+    server.close(true).catchError((e, st) => assert(e));

[kasperl, 2015/03/27 07:50:55]

This is illegal syntax (assert isn't an expression) and it just broke our dev
channel build. I filed https://code.google.com/p/dart/issues/detail?id=23013 as
a request for doing static analysis on this code on every commit to catch such
errors a bit earlier.

+  }
+  if (_signalSubscription != null) {
+    _signalSubscription.cancel();
+    _signalSubscription = null;
+  }
+}
+
+_bootServer() {
   // Load resources.
   _triggerResourceLoad();
   // Lazily create service.
   var service = new VMService();
+  service.onShutdown = _onShutdown;
   // Lazily create server.
   server = new Server(service, _ip, _port);
 }
 
-void _clearFuture(_) {
+_clearFuture(_) {
   serverFuture = null;
 }
 
-void _onSignal(ProcessSignal signal) {
+_onSignal(ProcessSignal signal) {
   if (serverFuture != null) {
     // Still waiting.
     return;
@@ -57,12 +69,12 @@ void _onSignal(ProcessSignal signal) {
   }
 }
 
-void _registerSignalHandler() {
+_registerSignalHandler() {
   if (_isWindows) {
     // Cannot register for signals on Windows.
     return;
   }
-  _signalWatch(ProcessSignal.SIGQUIT).listen(_onSignal);
+  _signalSubscription = _signalWatch(ProcessSignal.SIGQUIT).listen(_onSignal);
 }
 
 const _shortDelay = const Duration(milliseconds: 10);