X-Git-Url: https://code.citadel.org/?a=blobdiff_plain;f=citadel%2Fthreads.c;h=2f5f8d68222e6f00aa890b22fc4f3165f2c01234;hb=55013f95f08eafe1b375df4241e8defe387c6cdc;hp=cb216febefa00d24a3339a419c103a46564dd358;hpb=d04e1208cf6c71816adb600c6493c48c7b9610f1;p=citadel.git diff --git a/citadel/threads.c b/citadel/threads.c index cb216febe..2f5f8d682 100644 --- a/citadel/threads.c +++ b/citadel/threads.c @@ -4,81 +4,33 @@ * 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 -#include -#include -#include #include -#include -#include -#include -#include +#include #include - -#include "sysdep.h" -#if TIME_WITH_SYS_TIME -# include -# include -#else -# if HAVE_SYS_TIME_H -# include -# else -# include -# endif -#endif - -#ifdef HAVE_SYSCALL_H -# include -#else -# if HAVE_SYS_SYSCALL_H -# include -# endif -#endif - #include - -#include "threads.h" -#include "ctdl_module.h" #include "modules_init.h" -#include "housekeeping.h" -#include "config.h" -#include "citserver.h" -#include "sysdep_decls.h" +#include "serv_extensions.h" +#include "ctdl_module.h" #include "context.h" -#include "event_client.h" +#include "threads.h" -/* - * To create a thread you must call one of the create thread functions. - * You must pass it the address of (a pointer to a CtdlThreadNode initialised to NULL) like this - * struct CtdlThreadNode *node = NULL; - * pass in &node - * If the thread is created *node will point to the thread control structure for the created thread. - * If the thread creation fails *node remains NULL - * Do not free the memory pointed to by *node, it doesn't belong to you. - * This new interface duplicates much of the eCrash stuff. We should go for closer integration since that would - * remove the need for the calls to eCrashRegisterThread and friends - */ - -static int num_threads = 0; /* Current number of threads */ +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;; void InitializeSemaphores(void) @@ -139,27 +91,6 @@ void end_critical_section(int which_one) } -/* - * A function to tell all threads to exit - */ -void CtdlThreadStopAll(void) -{ - terminate_all_sessions(); /* close all client sockets */ - CtdlShutdownServiceHooks(); /* close all listener sockets to prevent new connections */ - PerformSessionHooks(EVT_SHUTDOWN); /* run any registered shutdown hooks */ -} - - -/* - * A function for a thread to check if it has been asked to stop - */ -int CtdlThreadCheckStop(void) -{ - - /* FIXME this needs to do something useful. moar code pls ! */ - - return 0; -} /* @@ -188,6 +119,7 @@ void *CTC_backend(void *supplied_start_routine) start_routine(NULL); + free(mytsd); return(NULL); } @@ -206,8 +138,6 @@ void CtdlThreadCreate(void *(*start_routine)(void*)) 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)); - - ++num_threads; } @@ -215,7 +145,10 @@ void InitializeMasterTSD(void) { memset(&masterTSD, 0, sizeof(struct thread_tsd)); } +extern void ShutDownEventQueues(void); +int EventQShuttingDown = 0; +int EVQShutDown = 0; /* * Initialize the thread system */ @@ -226,28 +159,43 @@ void go_threading(void) abort(); } + pthread_mutex_init(&ThreadCountMutex, NULL); + /* Second call to module init functions now that threading is up */ initialise_modules(1); - CtdlThreadCreate(select_on_master); - - /* FIXME temporary fixed size pool of worker threads */ - CtdlThreadCreate(worker_thread); - CtdlThreadCreate(worker_thread); - CtdlThreadCreate(worker_thread); - CtdlThreadCreate(worker_thread); - CtdlThreadCreate(worker_thread); - CtdlThreadCreate(worker_thread); - CtdlThreadCreate(worker_thread); + /* Begin with one worker thread. We will expand the pool if necessary */ CtdlThreadCreate(worker_thread); - /* At this point I am a union worker and therefore serve no useful purpose. */ + /* The supervisor thread monitors worker threads and spawns more of them if it finds that + * they are all in use. + */ + while (!server_shutting_down) { + if ((active_workers == num_workers) && (num_workers < config.c_max_workers)) { + CtdlThreadCreate(worker_thread); + } + usleep(1000000); + } - while(!CtdlThreadCheckStop()) { - sleep(3); + /* 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); + - /* Shut down */ - CtdlThreadStopAll(); - exit(0); + terminate_all_sessions(); /* close all client sockets */ + CtdlShutdownServiceHooks(); /* close all listener sockets to prevent new connections */ + PerformSessionHooks(EVT_SHUTDOWN); /* run any registered shutdown hooks */ + + int countdown = 30; + while ( (num_workers > 0) && (countdown-- > 0)) { + syslog(LOG_DEBUG, "Waiting %d seconds for %d worker threads to exit", + countdown, num_workers + ); + usleep(1000000); + } }