From b9f297bb2073d377548b66eaf85e98d678731a74 Mon Sep 17 00:00:00 2001
From: Jonathan Moore Liles <j.liles@unix.net>
Date: Mon, 20 Feb 2012 20:09:41 -0800
Subject: [PATCH] NSM: Detect death of clients whose processes are not children
 of NSMD.

---
 session/src/nsmd.C | 111 +++++++++++++++++++++++++++++++--------------
 1 file changed, 78 insertions(+), 33 deletions(-)

diff --git a/session/src/nsmd.C b/session/src/nsmd.C
index b3ca641..17c190b 100644
--- a/session/src/nsmd.C
+++ b/session/src/nsmd.C
@@ -225,47 +225,55 @@ void clear_clients ( void )
     }
 }
 
+
+void
+handle_client_process_death ( int pid )
+{
+    Client *c = get_client_by_pid( (int)pid );
+        
+    if ( c )
+    {
+        MESSAGE( "Client %s died.", c->name );
+
+        if ( c->pending_command == COMMAND_KILL ||
+             c->pending_command == COMMAND_QUIT )
+        {
+            c->dead_because_we_said = true;
+        }
+
+        c->pending_command = COMMAND_NONE;
+            
+        if ( gui_is_active )
+        {
+            if ( ! c->dead_because_we_said )
+                osc_server->send( gui_addr, "/nsm/gui/client/status", c->client_id, c->status = "stopped" );
+            else
+                osc_server->send( gui_addr, "/nsm/gui/client/status", c->client_id, c->status = "removed" );
+        }
+
+        c->active = false;
+        c->pid = 0;
+
+        if ( c->dead_because_we_said )
+        {
+            client.remove( c );
+            delete c;
+        }
+    }
+}
+
+
 void handle_sigchld ( )
 {
     for ( ;; )
     {
         int status;
         pid_t pid = waitpid(-1, &status, WNOHANG);
-        if (pid <= 0) {
+
+        if (pid <= 0) 
             break;
-        }
         
-        Client *c = get_client_by_pid( (int)pid );
-        
-        if ( c )
-        {
-            MESSAGE( "Client %s died.", c->name );
-
-            if ( c->pending_command == COMMAND_KILL ||
-                 c->pending_command == COMMAND_QUIT )
-            {
-                c->dead_because_we_said = true;
-            }
-
-            c->pending_command = COMMAND_NONE;
-            
-            if ( gui_is_active )
-            {
-                if ( ! c->dead_because_we_said )
-                    osc_server->send( gui_addr, "/nsm/gui/client/status", c->client_id, c->status = "stopped" );
-                else
-                    osc_server->send( gui_addr, "/nsm/gui/client/status", c->client_id, c->status = "removed" );
-            }
-
-            c->active = false;
-            c->pid = 0;
-
-            if ( c->dead_because_we_said )
-            {
-                client.remove( c );
-                delete c;
-            }
-        }
+        handle_client_process_death( pid );
     }
 }
 
@@ -576,6 +584,39 @@ purge_inactive_clients ( )
     }
 }
 
+bool
+process_is_running ( int pid )
+{
+    if ( 0 == kill( pid, 0 ) )
+    {
+        return true;
+    }
+    else if ( ESRCH == errno )
+    {
+        return false;
+    }
+
+    return false;
+}
+
+void
+purge_dead_clients ( )
+{
+    std::list<Client*> tmp( client );
+
+    for ( std::list<Client*>::const_iterator i = tmp.begin();
+          i != tmp.end();
+          ++i )
+    {
+        const Client *c = *i;
+        if ( c->pid )
+        {
+            if ( ! process_is_running( c->pid ) )
+                handle_client_process_death( c->pid );
+        }
+    }
+}
+
 /************************/
 /* OSC Message Handlers */
 /************************/
@@ -827,6 +868,8 @@ wait_for_killed_clients_to_die ( )
                 handle_sigchld();
         }
         
+        purge_dead_clients();
+
         usleep( 200 * 1000 );
     }
 
@@ -1748,6 +1791,8 @@ int main(int argc, char *argv[])
         }
         
         osc_server->wait( 1000 );
+
+        purge_dead_clients();
     }
     
 //    osc_server->run();