From: Aleš Křenek <ljocha@ics.muni.cz>
Date: Tue, 1 Nov 2005 09:49:14 +0000 (+0000)
Subject: - distinguish "new clients" which are not kicked off when active even if
X-Git-Tag: glite-lb-server-bones_R_2_0_1~3
X-Git-Url: http://scientific.zcu.cz/git/?a=commitdiff_plain;h=be7b70218274f44368bc6a96c527fb12d31b16cb;p=jra1mw.git

- distinguish "new clients" which are not kicked off when active even if
  there are other waiting clients
- kick off also connections to active "old clients" when new clients are waiting
---

diff --git a/org.glite.lb.server-bones/src/srvbones.c b/org.glite.lb.server-bones/src/srvbones.c
index ad2080b..5c8d059 100644
--- a/org.glite.lb.server-bones/src/srvbones.c
+++ b/org.glite.lb.server-bones/src/srvbones.c
@@ -26,6 +26,8 @@
 #define IDLE_TIMEOUT		30		/* keep idle connection that many seconds */
 #define CONNECT_TIMEOUT		5		/* timeout for establishing a connection */
 #define REQUEST_TIMEOUT		10		/* timeout for a single request */ 
+#define NEW_CLIENT_DURATION	10		/* how long a client is considered new, i.e. busy
+						   connection is not closed to serve other clients */
 
 #ifndef dprintf
 #define dprintf(x)			{ if (debug) printf x; }
@@ -276,7 +278,8 @@ static int slave(slave_data_init_hnd data_init_hnd, int sock)
 	sigset_t		sset;
 	struct sigaction	sa;
 	struct timeval		client_done,
-				client_start;
+				client_start,
+				new_client_duration = { NEW_CLIENT_DURATION, 0 };
 
 	void	*clnt_data = NULL;
 	int	conn = -1,
@@ -422,7 +425,7 @@ static int slave(slave_data_init_hnd data_init_hnd, int sock)
 					gettimeofday(&client_done, NULL);
 				}
 
-				continue;
+				if (!check_timeout(new_client_duration,client_start,now)) continue;
 
 			}
 		}
@@ -509,6 +512,10 @@ static int slave(slave_data_init_hnd data_init_hnd, int sock)
 		dprintf(("[%d] Terminating on signal %d\n", getpid(), die));
 		if ( !debug ) syslog(LOG_INFO, "Terminating on signal %d", die);
 	}
+
+	if (conn >= 0  && services[srv].on_disconnect_hnd )
+		services[srv].on_disconnect_hnd(conn, NULL, clnt_data);
+
 	dprintf(("[%d] Terminating after %d connections\n", getpid(), req_cnt));
 	if ( !debug ) syslog(LOG_INFO, "Terminating after %d connections", req_cnt);