X-Git-Url: https://code.citadel.org/?a=blobdiff_plain;f=citadel%2Fthreads.c;h=b0856bf2277e50afd8d298f0e9fd4a4e19dc0d44;hb=27014176ee36ef29b80da016f3fd5772189f8377;hp=bea9665c3c5eba17ec14aa8af7fd6e16f59c431d;hpb=f2f392abe416b03750cb053fd0780f62c85d3ae4;p=citadel.git

diff --git a/citadel/threads.c b/citadel/threads.c
index bea9665c3..b0856bf22 100644
--- a/citadel/threads.c
+++ b/citadel/threads.c
@@ -1,7 +1,7 @@
 /*
  * Thread handling stuff for Citadel server
  *
- * Copyright (c) 1987-2011 by the citadel.org team
+ * Copyright (c) 1987-2019 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, version 3.
@@ -12,49 +12,16 @@
  * GNU General Public License for more details.
  */
 
-#include <stdlib.h>
-#include <unistd.h>
-#include <stdio.h>
-#include <sys/types.h>
 #include <errno.h>
-#include <sys/socket.h>
-#include <unistd.h>
-#include <fcntl.h>
-#include <signal.h>
+#include <stdio.h>
 #include <syslog.h>
-
-#include "sysdep.h"
-#if TIME_WITH_SYS_TIME
-# include <sys/time.h>
-# include <time.h>
-#else
-# if HAVE_SYS_TIME_H
-#  include <sys/time.h>
-# else
-#  include <time.h>
-# endif
-#endif
-
-#ifdef HAVE_SYSCALL_H
-# include <syscall.h>
-#else 
-# if HAVE_SYS_SYSCALL_H
-#  include <sys/syscall.h>
-# endif
-#endif
-
 #include <libcitadel.h>
-
-#include "threads.h"
-#include "ctdl_module.h"
 #include "modules_init.h"
-#include "housekeeping.h"
+#include "serv_extensions.h"
+#include "ctdl_module.h"
 #include "config.h"
-#include "citserver.h"
-#include "sysdep_decls.h"
 #include "context.h"
-#include "event_client.h"
-
+#include "threads.h"
 
 int num_workers = 0;				/* Current number of worker threads */
 int active_workers = 0;				/* Number of ACTIVE worker threads */
@@ -62,9 +29,7 @@ pthread_key_t ThreadKey;
 pthread_mutex_t Critters[MAX_SEMAPHORES];	/* Things needing locking */
 struct thread_tsd masterTSD;
 int server_shutting_down = 0;			/* set to nonzero during shutdown */
-
-pthread_mutex_t ThreadCountMutex;;
-
+pthread_mutex_t ThreadCountMutex;
 
 void InitializeSemaphores(void)
 {
@@ -77,8 +42,6 @@ void InitializeSemaphores(void)
 }
 
 
-
-
 /*
  * Obtain a semaphore lock to begin a critical section.
  * but only if no one else has one
@@ -115,6 +78,7 @@ void begin_critical_section(int which_one)
 	pthread_mutex_lock(&Critters[which_one]);
 }
 
+
 /*
  * Release a semaphore lock to end a critical section.
  */
@@ -124,18 +88,18 @@ void end_critical_section(int which_one)
 }
 
 
-
-
 /*
  * Return a pointer to our thread-specific (not session-specific) data.
  */ 
 struct thread_tsd *MyThread(void) {
-        register struct thread_tsd *c;
-        return ((c = (struct thread_tsd *) pthread_getspecific(ThreadKey), c == NULL) ? &masterTSD : c);
+        struct thread_tsd *c = (struct thread_tsd *) pthread_getspecific(ThreadKey) ;
+	if (!c) {
+		return &masterTSD;
+	}
+	return c;
 }
 
 
-
 /* 
  * Called by CtdlThreadCreate()
  * We have to pass through here before starting our thread in order to create a set of data
@@ -151,8 +115,7 @@ void *CTC_backend(void *supplied_start_routine)
 	pthread_setspecific(ThreadKey, (const void *) mytsd);
 
 	start_routine(NULL);
-
-	free(mytsd);
+	// free(mytsd);
 	return(NULL);
 }
 
@@ -166,32 +129,24 @@ void CtdlThreadCreate(void *(*start_routine)(void*))
 	pthread_attr_t attr;
 	int ret = 0;
 
-
 	ret = pthread_attr_init(&attr);
 	ret = pthread_attr_setstacksize(&attr, THREADSTACKSIZE);
 	ret = pthread_create(&thread, &attr, CTC_backend, (void *)start_routine);
-	if (ret != 0) syslog(LOG_EMERG, "pthread_create() : %s", strerror(errno));
+	if (ret != 0) syslog(LOG_ERR, "pthread_create() : %m");
 }
 
 
 void InitializeMasterTSD(void) {
+	TRACE;
 	memset(&masterTSD, 0, sizeof(struct thread_tsd));
 }
 
-extern void ShutDownEventQueues(void);
 
-int EventQShuttingDown = 0;
-int EVQShutDown = 0;
 /*
  * Initialize the thread system
  */
 void go_threading(void)
 {
-	if (pthread_key_create(&ThreadKey, NULL) != 0) {
-		syslog(LOG_EMERG, "pthread_key_create() : %s", strerror(errno));
-		abort();
-	}
-
 	pthread_mutex_init(&ThreadCountMutex, NULL);
 
 	/* Second call to module init functions now that threading is up */
@@ -204,22 +159,13 @@ void go_threading(void)
 	 * they are all in use.
 	 */
 	while (!server_shutting_down) {
-		if ((active_workers == num_workers) && (num_workers < config.c_max_workers)) {
+		if ((active_workers == num_workers) && (num_workers < CtdlGetConfigInt("c_max_workers"))) {
 			CtdlThreadCreate(worker_thread);
 		}
 		usleep(1000000);
 	}
 
 	/* When we get to this point we are getting ready to shut down our Citadel server */
-	if (!EventQShuttingDown)
-	{
-		EventQShuttingDown = 1;
-		ShutDownEventQueues();
-	}
-	while (!EVQShutDown)
-		usleep(1000000);
-
-
 	terminate_all_sessions();		/* close all client sockets */
 	CtdlShutdownServiceHooks();		/* close all listener sockets to prevent new connections */
 	PerformSessionHooks(EVT_SHUTDOWN);	/* run any registered shutdown hooks */