Initialize TSD key earlier in the startup process. Newer Linux/Linux distributions...

[citadel.git] / citadel / threads.c

diff --git a/citadel/threads.c b/citadel/threads.c
index 4da15e6fb650a4985fa5b4161df92e17706f535a..b0856bf2277e50afd8d298f0e9fd4a4e19dc0d44 100644 (file)
--- 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);
@@ -143,6 +137,7 @@ void CtdlThreadCreate(void *(*start_routine)(void*))
 
 
 void InitializeMasterTSD(void) {
+       TRACE;
        memset(&masterTSD, 0, sizeof(struct thread_tsd));
 }
 
@@ -152,11 +147,6 @@ void InitializeMasterTSD(void) {
  */
 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 */