towards automatic termination of remote actors

3 files changed, 15 insertions, 2 deletions

diff --git a/src/actors/scala/actors/Actor.scala b/src/actors/scala/actors/Actor.scala
index 55eb9ce314..0855866f0c 100644
--- a/src/actors/scala/actors/Actor.scala
+++ b/src/actors/scala/actors/Actor.scala
@@ -811,6 +811,7 @@ trait Actor extends OutputChannel[Any] {
     // links
     if (!links.isEmpty)
       exitLinked()
+    kill()
     throw new ExitActorException
   }
 
diff --git a/src/actors/scala/actors/Reaction.scala b/src/actors/scala/actors/Reaction.scala
index 9f46e9c0ce..2fde1a8a37 100644
--- a/src/actors/scala/actors/Reaction.scala
+++ b/src/actors/scala/actors/Reaction.scala
@@ -51,7 +51,7 @@ private[actors] class ExitActorException extends Throwable
           a.act()
         else
           f(msg)
-        a.kill(); a.exit()
+        a.exit()
       }
     }
     catch {
diff --git a/src/actors/scala/actors/remote/RemoteActor.scala b/src/actors/scala/actors/remote/RemoteActor.scala
index 7312cea4ba..99865ec5a5 100644
--- a/src/actors/scala/actors/remote/RemoteActor.scala
+++ b/src/actors/scala/actors/remote/RemoteActor.scala
@@ -51,7 +51,19 @@ object RemoteActor {
    */
   def alive(port: Int): Unit = synchronized {
     val serv = TcpService(port)
-    kernels += Actor.self -> serv.kernel
+    val kern = serv.kernel
+    val s = Actor.self
+    kernels += s -> kern
+    Debug.info("registering kill handler")
+    s.kill = () => {
+      Debug.info("alive actor "+s+" terminated")
+      kernels -= s
+      if (kernels.isEmpty) {
+        Debug.info("interrupting "+serv)
+        // terminate TcpService
+        serv.interrupt()
+      }
+    }
   }
 
   /**