From 8c93b768e4864be330c3d6a7962892135224f0f4 Mon Sep 17 00:00:00 2001
From: nicm <nicm>
Date: Fri, 5 Jun 2015 18:01:12 +0000
Subject: Instead of putting dead clients on a list and checking it every loop,
 use event_once to queue a callback to deal with them. Also dead clients with
 references would never actually be freed because the wrap-up functions (the
 callback for stdin, or status_prompt_clear) would never be called. So call
 them in server_client_lost.

---
 server.c | 11 -----------
 1 file changed, 11 deletions(-)

(limited to 'server.c')

diff --git a/server.c b/server.c
index 52fdb0c3..cc5a63f6 100644
--- a/server.c
+++ b/server.c
@@ -41,9 +41,7 @@
  * Main server functions.
  */
 
-/* Client list. */
 struct clients	 clients;
-struct clients	 dead_clients;
 
 int		 server_fd;
 int		 server_shutdown;
@@ -205,7 +203,6 @@ server_start(int lockfd, char *lockfile)
 	RB_INIT(&windows);
 	RB_INIT(&all_window_panes);
 	TAILQ_INIT(&clients);
-	TAILQ_INIT(&dead_clients);
 	RB_INIT(&sessions);
 	RB_INIT(&dead_sessions);
 	TAILQ_INIT(&session_groups);
@@ -325,7 +322,6 @@ void
 server_clean_dead(void)
 {
 	struct session	*s, *s1;
-	struct client	*c, *c1;
 
 	RB_FOREACH_SAFE(s, sessions, &dead_sessions, s1) {
 		if (s->references != 0)
@@ -334,13 +330,6 @@ server_clean_dead(void)
 		free(s->name);
 		free(s);
 	}
-
-	TAILQ_FOREACH_SAFE(c, &dead_clients, entry, c1) {
-		if (c->references != 0)
-			continue;
-		TAILQ_REMOVE(&dead_clients, c, entry);
-		free(c);
-	}
 }
 
 /* Update socket execute permissions based on whether sessions are attached. */
-- 
cgit 


From 641a9cd3f591b0ace3ae9947ebe6ab889b641eed Mon Sep 17 00:00:00 2001
From: nicm <nicm>
Date: Fri, 5 Jun 2015 18:18:32 +0000
Subject: Similarly, for sessions use a callback to free rather than checking
 every loop.

---
 server.c | 19 -------------------
 1 file changed, 19 deletions(-)

(limited to 'server.c')

diff --git a/server.c b/server.c
index cc5a63f6..001a404c 100644
--- a/server.c
+++ b/server.c
@@ -58,7 +58,6 @@ int	server_create_socket(void);
 void	server_loop(void);
 int	server_should_shutdown(void);
 void	server_send_shutdown(void);
-void	server_clean_dead(void);
 void	server_accept_callback(int, short, void *);
 void	server_signal_callback(int, short, void *);
 void	server_child_signal(void);
@@ -204,7 +203,6 @@ server_start(int lockfd, char *lockfile)
 	RB_INIT(&all_window_panes);
 	TAILQ_INIT(&clients);
 	RB_INIT(&sessions);
-	RB_INIT(&dead_sessions);
 	TAILQ_INIT(&session_groups);
 	mode_key_init_trees();
 	key_bindings_init();
@@ -264,8 +262,6 @@ server_loop(void)
 
 		server_window_loop();
 		server_client_loop();
-
-		server_clean_dead();
 	}
 }
 
@@ -317,21 +313,6 @@ server_send_shutdown(void)
 		session_destroy(s);
 }
 
-/* Free dead, unreferenced clients and sessions. */
-void
-server_clean_dead(void)
-{
-	struct session	*s, *s1;
-
-	RB_FOREACH_SAFE(s, sessions, &dead_sessions, s1) {
-		if (s->references != 0)
-			continue;
-		RB_REMOVE(sessions, &dead_sessions, s);
-		free(s->name);
-		free(s);
-	}
-}
-
 /* Update socket execute permissions based on whether sessions are attached. */
 void
 server_update_socket(void)
-- 
cgit