X-Git-Url: https://code.citadel.org/?a=blobdiff_plain;f=citadel%2Fthreads.c;h=ab7157bd83a5a3cc1738a4debab3c5c5951d68b5;hb=0c90ed3253337bfd864b4d780df4701d0cc0f2c4;hp=9dd6b608ba142f83977719dda9ac6dd9e4e487eb;hpb=4e6233ae0eefb338a0049e29e13d6b7997b9792e;p=citadel.git

diff --git a/citadel/threads.c b/citadel/threads.c
index 9dd6b608b..ab7157bd8 100644
--- a/citadel/threads.c
+++ b/citadel/threads.c
@@ -1,7 +1,7 @@
 /*
  * Thread handling stuff for Citadel server
  *
- * Copyright (c) 1987-2015 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.
@@ -23,16 +23,13 @@
 #include "context.h"
 #include "threads.h"
 
-
 int num_workers = 0;				/* Current number of worker threads */
 int active_workers = 0;				/* Number of ACTIVE worker threads */
 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)
 {
@@ -45,8 +42,6 @@ void InitializeSemaphores(void)
 }
 
 
-
-
 /*
  * Obtain a semaphore lock to begin a critical section.
  * but only if no one else has one
@@ -83,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.
  */
@@ -92,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
@@ -119,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);
 }
 
@@ -134,7 +129,6 @@ 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);
@@ -146,20 +140,12 @@ void InitializeMasterTSD(void) {
 	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_ERR, "pthread_key_create() : %m");
-		abort();
-	}
-
 	pthread_mutex_init(&ThreadCountMutex, NULL);
 
 	/* Second call to module init functions now that threading is up */