X-Git-Url: https://code.citadel.org/?a=blobdiff_plain;f=citadel%2Fsysdep.c;h=01e7e831d49ddcd5de11b260bac2e02e29c60acd;hb=3367e0fa984b3e5f61b2f75f07fc4e11f824bb73;hp=8f71b7ea41ec3c4a09882d727ed3454ca417f308;hpb=51df62c4732353701b6e7ef05ba586be054fa92d;p=citadel.git

diff --git a/citadel/sysdep.c b/citadel/sysdep.c
index 8f71b7ea4..01e7e831d 100644
--- a/citadel/sysdep.c
+++ b/citadel/sysdep.c
@@ -10,18 +10,12 @@
  * Copyright (c) 1987-2011 by the citadel.org team
  *
  * This program is open source software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 3 of the License, or
- * (at your option) any later version.
+ * it under the terms of the GNU General Public License, version 3.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
  */
 
 #include "sysdep.h"
@@ -79,10 +73,6 @@
 #include <sys/select.h>
 #endif
 
-#ifndef HAVE_SNPRINTF
-#include "snprintf.h"
-#endif
-
 #include "ctdl_module.h"
 #include "threads.h"
 #include "user_ops.h"
@@ -918,7 +908,8 @@ int client_getln(char *buf, int bufsize)
 void close_masters (void)
 {
 	struct ServiceFunctionHook *serviceptr;
-	
+	const char *Text;
+
 	/*
 	 * close all protocol master sockets
 	 */
@@ -927,18 +918,37 @@ void close_masters (void)
 
 		if (serviceptr->tcp_port > 0)
 		{
-			syslog(LOG_INFO, "Closing %d listener on port %d\n",
+			if (serviceptr->msock == -1)
+				Text = "not closing again";
+			else
+				Text = "Closing";
+					
+			syslog(LOG_INFO, "%s %d listener on port %d\n",
+			       Text,
 			       serviceptr->msock,
 			       serviceptr->tcp_port);
 			serviceptr->tcp_port = 0;
 		}
 		
 		if (serviceptr->sockpath != NULL)
-			syslog(LOG_INFO, "Closing %d listener on '%s'\n",
+		{
+			if (serviceptr->msock == -1)
+				Text = "not closing again";
+			else
+				Text = "Closing";
+
+			syslog(LOG_INFO, "%s %d listener on '%s'\n",
+			       Text,
 			       serviceptr->msock,
 			       serviceptr->sockpath);
+		}
+
                 if (serviceptr->msock != -1)
+		{
 			close(serviceptr->msock);
+			serviceptr->msock = -1;
+		}
+
 		/* If it's a Unix domain socket, remove the file. */
 		if (serviceptr->sockpath != NULL) {
 			unlink(serviceptr->sockpath);
@@ -972,6 +982,7 @@ void sysdep_master_cleanup(void) {
 	CtdlDestroyServiceHook();
 	CtdlDestroyRoomHooks();
 	CtdlDestroySearchHooks();
+	CtdlDestroyDebugTable();
 	#ifdef HAVE_BACKTRACE
 ///	eCrash_Uninit();
 	#endif
@@ -1051,7 +1062,7 @@ void start_daemon(int unused) {
 			}
 			waitpid(current_child, &status, 0);
 		}
-		do_restart = 0;
+
 		nFireUpsNonRestart = nFireUps;
 		
 		/* Exit code 0 means the watcher should exit */
@@ -1095,7 +1106,7 @@ void checkcrash(void)
 			"factor.\n \n"
 			" You can obtain more information about this by enabling core dumps.\n \n"
 			" For more information, please see:\n \n"
-			" http://citadel.org/doku.php/faq:mastering_your_os:gdb#how.do.i.make.my.system.produce.core-files"
+			" http://citadel.org/doku.php?id=faq:mastering_your_os:gdb#how.do.i.make.my.system.produce.core-files"
 			"\n \n"
 
 			" If you have already done this, the core dump is likely to be found at %score.%d\n"
@@ -1146,7 +1157,9 @@ void *worker_thread(void *blah) {
 	CitContext *con = NULL;         /* Temporary context pointer */
 	int i;
 
+	pthread_mutex_lock(&ThreadCountMutex);
 	++num_workers;
+	pthread_mutex_unlock(&ThreadCountMutex);
 
 	while (!server_shutting_down) {
 
@@ -1271,6 +1284,7 @@ do_select:	force_purge = 0;
 					con = CreateNewContext();
 
 					/* Assign our new socket number to it. */
+					con->tcp_port = serviceptr->tcp_port;
 					con->client_socket = ssock;
 					con->h_command_function = serviceptr->h_command_function;
 					con->h_async_function = serviceptr->h_async_function;
@@ -1327,7 +1341,10 @@ do_select:	force_purge = 0;
 
 SKIP_SELECT:
 		/* We're bound to a session */
+		pthread_mutex_lock(&ThreadCountMutex);
 		++active_workers;
+		pthread_mutex_unlock(&ThreadCountMutex);
+
 		if (bind_me != NULL) {
 			become_session(bind_me);
 
@@ -1361,11 +1378,23 @@ SKIP_SELECT:
 
 		dead_session_purge(force_purge);
 		do_housekeeping();
+
+		pthread_mutex_lock(&ThreadCountMutex);
 		--active_workers;
+		if ((active_workers + config.c_min_workers < num_workers) &&
+		    (num_workers > config.c_min_workers))
+		{
+			num_workers--;
+			pthread_mutex_unlock(&ThreadCountMutex);
+			return (NULL);
+		}
+		pthread_mutex_unlock(&ThreadCountMutex);
 	}
 
 	/* If control reaches this point, the server is shutting down */
+	pthread_mutex_lock(&ThreadCountMutex);
 	--num_workers;
+	pthread_mutex_unlock(&ThreadCountMutex);
 	return(NULL);
 }