*
*/
+#include <sys/types.h>
#include <errno.h>
-
+#include <sys/socket.h>
+#include <unistd.h>
+#include <fcntl.h>
+#include <signal.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
+
#include "threads.h"
#include "ctdl_module.h"
#include "modules_init.h"
#include "housekeeping.h"
#include "config.h"
+#include "citserver.h"
+#include "sysdep_decls.h"
+
+/*
+ * define this to use the new worker_thread method of handling connections
+ */
+//#define NEW_WORKER
/*
* New thread interface.
static int num_threads = 0; /* Current number of threads */
static int num_workers = 0; /* Current number of worker threads */
-struct CtdlThreadNode *CtdlThreadList = NULL;
-struct CtdlThreadNode *CtdlThreadSchedList = NULL;
+CtdlThreadNode *CtdlThreadList = NULL;
+CtdlThreadNode *CtdlThreadSchedList = NULL;
-/*
- * Condition variable and Mutex for thread garbage collection
- */
-/*static pthread_mutex_t thread_gc_mutex = PTHREAD_MUTEX_INITIALIZER;
-static pthread_cond_t thread_gc_cond = PTHREAD_COND_INITIALIZER;
-*/
-static pthread_t GC_thread;
+static CtdlThreadNode *GC_thread = NULL;
static char *CtdlThreadStates[CTDL_THREAD_LAST_STATE];
double CtdlThreadLoadAvg = 0;
double CtdlThreadWorkerAvg = 0;
-pthread_key_t ThreadKey;
+citthread_key_t ThreadKey;
-pthread_mutex_t Critters[MAX_SEMAPHORES]; /* Things needing locking */
+citthread_mutex_t Critters[MAX_SEMAPHORES]; /* Things needing locking */
/* Set up a bunch of semaphores to be used for critical sections */
for (i=0; i<MAX_SEMAPHORES; ++i) {
- pthread_mutex_init(&Critters[i], NULL);
+ citthread_mutex_init(&Critters[i], NULL);
}
}
) {
cdb_check_handles();
}
- return (pthread_mutex_trylock(&Critters[which_one]));
+ return (citthread_mutex_trylock(&Critters[which_one]));
}
) {
cdb_check_handles();
}
- pthread_mutex_lock(&Critters[which_one]);
+ citthread_mutex_lock(&Critters[which_one]);
}
/*
*/
void end_critical_section(int which_one)
{
- pthread_mutex_unlock(&Critters[which_one]);
+ citthread_mutex_unlock(&Critters[which_one]);
}
{
int ret;
- if ((ret = pthread_key_create(&ThreadKey, ctdl_thread_internal_dest_tsd))) {
- lprintf(CTDL_EMERG, "pthread_key_create: %s\n",
- strerror(ret));
+ if ((ret = citthread_key_create(&ThreadKey, ctdl_thread_internal_dest_tsd))) {
+ CtdlLogPrintf(CTDL_EMERG, "citthread_key_create: %s\n", strerror(ret));
exit(CTDLEXIT_DB);
}
}
{
ThreadTSD *tsd;
- if (pthread_getspecific(ThreadKey) != NULL)
+ if (citthread_getspecific(ThreadKey) != NULL)
return;
tsd = malloc(sizeof(ThreadTSD));
memset(tsd->cursors, 0, sizeof tsd->cursors);
tsd->self = NULL;
- pthread_setspecific(ThreadKey, tsd);
+ citthread_setspecific(ThreadKey, tsd);
}
void ctdl_thread_internal_free_tsd(void)
{
- ctdl_thread_internal_dest_tsd(pthread_getspecific(ThreadKey));
- pthread_setspecific(ThreadKey, NULL);
+ ctdl_thread_internal_dest_tsd(citthread_getspecific(ThreadKey));
+ citthread_setspecific(ThreadKey, NULL);
}
void ctdl_thread_internal_cleanup(void)
{
int i;
- struct CtdlThreadNode *this_thread, *that_thread;
+ CtdlThreadNode *this_thread, *that_thread;
for (i=0; i<CTDL_THREAD_LAST_STATE; i++)
{
{
that_thread = this_thread;
this_thread = this_thread->next;
- pthread_mutex_destroy(&that_thread->ThreadMutex);
- pthread_cond_destroy(&that_thread->ThreadCond);
- pthread_mutex_destroy(&that_thread->SleepMutex);
- pthread_cond_destroy(&that_thread->SleepCond);
- pthread_attr_destroy(&that_thread->attr);
+ citthread_mutex_destroy(&that_thread->ThreadMutex);
+ citthread_cond_destroy(&that_thread->ThreadCond);
+ citthread_mutex_destroy(&that_thread->SleepMutex);
+ citthread_cond_destroy(&that_thread->SleepCond);
+ citthread_attr_destroy(&that_thread->attr);
free(that_thread);
}
ctdl_thread_internal_free_tsd();
void ctdl_thread_internal_init(void)
{
- struct CtdlThreadNode *this_thread;
+ CtdlThreadNode *this_thread;
int ret = 0;
- GC_thread = pthread_self();
CtdlThreadStates[CTDL_THREAD_INVALID] = strdup ("Invalid Thread");
CtdlThreadStates[CTDL_THREAD_VALID] = strdup("Valid Thread");
CtdlThreadStates[CTDL_THREAD_CREATE] = strdup("Thread being Created");
CtdlThreadStates[CTDL_THREAD_BLOCKED] = strdup("Thread Blocked");
/* Get ourself a thread entry */
- this_thread = malloc(sizeof(struct CtdlThreadNode));
+ this_thread = malloc(sizeof(CtdlThreadNode));
if (this_thread == NULL) {
CtdlLogPrintf(CTDL_EMERG, "Thread system, can't allocate CtdlThreadNode, exiting\n");
return;
}
// Ensuring this is zero'd means we make sure the thread doesn't start doing its thing until we are ready.
- memset (this_thread, 0, sizeof(struct CtdlThreadNode));
+ memset (this_thread, 0, sizeof(CtdlThreadNode));
- pthread_mutex_init (&(this_thread->ThreadMutex), NULL);
- pthread_cond_init (&(this_thread->ThreadCond), NULL);
- pthread_mutex_init (&(this_thread->SleepMutex), NULL);
- pthread_cond_init (&(this_thread->SleepCond), NULL);
+ citthread_mutex_init (&(this_thread->ThreadMutex), NULL);
+ citthread_cond_init (&(this_thread->ThreadCond), NULL);
+ citthread_mutex_init (&(this_thread->SleepMutex), NULL);
+ citthread_cond_init (&(this_thread->SleepCond), NULL);
/* We are garbage collector so create us as running */
this_thread->state = CTDL_THREAD_RUNNING;
- if ((ret = pthread_attr_init(&this_thread->attr))) {
- CtdlLogPrintf(CTDL_EMERG, "Thread system, pthread_attr_init: %s\n", strerror(ret));
+ if ((ret = citthread_attr_init(&this_thread->attr))) {
+ CtdlLogPrintf(CTDL_EMERG, "Thread system, citthread_attr_init: %s\n", strerror(ret));
free(this_thread);
return;
}
this_thread->name = "Garbage Collection Thread";
- this_thread->tid = GC_thread;
+ this_thread->tid = citthread_self();
+ GC_thread = this_thread;
CT = this_thread;
num_threads++; // Increase the count of threads in the system.
/*
* A function to update a threads load averages
*/
- void ctdl_thread_internal_update_avgs(struct CtdlThreadNode *this_thread)
+ void ctdl_thread_internal_update_avgs(CtdlThreadNode *this_thread)
{
struct timeval now, result;
double last_duration;
gettimeofday(&now, NULL);
timersub(&now, &(this_thread->last_state_change), &result);
- pthread_mutex_lock(&this_thread->ThreadMutex);
+ /* I don't think these mutex's are needed here */
+ citthread_mutex_lock(&this_thread->ThreadMutex);
// result now has a timeval for the time we spent in the last state since we last updated
last_duration = (double)result.tv_sec + ((double)result.tv_usec / (double) 1000000);
if (this_thread->state == CTDL_THREAD_SLEEPING)
if (this_thread->state == CTDL_THREAD_BLOCKED)
this_thread->avg_blocked += last_duration;
memcpy (&this_thread->last_state_change, &now, sizeof (struct timeval));
- pthread_mutex_unlock(&this_thread->ThreadMutex);
+ citthread_mutex_unlock(&this_thread->ThreadMutex);
}
/*
* A function to chenge the state of a thread
*/
-void ctdl_thread_internal_change_state (struct CtdlThreadNode *this_thread, enum CtdlThreadState new_state)
+void ctdl_thread_internal_change_state (CtdlThreadNode *this_thread, enum CtdlThreadState new_state)
{
/*
* Wether we change state or not we need update the load values
*/
ctdl_thread_internal_update_avgs(this_thread);
- pthread_mutex_lock(&this_thread->ThreadMutex); /* To prevent race condition of a sleeping thread */
+ /* This mutex not needed here? */
+ citthread_mutex_lock(&this_thread->ThreadMutex); /* To prevent race condition of a sleeping thread */
if ((new_state == CTDL_THREAD_STOP_REQ) && (this_thread->state > CTDL_THREAD_STOP_REQ))
this_thread->state = new_state;
if (((new_state == CTDL_THREAD_SLEEPING) || (new_state == CTDL_THREAD_BLOCKED)) && (this_thread->state == CTDL_THREAD_RUNNING))
this_thread->state = new_state;
if ((new_state == CTDL_THREAD_RUNNING) && ((this_thread->state == CTDL_THREAD_SLEEPING) || (this_thread->state == CTDL_THREAD_BLOCKED)))
this_thread->state = new_state;
- pthread_mutex_unlock(&this_thread->ThreadMutex);
+ citthread_mutex_unlock(&this_thread->ThreadMutex);
}
//FIXME: The signalling of the condition should not be in the critical_section
// We need to build a list of threads we are going to signal and then signal them afterwards
- struct CtdlThreadNode *this_thread;
+ CtdlThreadNode *this_thread;
begin_critical_section(S_THREAD_LIST);
this_thread = CtdlThreadList;
+ // Ask the GC thread to stop first so everything knows we are shutting down.
+ GC_thread->state = CTDL_THREAD_STOP_REQ;
while(this_thread)
{
#ifdef THREADS_USESIGNALS
- pthread_kill(this_thread->tid, SIGHUP);
+ if (!citthread_equal(this_thread->tid, GC_thread->tid))
+ citthread_kill(this_thread->tid, SIGHUP);
#endif
ctdl_thread_internal_change_state (this_thread, CTDL_THREAD_STOP_REQ);
- pthread_cond_signal(&this_thread->ThreadCond);
- pthread_cond_signal(&this_thread->SleepCond);
- CtdlLogPrintf(CTDL_DEBUG, "Thread system stopping thread \"%s\" (%ld).\n", this_thread->name, this_thread->tid);
+ citthread_cond_signal(&this_thread->ThreadCond);
+ citthread_cond_signal(&this_thread->SleepCond);
+ this_thread->stop_ticker = time(NULL);
+ CtdlLogPrintf(CTDL_DEBUG, "Thread system stopping thread \"%s\" (0x%08lx).\n",
+ this_thread->name, this_thread->tid);
this_thread = this_thread->next;
}
end_critical_section(S_THREAD_LIST);
*/
void CtdlThreadWakeAll(void)
{
- struct CtdlThreadNode *this_thread;
+ CtdlThreadNode *this_thread;
CtdlLogPrintf(CTDL_DEBUG, "Thread system waking all threads.\n");
{
if (!this_thread->thread_func)
{
- pthread_cond_signal(&this_thread->ThreadCond);
- pthread_cond_signal(&this_thread->SleepCond);
+ citthread_cond_signal(&this_thread->ThreadCond);
+ citthread_cond_signal(&this_thread->SleepCond);
}
this_thread = this_thread->next;
}
CtdlLogPrintf(CTDL_WARNING, "Thread system WARNING. Attempt to CtdlThreadRename() a non thread. %s\n", name);
return NULL;
}
-// FIXME: do we need this lock? I think not since the pointer asignmaent should be atomic
- pthread_mutex_lock(&CT->ThreadMutex);
old_name = CT->name;
if (name)
CT->name = name;
- pthread_mutex_unlock(&CT->ThreadMutex);
return (old_name);
}
/*
* A function to force a thread to exit
*/
-void CtdlThreadCancel(struct CtdlThreadNode *thread)
+void CtdlThreadCancel(CtdlThreadNode *thread)
{
- struct CtdlThreadNode *this_thread;
+ CtdlThreadNode *this_thread;
if (!thread)
this_thread = CT;
}
ctdl_thread_internal_change_state (this_thread, CTDL_THREAD_CANCELLED);
- pthread_cancel(this_thread->tid);
+ citthread_cancel(this_thread->tid);
}
-
/*
* A function for a thread to check if it has been asked to stop
*/
state = CT->state;
-#ifdef THREADS_USERSIGNALS
+#ifdef THREADS_USESIGNALS
if (CT->signal)
+ {
CtdlLogPrintf(CTDL_DEBUG, "Thread \"%s\" caught signal %d.\n", CT->name, CT->signal);
+ CT->signal = 0;
+ }
#endif
- pthread_mutex_lock(&CT->ThreadMutex);
if(state == CTDL_THREAD_STOP_REQ)
{
CT->state = CTDL_THREAD_STOPPING;
- pthread_mutex_unlock(&CT->ThreadMutex);
return -1;
}
else if((state < CTDL_THREAD_STOP_REQ) && (state > CTDL_THREAD_CREATE))
{
- pthread_mutex_unlock(&CT->ThreadMutex);
return -1;
}
- pthread_mutex_unlock(&CT->ThreadMutex);
return 0;
}
* A function to ask a thread to exit
* The thread must call CtdlThreadCheckStop() periodically to determine if it should exit
*/
-void CtdlThreadStop(struct CtdlThreadNode *thread)
+void CtdlThreadStop(CtdlThreadNode *thread)
{
- struct CtdlThreadNode *this_thread;
+ CtdlThreadNode *this_thread;
if (!thread)
this_thread = CT;
if (!(this_thread->thread_func))
return; // Don't stop garbage collector
#ifdef THREADS_USESIGNALS
- pthread_kill(this_thread->tid, SIGHUP);
+ if (!citthread_equal(this_thread->tid, GC_thread->tid))
+ citthread_kill(this_thread->tid, SIGHUP);
#endif
ctdl_thread_internal_change_state (this_thread, CTDL_THREAD_STOP_REQ);
- pthread_cond_signal(&this_thread->ThreadCond);
- pthread_cond_signal(&this_thread->SleepCond);
+ citthread_cond_signal(&this_thread->ThreadCond);
+ citthread_cond_signal(&this_thread->SleepCond);
+ this_thread->stop_ticker = time(NULL);
}
/*
ctdl_thread_internal_change_state (CT, CTDL_THREAD_SLEEPING);
- pthread_mutex_lock(&CT->ThreadMutex); /* Prevent something asking us to awaken before we've gone to sleep */
- pthread_cond_timedwait(&CT->SleepCond, &CT->ThreadMutex, &wake_time);
- pthread_mutex_unlock(&CT->ThreadMutex);
+ citthread_mutex_lock(&CT->ThreadMutex); /* Prevent something asking us to awaken before we've gone to sleep */
+ citthread_cond_timedwait(&CT->SleepCond, &CT->ThreadMutex, &wake_time);
+ citthread_mutex_unlock(&CT->ThreadMutex);
ctdl_thread_internal_change_state (CT, CTDL_THREAD_RUNNING);
}
* In here we were called by the current thread because it is exiting
* NB. WE ARE THE CURRENT THREAD
*/
- CtdlLogPrintf(CTDL_NOTICE, "Thread \"%s\" (%ld) exited.\n", CT->name, CT->tid);
+ CtdlLogPrintf(CTDL_NOTICE, "Thread \"%s\" (0x%08lx) exited.\n", CT->name, CT->tid);
#ifdef HAVE_BACKTRACE
eCrash_UnregisterThread();
#endif
- pthread_mutex_lock(&CT->ThreadMutex);
+ citthread_mutex_lock(&CT->ThreadMutex);
CT->state = CTDL_THREAD_EXITED; // needs to be last thing else house keeping will unlink us too early
- pthread_mutex_unlock(&CT->ThreadMutex);
+ citthread_mutex_unlock(&CT->ThreadMutex);
}
/*
*/
void ctdl_thread_internal_calc_loadavg(void)
{
- struct CtdlThreadNode *that_thread;
+ CtdlThreadNode *that_thread;
double load_avg, worker_avg;
int workers = 0;
{
/* Update load averages */
ctdl_thread_internal_update_avgs(that_thread);
- pthread_mutex_lock(&that_thread->ThreadMutex);
- that_thread->load_avg = that_thread->avg_sleeping + that_thread->avg_running + that_thread->avg_blocked;
- that_thread->load_avg = that_thread->avg_running / that_thread->load_avg * 100;
+ citthread_mutex_lock(&that_thread->ThreadMutex);
+ that_thread->load_avg = (that_thread->avg_sleeping + that_thread->avg_running) / (that_thread->avg_sleeping + that_thread->avg_running + that_thread->avg_blocked) * 100;
that_thread->avg_sleeping /= 2;
that_thread->avg_running /= 2;
that_thread->avg_blocked /= 2;
workers++;
}
#ifdef WITH_THREADLOG
- CtdlLogPrintf(CTDL_DEBUG, "CtdlThread, \"%s\" (%ld) \"%s\" %f %f %f %f.\n",
+ CtdlLogPrintf(CTDL_DEBUG, "CtdlThread, \"%s\" (%lu) \"%s\" %.2f %.2f %.2f %.2f\n",
that_thread->name,
that_thread->tid,
CtdlThreadStates[that_thread->state],
that_thread->avg_blocked,
that_thread->load_avg);
#endif
- pthread_mutex_unlock(&that_thread->ThreadMutex);
+ citthread_mutex_unlock(&that_thread->ThreadMutex);
that_thread = that_thread->next;
}
CtdlThreadLoadAvg = load_avg/num_threads;
CtdlThreadWorkerAvg = worker_avg/workers;
#ifdef WITH_THREADLOG
- CtdlLogPrintf(CTDL_INFO, "System load average %f, workers averag %f, threads %d, workers %d, sessions %d\n", CtdlThreadLoadAvg, CtdlThreadWorkerAvg, num_threads, num_workers, num_sessions);
+ CtdlLogPrintf(CTDL_INFO, "System load average %.2f, workers averag %.2f, threads %d, workers %d, sessions %d\n", CtdlThreadLoadAvg, CtdlThreadWorkerAvg, num_threads, num_workers, num_sessions);
#endif
}
*/
void CtdlThreadGC (void)
{
- struct CtdlThreadNode *this_thread, *that_thread;
- int workers = 0;
+ CtdlThreadNode *this_thread, *that_thread;
+ int workers = 0, sys_workers;
int ret=0;
begin_critical_section(S_THREAD_LIST);
that_thread = this_thread;
this_thread = this_thread->next;
+ if ((that_thread->state == CTDL_THREAD_STOP_REQ || that_thread->state == CTDL_THREAD_STOPPING)
+ && (!citthread_equal(that_thread->tid, citthread_self())))
+ CtdlLogPrintf(CTDL_DEBUG, "Waiting for thread %s (0x%08lx) to exit.\n", that_thread->name, that_thread->tid);
+ else
+ {
+ /**
+ * Catch the situation where a worker was asked to stop but couldn't and we are not
+ * shutting down.
+ */
+ that_thread->stop_ticker = 0;
+ }
+
+ if (that_thread->stop_ticker + 5 == time(NULL))
+ {
+ CtdlLogPrintf(CTDL_DEBUG, "Thread System: The thread \"%s\" (0x%08lx) failed to self terminate within 5 ticks. It would be cancelled now.\n", that_thread->name, that_thread->tid);
+ if ((that_thread->flags & CTDLTHREAD_WORKER) == 0)
+ CtdlLogPrintf(CTDL_INFO, "Thread System: A non worker thread would have been canceled this may cause message loss.\n");
+// that_thread->state = CTDL_THREAD_CANCELLED;
+ that_thread->stop_ticker++;
+// citthread_cancel(that_thread->tid);
+// continue;
+ }
+
/* Do we need to clean up this thread? */
- pthread_mutex_lock(&that_thread->ThreadMutex);
- if (that_thread->state != CTDL_THREAD_EXITED)
+ if ((that_thread->state != CTDL_THREAD_EXITED) && (that_thread->state != CTDL_THREAD_CANCELLED))
{
if(that_thread->flags & CTDLTHREAD_WORKER)
workers++; /* Sanity check on number of worker threads */
- pthread_mutex_unlock(&that_thread->ThreadMutex);
continue;
}
- if (pthread_equal(that_thread->tid, pthread_self()) && that_thread->thread_func)
+ if (citthread_equal(that_thread->tid, citthread_self()) && that_thread->thread_func)
{ /* Sanity check */
- pthread_mutex_unlock(&that_thread->ThreadMutex);
end_critical_section(S_THREAD_LIST);
CtdlLogPrintf(CTDL_EMERG, "Thread system PANIC, a thread is trying to clean up after itself.\n");
abort();
if (num_threads <= 0)
{ /* Sanity check */
- pthread_mutex_unlock(&that_thread->ThreadMutex);
end_critical_section(S_THREAD_LIST);
CtdlLogPrintf(CTDL_EMERG, "Thread system PANIC, num_threads <= 0 and trying to do Garbage Collection.\n");
abort();
if(that_thread->next)
that_thread->next->prev = that_thread->prev;
- pthread_mutex_unlock(&that_thread->ThreadMutex);
- pthread_cond_signal(&that_thread->ThreadCond);
- pthread_cond_signal(&that_thread->SleepCond); // Make sure this thread is awake
- pthread_mutex_lock(&that_thread->ThreadMutex); // Make sure it has done what its doing
- pthread_mutex_unlock(&that_thread->ThreadMutex);
+ citthread_cond_signal(&that_thread->ThreadCond);
+ citthread_cond_signal(&that_thread->SleepCond); // Make sure this thread is awake
+ citthread_mutex_lock(&that_thread->ThreadMutex); // Make sure it has done what its doing
+ citthread_mutex_unlock(&that_thread->ThreadMutex);
/*
* Join on the thread to do clean up and prevent memory leaks
* Also makes sure the thread has cleaned up after itself before we remove it from the list
* We can join on the garbage collector thread the join should just return EDEADLCK
*/
- ret = pthread_join (that_thread->tid, NULL);
+ ret = citthread_join (that_thread->tid, NULL);
if (ret == EDEADLK)
CtdlLogPrintf(CTDL_DEBUG, "Garbage collection on own thread.\n");
else if (ret == EINVAL)
else if (ret == ESRCH)
CtdlLogPrintf(CTDL_DEBUG, "Garbage collection, no thread to join on.\n");
else if (ret != 0)
- CtdlLogPrintf(CTDL_DEBUG, "Garbage collection, pthread_join returned an unknown error.\n");
+ CtdlLogPrintf(CTDL_DEBUG, "Garbage collection, citthread_join returned an unknown error(%d).\n", ret);
/*
* Now we own that thread entry
*/
- CtdlLogPrintf(CTDL_INFO, "Garbage Collection for thread \"%s\" (%ld).\n", that_thread->name, that_thread->tid);
- pthread_mutex_destroy(&that_thread->ThreadMutex);
- pthread_cond_destroy(&that_thread->ThreadCond);
- pthread_mutex_destroy(&that_thread->SleepMutex);
- pthread_cond_destroy(&that_thread->SleepCond);
- pthread_attr_destroy(&that_thread->attr);
+ CtdlLogPrintf(CTDL_INFO, "Garbage Collection for thread \"%s\" (0x%08lx).\n",
+ that_thread->name, that_thread->tid);
+ citthread_mutex_destroy(&that_thread->ThreadMutex);
+ citthread_cond_destroy(&that_thread->ThreadCond);
+ citthread_mutex_destroy(&that_thread->SleepMutex);
+ citthread_cond_destroy(&that_thread->SleepCond);
+ citthread_attr_destroy(&that_thread->attr);
free(that_thread);
}
+ sys_workers = num_workers;
+ end_critical_section(S_THREAD_LIST);
/* Sanity check number of worker threads */
- if (workers != num_workers)
+ if (workers != sys_workers)
{
- end_critical_section(S_THREAD_LIST);
CtdlLogPrintf(CTDL_EMERG,
"Thread system PANIC, discrepancy in number of worker threads. Counted %d, should be %d.\n",
- workers, num_workers
+ workers, sys_workers
);
abort();
}
- end_critical_section(S_THREAD_LIST);
}
*/
static void *ctdl_internal_thread_func (void *arg)
{
- struct CtdlThreadNode *this_thread;
+ CtdlThreadNode *this_thread;
void *ret = NULL;
/* lock and unlock the thread list.
* can continue its execution.
*/
begin_critical_section(S_THREAD_LIST);
- this_thread = (struct CtdlThreadNode *) arg;
+ this_thread = (CtdlThreadNode *) arg;
gettimeofday(&this_thread->start_time, NULL); /* Time this thread started */
- pthread_mutex_lock(&this_thread->ThreadMutex);
+// citthread_mutex_lock(&this_thread->ThreadMutex);
// Register the cleanup function to take care of when we exit.
- pthread_cleanup_push(ctdl_internal_thread_cleanup, NULL);
+ citthread_cleanup_push(ctdl_internal_thread_cleanup, NULL);
// Get our thread data structure
CtdlThreadAllocTSD();
CT = this_thread;
* Other wise there is a window to allow this threads creation to continue to full grown and
* therby prevent a shutdown of the server.
*/
- pthread_mutex_unlock(&this_thread->ThreadMutex);
+// citthread_mutex_unlock(&this_thread->ThreadMutex);
if (!CtdlThreadCheckStop())
{
- pthread_mutex_lock(&this_thread->ThreadMutex);
+ citthread_mutex_lock(&this_thread->ThreadMutex);
this_thread->state = CTDL_THREAD_RUNNING;
- pthread_mutex_unlock(&this_thread->ThreadMutex);
+ citthread_mutex_unlock(&this_thread->ThreadMutex);
}
end_critical_section(S_THREAD_LIST);
#endif
// Tell the world we are here
- CtdlLogPrintf(CTDL_NOTICE, "Created a new thread \"%s\" (%ld). \n", this_thread->name, this_thread->tid);
-
-
+ CtdlLogPrintf(CTDL_NOTICE, "Created a new thread \"%s\" (0x%08lx).\n",
+ this_thread->name, this_thread->tid);
/*
* run the thread to do the work but only if we haven't been asked to stop
* Our thread is exiting either because it wanted to end or because the server is stopping
* We need to clean up
*/
- pthread_cleanup_pop(1); // Execute our cleanup routine and remove it
+ citthread_cleanup_pop(1); // Execute our cleanup routine and remove it
return(ret);
}
-
+
+
/*
- * Internal function to create a thread.
- * Must be called from within a S_THREAD_LIST critical section
- */
-struct CtdlThreadNode *ctdl_internal_create_thread(char *name, long flags, void *(*thread_func) (void *arg), void *args)
+ * Function to initialise an empty thread structure
+ */
+CtdlThreadNode *ctdl_internal_init_thread_struct(CtdlThreadNode *this_thread, long flags)
{
int ret = 0;
- struct CtdlThreadNode *this_thread;
-
- if (num_threads >= 32767)
- {
- CtdlLogPrintf(CTDL_EMERG, "Thread system. Thread list full.\n");
- return NULL;
- }
-
- this_thread = malloc(sizeof(struct CtdlThreadNode));
- if (this_thread == NULL) {
- CtdlLogPrintf(CTDL_EMERG, "Thread system, can't allocate CtdlThreadNode, exiting\n");
- return NULL;
- }
+
// Ensuring this is zero'd means we make sure the thread doesn't start doing its thing until we are ready.
- memset (this_thread, 0, sizeof(struct CtdlThreadNode));
+ memset (this_thread, 0, sizeof(CtdlThreadNode));
/* Create the mutex's early so we can use them */
- pthread_mutex_init (&(this_thread->ThreadMutex), NULL);
- pthread_cond_init (&(this_thread->ThreadCond), NULL);
- pthread_mutex_init (&(this_thread->SleepMutex), NULL);
- pthread_cond_init (&(this_thread->SleepCond), NULL);
-
- pthread_mutex_lock(&this_thread->ThreadMutex);
+ citthread_mutex_init (&(this_thread->ThreadMutex), NULL);
+ citthread_cond_init (&(this_thread->ThreadCond), NULL);
+ citthread_mutex_init (&(this_thread->SleepMutex), NULL);
+ citthread_cond_init (&(this_thread->SleepCond), NULL);
this_thread->state = CTDL_THREAD_CREATE;
- if ((ret = pthread_attr_init(&this_thread->attr))) {
- pthread_mutex_unlock(&this_thread->ThreadMutex);
- pthread_mutex_destroy(&(this_thread->ThreadMutex));
- pthread_cond_destroy(&(this_thread->ThreadCond));
- pthread_mutex_destroy(&(this_thread->SleepMutex));
- pthread_cond_destroy(&(this_thread->SleepCond));
- CtdlLogPrintf(CTDL_EMERG, "Thread system, pthread_attr_init: %s\n", strerror(ret));
+ if ((ret = citthread_attr_init(&this_thread->attr))) {
+ citthread_mutex_unlock(&this_thread->ThreadMutex);
+ citthread_mutex_destroy(&(this_thread->ThreadMutex));
+ citthread_cond_destroy(&(this_thread->ThreadCond));
+ citthread_mutex_destroy(&(this_thread->SleepMutex));
+ citthread_cond_destroy(&(this_thread->SleepCond));
+ CtdlLogPrintf(CTDL_EMERG, "Thread system, citthread_attr_init: %s\n", strerror(ret));
free(this_thread);
return NULL;
}
#ifdef WITH_THREADLOG
CtdlLogPrintf(CTDL_INFO, "Thread system. Creating BIG STACK thread.\n");
#endif
- if ((ret = pthread_attr_setstacksize(&this_thread->attr, THREADSTACKSIZE))) {
- pthread_mutex_unlock(&this_thread->ThreadMutex);
- pthread_mutex_destroy(&(this_thread->ThreadMutex));
- pthread_cond_destroy(&(this_thread->ThreadCond));
- pthread_mutex_destroy(&(this_thread->SleepMutex));
- pthread_cond_destroy(&(this_thread->SleepCond));
- pthread_attr_destroy(&this_thread->attr);
- CtdlLogPrintf(CTDL_EMERG, "Thread system, pthread_attr_setstacksize: %s\n",
+ if ((ret = citthread_attr_setstacksize(&this_thread->attr, THREADSTACKSIZE))) {
+ citthread_mutex_unlock(&this_thread->ThreadMutex);
+ citthread_mutex_destroy(&(this_thread->ThreadMutex));
+ citthread_cond_destroy(&(this_thread->ThreadCond));
+ citthread_mutex_destroy(&(this_thread->SleepMutex));
+ citthread_cond_destroy(&(this_thread->SleepCond));
+ citthread_attr_destroy(&this_thread->attr);
+ CtdlLogPrintf(CTDL_EMERG, "Thread system, citthread_attr_setstacksize: %s\n",
strerror(ret));
free(this_thread);
return NULL;
}
}
+ /* Set this new thread with an avg_blocked of 2. We do this so that its creation affects the
+ * load average for the system. If we don't do this then we create a mass of threads at the same time
+ * because the creation didn't affect the load average.
+ */
+ this_thread->avg_blocked = 2;
+
+ return (this_thread);
+}
+
+
+
+
+/*
+ * Internal function to create a thread.
+ */
+CtdlThreadNode *ctdl_internal_create_thread(char *name, long flags, void *(*thread_func) (void *arg), void *args)
+{
+ int ret = 0;
+ CtdlThreadNode *this_thread;
+
+ if (num_threads >= 32767)
+ {
+ CtdlLogPrintf(CTDL_EMERG, "Thread system. Thread list full.\n");
+ return NULL;
+ }
+
+ this_thread = malloc(sizeof(CtdlThreadNode));
+ if (this_thread == NULL) {
+ CtdlLogPrintf(CTDL_EMERG, "Thread system, can't allocate CtdlThreadNode, exiting\n");
+ return NULL;
+ }
+
+ /* Initialise the thread structure */
+ if (ctdl_internal_init_thread_struct(this_thread, flags) == NULL)
+ {
+ free(this_thread);
+ CtdlLogPrintf(CTDL_EMERG, "Thread system, can't initialise CtdlThreadNode, exiting\n");
+ return NULL;
+ }
/*
* If we got here we are going to create the thread so we must initilise the structure
* first because most implimentations of threading can't create it in a stopped state
this_thread->flags = flags;
this_thread->thread_func = thread_func;
this_thread->user_args = args;
- /* Set this new thread with an avg_blocked of 2. We do this so that its creation affects the
- * load average for the system. If we don't do this then we create a mass of threads at the same time
- * because the creation didn't affect the load average.
- */
- this_thread->avg_blocked = 2;
+// citthread_mutex_lock(&this_thread->ThreadMutex);
+
+ begin_critical_section(S_THREAD_LIST);
/*
* We pass this_thread into the thread as its args so that it can find out information
* about itself and it has a bit of storage space for itself, not to mention that the REAL
* thread function needs to finish off the setup of the structure
*/
- if ((ret = pthread_create(&this_thread->tid, &this_thread->attr, ctdl_internal_thread_func, this_thread) != 0))
+ if ((ret = citthread_create(&this_thread->tid, &this_thread->attr, ctdl_internal_thread_func, this_thread) != 0))
{
-
+ end_critical_section(S_THREAD_LIST);
CtdlLogPrintf(CTDL_ALERT, "Thread system, Can't create thread: %s\n",
strerror(ret));
- pthread_mutex_unlock(&this_thread->ThreadMutex);
- pthread_mutex_destroy(&(this_thread->ThreadMutex));
- pthread_cond_destroy(&(this_thread->ThreadCond));
- pthread_mutex_destroy(&(this_thread->SleepMutex));
- pthread_cond_destroy(&(this_thread->SleepCond));
- pthread_attr_destroy(&this_thread->attr);
+ citthread_mutex_unlock(&this_thread->ThreadMutex);
+ citthread_mutex_destroy(&(this_thread->ThreadMutex));
+ citthread_cond_destroy(&(this_thread->ThreadCond));
+ citthread_mutex_destroy(&(this_thread->SleepMutex));
+ citthread_cond_destroy(&(this_thread->SleepCond));
+ citthread_attr_destroy(&this_thread->attr);
free(this_thread);
return NULL;
}
CtdlThreadList = this_thread;
if (this_thread->next)
this_thread->next->prev = this_thread;
+ ctdl_thread_internal_calc_loadavg();
- pthread_mutex_unlock(&this_thread->ThreadMutex);
+// citthread_mutex_unlock(&this_thread->ThreadMutex);
+ end_critical_section(S_THREAD_LIST);
- ctdl_thread_internal_calc_loadavg();
return this_thread;
}
* char *name = name to give to thread, if NULL, use generic name
* int flags = flags to determine type of thread and standard facilities
*/
-struct CtdlThreadNode *CtdlThreadCreate(char *name, long flags, void *(*thread_func) (void *arg), void *args)
+CtdlThreadNode *CtdlThreadCreate(char *name, long flags, void *(*thread_func) (void *arg), void *args)
{
- struct CtdlThreadNode *ret = NULL;
+ CtdlThreadNode *ret = NULL;
- begin_critical_section(S_THREAD_LIST);
ret = ctdl_internal_create_thread(name, flags, thread_func, args);
- end_critical_section(S_THREAD_LIST);
return ret;
}
* Internal function to schedule a thread.
* Must be called from within a S_THREAD_LIST critical section
*/
-struct CtdlThreadNode *CtdlThreadSchedule(char *name, long flags, void *(*thread_func) (void *arg), void *args, time_t when)
+CtdlThreadNode *CtdlThreadSchedule(char *name, long flags, void *(*thread_func) (void *arg), void *args, time_t when)
{
- int ret = 0;
- struct CtdlThreadNode *this_thread;
+ CtdlThreadNode *this_thread;
if (num_threads >= 32767)
{
return NULL;
}
- this_thread = malloc(sizeof(struct CtdlThreadNode));
+ this_thread = malloc(sizeof(CtdlThreadNode));
if (this_thread == NULL) {
CtdlLogPrintf(CTDL_EMERG, "Thread system, can't allocate CtdlThreadNode, exiting\n");
return NULL;
}
- // Ensuring this is zero'd means we make sure the thread doesn't start doing its thing until we are ready.
- memset (this_thread, 0, sizeof(struct CtdlThreadNode));
-
- /* Create the mutex's early so we can use them */
- pthread_mutex_init (&(this_thread->ThreadMutex), NULL);
- pthread_cond_init (&(this_thread->ThreadCond), NULL);
- pthread_mutex_init (&(this_thread->SleepMutex), NULL);
- pthread_cond_init (&(this_thread->SleepCond), NULL);
-
- this_thread->state = CTDL_THREAD_CREATE;
-
- if ((ret = pthread_attr_init(&this_thread->attr))) {
- pthread_mutex_destroy(&(this_thread->ThreadMutex));
- pthread_cond_destroy(&(this_thread->ThreadCond));
- pthread_mutex_destroy(&(this_thread->SleepMutex));
- pthread_cond_destroy(&(this_thread->SleepCond));
- CtdlLogPrintf(CTDL_EMERG, "Thread system, pthread_attr_init: %s\n", strerror(ret));
+ /* Initialise the thread structure */
+ if (ctdl_internal_init_thread_struct(this_thread, flags) == NULL)
+ {
free(this_thread);
+ CtdlLogPrintf(CTDL_EMERG, "Thread system, can't initialise CtdlThreadNode, exiting\n");
return NULL;
}
- /* Our per-thread stacks need to be bigger than the default size,
- * otherwise the MIME parser crashes on FreeBSD, and the IMAP service
- * crashes on 64-bit Linux.
- */
- if (flags & CTDLTHREAD_BIGSTACK)
- {
- CtdlLogPrintf(CTDL_INFO, "Thread system. Creating BIG STACK thread.\n");
- if ((ret = pthread_attr_setstacksize(&this_thread->attr, THREADSTACKSIZE))) {
- pthread_mutex_destroy(&(this_thread->ThreadMutex));
- pthread_cond_destroy(&(this_thread->ThreadCond));
- pthread_mutex_destroy(&(this_thread->SleepMutex));
- pthread_cond_destroy(&(this_thread->SleepCond));
- pthread_attr_destroy(&this_thread->attr);
- CtdlLogPrintf(CTDL_EMERG, "Thread system, pthread_attr_setstacksize: %s\n",
- strerror(ret));
- free(this_thread);
- return NULL;
- }
- }
-
/*
* If we got here we are going to create the thread so we must initilise the structure
* first because most implimentations of threading can't create it in a stopped state
this_thread->flags = flags;
this_thread->thread_func = thread_func;
this_thread->user_args = args;
- /* Set this new thread with an avg_blocked of 2. We do this so that its creation affects the
- * load average for the system. If we don't do this then we create a mass of threads at the same time
- * because the creation didn't affect the load average.
- */
- this_thread->avg_blocked = 2;
/*
* When to start this thread
-struct CtdlThreadNode *ctdl_thread_internal_start_scheduled (struct CtdlThreadNode *this_thread)
+CtdlThreadNode *ctdl_thread_internal_start_scheduled (CtdlThreadNode *this_thread)
{
int ret = 0;
+// citthread_mutex_lock(&that_thread->ThreadMutex);
+ begin_critical_section(S_THREAD_LIST);
/*
* We pass this_thread into the thread as its args so that it can find out information
* about itself and it has a bit of storage space for itself, not to mention that the REAL
* thread function needs to finish off the setup of the structure
*/
- if ((ret = pthread_create(&this_thread->tid, &this_thread->attr, ctdl_internal_thread_func, this_thread) != 0))
+ if ((ret = citthread_create(&this_thread->tid, &this_thread->attr, ctdl_internal_thread_func, this_thread) != 0))
{
-
- CtdlLogPrintf(CTDL_ALERT, "Thread system, Can't create thread: %s\n",
- strerror(ret));
+ end_critical_section(S_THREAD_LIST);
+ CtdlLogPrintf(CTDL_DEBUG, "Failed to start scheduled thread \"%s\": %s\n", this_thread->name, strerror(ret));
+// citthread_mutex_unlock(&this_thread->ThreadMutex);
+ citthread_mutex_destroy(&(this_thread->ThreadMutex));
+ citthread_cond_destroy(&(this_thread->ThreadCond));
+ citthread_mutex_destroy(&(this_thread->SleepMutex));
+ citthread_cond_destroy(&(this_thread->SleepCond));
+ citthread_attr_destroy(&this_thread->attr);
+ free(this_thread);
return NULL;
}
CtdlThreadList = this_thread;
if (this_thread->next)
this_thread->next->prev = this_thread;
+// citthread_mutex_unlock(&that_thread->ThreadMutex);
+
+ ctdl_thread_internal_calc_loadavg();
+ end_critical_section(S_THREAD_LIST);
+
return this_thread;
}
void ctdl_thread_internal_check_scheduled(void)
{
- struct CtdlThreadNode *this_thread, *that_thread;
+ CtdlThreadNode *this_thread, *that_thread;
time_t now;
if (try_critical_section(S_SCHEDULE_LIST))
#ifdef WITH_THREADLOG
CtdlLogPrintf(CTDL_DEBUG, "About to start scheduled thread \"%s\".\n", that_thread->name);
#endif
- begin_critical_section(S_THREAD_LIST);
if (CT->state > CTDL_THREAD_STOP_REQ)
{ /* Only start it if the system is not stopping */
- pthread_mutex_lock(&that_thread->ThreadMutex);
- if (ctdl_thread_internal_start_scheduled (that_thread) == NULL)
+ if (ctdl_thread_internal_start_scheduled (that_thread))
{
#ifdef WITH_THREADLOG
- CtdlLogPrintf(CTDL_DEBUG, "Failed to start scheduled thread \"%s\".\n", that_thread->name);
-#endif
- pthread_mutex_unlock(&that_thread->ThreadMutex);
- pthread_mutex_destroy(&(that_thread->ThreadMutex));
- pthread_cond_destroy(&(that_thread->ThreadCond));
- pthread_mutex_destroy(&(that_thread->SleepMutex));
- pthread_cond_destroy(&(that_thread->SleepCond));
- pthread_attr_destroy(&that_thread->attr);
- free(that_thread);
- }
- else
- {
- CtdlLogPrintf(CTDL_INFO, "Thread system, Started a scheduled thread \"%s\" (%ld).\n",
+ CtdlLogPrintf(CTDL_INFO, "Thread system, Started a scheduled thread \"%s\" (0x%08lx).\n",
that_thread->name, that_thread->tid);
- pthread_mutex_unlock(&that_thread->ThreadMutex);
- ctdl_thread_internal_calc_loadavg();
+#endif
}
}
- end_critical_section(S_THREAD_LIST);
}
+#ifdef WITH_THREADLOG
else
{
-#ifdef WITH_THREADLOG
- CtdlLogPrintf(CTDL_DEBUG, "Thread \"%s\" will start in %ld seconds.\n", that_thread->name, that_thread->when - time(NULL));
-#endif
+ CtdlLogPrintf(CTDL_DEBUG, "Thread \"%s\" will start in %ld seconds.\n",
+ that_thread->name, that_thread->when - time(NULL));
}
+#endif
}
end_critical_section(S_SCHEDULE_LIST);
}
*/
int CtdlThreadSelect(int n, fd_set *readfds, fd_set *writefds, fd_set *exceptfds, struct timeval *timeout)
{
- int ret;
+ int ret = 0;
ctdl_thread_internal_change_state(CT, CTDL_THREAD_BLOCKED);
- ret = select(n, readfds, writefds, exceptfds, timeout);
- ctdl_thread_internal_change_state(CT, CTDL_THREAD_RUNNING);
+ if (!CtdlThreadCheckStop())
+ ret = select(n, readfds, writefds, exceptfds, timeout);
+ /**
+ * If the select returned <= 0 then it failed due to an error
+ * or timeout so this thread could stop if asked to do so.
+ * Anything else means it needs to continue unless the system is shutting down
+ */
+ if (ret <= 0)
+ {
+ /**
+ * select says nothing to do so we can change to running if we haven't been asked to stop.
+ */
+ ctdl_thread_internal_change_state(CT, CTDL_THREAD_RUNNING);
+ }
+ else
+ {
+ /**
+ * The select says this thread needs to do something useful.
+ * This thread was in an idle state so it may have been asked to stop
+ * but if the system isn't shutting down this thread is no longer
+ * idle and select has given it a task to do so it must not stop
+ * In this condition we need to force it into the running state.
+ * CtdlThreadGC will clear its ticker for us.
+ *
+ * FIXME: there is still a small hole here. It is possible for the sequence of locking
+ * to allow the state to get changed to STOP_REQ just after this code if the other thread
+ * has decided to change the state before this lock, it there fore has to wait till the lock
+ * completes but it will continue to change the state. We need something a bit better here.
+ */
+ citthread_mutex_lock(&CT->ThreadMutex); /* To prevent race condition of a sleeping thread */
+ if (GC_thread->state > CTDL_THREAD_STOP_REQ && CT->state <= CTDL_THREAD_STOP_REQ)
+ {
+ CtdlLogPrintf(CTDL_DEBUG, "Thread %s (0x%08lx) refused stop request.\n", CT->name, CT->tid);
+ CT->state = CTDL_THREAD_RUNNING;
+ }
+ citthread_mutex_unlock(&CT->ThreadMutex);
+ }
+
return ret;
}
+void *new_worker_thread(void *arg);
+extern void close_masters (void);
void go_threading(void)
{
int i;
- struct CtdlThreadNode *last_worker;
+ CtdlThreadNode *last_worker;
/*
* Initialise the thread system
*/
ctdl_thread_internal_init();
- /*
- * Now create a bunch of worker threads.
- */
-// CtdlLogPrintf(CTDL_DEBUG, "Starting %d worker threads\n", config.c_min_workers);
-// begin_critical_section(S_THREAD_LIST);
-// i=0; /* Always start at least 1 worker thread */
-// do
-// {
-// ctdl_internal_create_thread("Worker Thread", CTDLTHREAD_BIGSTACK + CTDLTHREAD_WORKER, worker_thread, NULL);
-// } while (++i < config.c_min_workers);
-// end_critical_section(S_THREAD_LIST);
/* Second call to module init functions now that threading is up */
initialise_modules(1);
/*
* This thread is now used for garbage collection of other threads in the thread list
*/
- CtdlLogPrintf(CTDL_INFO, "Startup thread %d becoming garbage collector,\n", pthread_self());
+ CtdlLogPrintf(CTDL_INFO, "Startup thread %d becoming garbage collector,\n", citthread_self());
/*
* We do a lot of locking and unlocking of the thread list in here.
if (CT->signal)
exit_signal = CT->signal;
if (exit_signal)
+ {
CtdlThreadStopAll();
+// close_masters();
+ }
check_sched_shutdown();
if (CT->state > CTDL_THREAD_STOP_REQ)
{
}
/* Reduce the size of the worker thread pool if necessary. */
- if ((CtdlThreadGetWorkers() > config.c_min_workers) && (CtdlThreadWorkerAvg < 20) && (CT->state > CTDL_THREAD_STOP_REQ))
+ if ((CtdlThreadGetWorkers() > config.c_min_workers + 1) && (CtdlThreadWorkerAvg < 20) && (CT->state > CTDL_THREAD_STOP_REQ))
{
/* Ask a worker thread to stop as we no longer need it */
begin_critical_section(S_THREAD_LIST);
last_worker = CtdlThreadList;
while (last_worker)
{
- pthread_mutex_lock(&last_worker->ThreadMutex);
- if (last_worker->flags & CTDLTHREAD_WORKER && last_worker->state > CTDL_THREAD_STOPPING)
+ citthread_mutex_lock(&last_worker->ThreadMutex);
+ if (last_worker->flags & CTDLTHREAD_WORKER && (last_worker->state > CTDL_THREAD_STOPPING) && (last_worker->Context == NULL))
{
- pthread_mutex_unlock(&last_worker->ThreadMutex);
+ citthread_mutex_unlock(&last_worker->ThreadMutex);
break;
}
- pthread_mutex_unlock(&last_worker->ThreadMutex);
+ citthread_mutex_unlock(&last_worker->ThreadMutex);
last_worker = last_worker->next;
}
end_critical_section(S_THREAD_LIST);
if (last_worker)
{
#ifdef WITH_THREADLOG
- CtdlLogPrintf(CTDL_DEBUG, "Thread system, stopping excess worker thread \"%s\" (%ld).\n",
+ CtdlLogPrintf(CTDL_DEBUG, "Thread system, stopping excess worker thread \"%s\" (0x%08lx).\n",
last_worker->name,
last_worker->tid
);
/* FIXME: come up with a better way to dynamically alter the number of threads
* based on the system load
*/
-// if ((CtdlThreadGetWorkers() < config.c_max_workers) && (CtdlThreadGetWorkers() < num_sessions))
- // && (CtdlThreadLoadAvg < 90) )
+#ifdef NEW_WORKER
+ if ((((CtdlThreadGetWorkers() < config.c_max_workers) && (CtdlThreadGetWorkers() <= num_sessions) ) || CtdlThreadGetWorkers() < config.c_min_workers) && (CT->state > CTDL_THREAD_STOP_REQ))
+#else
if ((((CtdlThreadGetWorkers() < config.c_max_workers) && (CtdlThreadGetWorkerAvg() > 60) && (CtdlThreadGetLoadAvg() < 90) ) || CtdlThreadGetWorkers() < config.c_min_workers) && (CT->state > CTDL_THREAD_STOP_REQ))
+#endif /* NEW_WORKER */
{
for (i=0; i<5 ; i++)
-// for (i=0; i< (num_sessions - CtdlThreadGetWorkers()) ; i++)
-// for (i=0; i< (10 - (55 - CtdlThreadWorkerAvg) / CtdlThreadWorkerAvg / CtdlThreadGetWorkers()) ; i++)
{
-// begin_critical_section(S_THREAD_LIST);
+#ifdef NEW_WORKER
+ CtdlThreadCreate("Worker Thread (new)",
+ CTDLTHREAD_BIGSTACK + CTDLTHREAD_WORKER,
+ new_worker_thread,
+ NULL
+ );
+#else
CtdlThreadCreate("Worker Thread",
CTDLTHREAD_BIGSTACK + CTDLTHREAD_WORKER,
worker_thread,
NULL
);
-// end_critical_section(S_THREAD_LIST);
+#endif /* NEW_WORKER */
}
}
CtdlThreadGC();
}
+#ifdef THREADS_USESIGNALS
+ if (CtdlThreadGetCount() && CT->state > CTDL_THREAD_STOP_REQ)
+#else
if (CtdlThreadGetCount())
+#endif
CtdlThreadSleep(1);
}
/*
*/
ctdl_thread_internal_cleanup();
}
+
+
+
+
+/*
+ * Starting a new implimentation of a worker thread.
+ * This new implimentation will be faster and do more work per thread.
+ */
+
+/*
+ * Select on master socket.
+ * First worker thread in here acquires the lock and builds an FDSET of master sockets.
+ * then it goes into a loop selecting on the master sockets timing out every few milliseconds.
+ * If it times out it rebiulds its list and loops.
+ * If the select succeeds it creates a new context and returns.
+ * During this time the other workers are selecting on existing contexts or sleeping.
+ */
+void select_on_master(void)
+{
+ fd_set readfds;
+ struct ServiceFunctionHook *serviceptr;
+ int ssock; /* Descriptor for client socket */
+ int highest;
+ int m, i;
+ int retval = 0;
+ struct timeval tv;
+ struct CitContext *con;
+ const char *old_name;
+
+
+
+ old_name = CtdlThreadName("select_on_master");
+
+ /* Initialize the fdset. */
+ FD_ZERO(&readfds);
+ highest = 0;
+
+ /* First, add the various master sockets to the fdset. */
+ for (serviceptr = ServiceHookTable; serviceptr != NULL; serviceptr = serviceptr->next ) {
+ m = serviceptr->msock;
+ FD_SET(m, &readfds);
+ if (m > highest) {
+ highest = m;
+ }
+ }
+
+ tv.tv_sec = 1; /* wake up every 1 sec if no input */
+ tv.tv_usec = 0;
+ retval = CtdlThreadSelect(highest + 1, &readfds, NULL, NULL, &tv);
+
+ /* Select got an error or we are shutting down so get out */
+ if (retval == 0 || CtdlThreadCheckStop()) {
+ CtdlThreadName(old_name);
+ return;
+ }
+
+ /* Select says something happened on one of our master sockets so now we handle it */
+ for (serviceptr = ServiceHookTable; serviceptr != NULL; serviceptr = serviceptr->next ) {
+ if (FD_ISSET(serviceptr->msock, &readfds)) {
+ ssock = accept(serviceptr->msock, NULL, 0);
+ if (ssock >= 0) {
+ CtdlLogPrintf(CTDL_DEBUG, "New client socket %d\n", ssock);
+ /* The master socket is non-blocking but the client
+ * sockets need to be blocking, otherwise certain
+ * operations barf on FreeBSD. Not a fatal error.
+ */
+ if (fcntl(ssock, F_SETFL, 0) < 0) {
+ CtdlLogPrintf(CTDL_EMERG,
+ "citserver: Can't set socket to blocking: %s\n",
+ strerror(errno));
+ }
+
+ /* New context will be created already
+ * set up in the CON_EXECUTING state.
+ */
+ con = CreateNewContext();
+ CT->Context = con;
+
+ /* Assign our new socket number to it. */
+ con->client_socket = ssock;
+ con->h_command_function = serviceptr->h_command_function;
+ con->h_async_function = serviceptr->h_async_function;
+ con->ServiceName = serviceptr->ServiceName;
+ /* Determine whether it's a local socket */
+ if (serviceptr->sockpath != NULL)
+ con->is_local_socket = 1;
+
+ /* Set the SO_REUSEADDR socket option */
+ i = 1;
+ setsockopt(ssock, SOL_SOCKET, SO_REUSEADDR, &i, sizeof(i));
+
+ become_session(con);
+ begin_session(con);
+ serviceptr->h_greeting_function();
+ become_session(NULL);
+ con->state = CON_IDLE;
+ break;
+ }
+ }
+ }
+
+ CtdlThreadName(old_name);
+}
+
+/*
+ * Select on client socket.
+ * First worker thread in here acquires the lock and builds an FDSET of client sockets.
+ * then it selects on the client sockets timing out after 1 second.
+ * If it times out the thread goes off to check on housekeeping etc.
+ * If the select succeeds the thread goes off to handle the client request.
+ * If the list of client connections is empty the threads all sleep for one second
+ */
+struct CitContext *select_on_client(void)
+{
+ fd_set readfds;
+ struct timeval tv;
+ int retval = 0;
+ int highest=0;
+ const char *old_name;
+
+
+ old_name = CtdlThreadName("select_on_client");
+
+ /* Initialise the fdset */
+ FD_ZERO(&readfds);
+ FD_SET(CT->Context->client_socket, &readfds);
+ highest = CT->Context->client_socket;
+ /* Now we can select on any connections that are waiting */
+
+ if (!CtdlThreadCheckStop())
+ {
+ tv.tv_sec = config.c_sleeping; /* wake up every second if no input */
+ tv.tv_usec = 0;
+ retval = select(highest + 1, &readfds, NULL, NULL, &tv);
+ }
+ else /* Shutting down? */
+ {
+ CtdlThreadName(old_name);
+ return(NULL);
+ }
+
+
+ /* Now figure out who made this select() unblock.
+ * First, check for an error or exit condition.
+ */
+ if (retval < 0) {
+ if (errno == EBADF) {
+ CtdlLogPrintf(CTDL_NOTICE, "select() failed: (%s)\n",
+ strerror(errno));
+ }
+ if (errno != EINTR) {
+ CtdlLogPrintf(CTDL_EMERG, "Exiting (%s)\n", strerror(errno));
+ CtdlThreadStopAll();
+ } else if (!CtdlThreadCheckStop()) {
+ CtdlLogPrintf(CTDL_DEBUG, "Un handled select failure.\n");
+ }
+ CtdlThreadName(old_name);
+ return NULL;
+ }
+ else if(retval == 0)
+ {
+ CtdlThreadName(old_name);
+ CT->Context->kill_me = 1;
+ CT->Context = NULL;
+ return CT->Context;
+ }
+
+ CT->Context->state = CON_EXECUTING;
+ CT->Context->input_waiting = 1;
+
+ CtdlThreadName(old_name);
+ return (CT->Context);
+}
+
+
+
+/*
+ * Do the worker threads work when needed
+ */
+int execute_session(struct CitContext *bind_me)
+{
+ int force_purge;
+
+ become_session(bind_me);
+
+ /* If the client has sent a command, execute it. */
+ if (CC->input_waiting) {
+ CC->h_command_function();
+ CC->input_waiting = 0;
+ }
+
+ /* If there are asynchronous messages waiting and the
+ * client supports it, do those now */
+ if ((CC->is_async) && (CC->async_waiting)
+ && (CC->h_async_function != NULL)) {
+ CC->h_async_function();
+ CC->async_waiting = 0;
+ }
+
+ force_purge = CC->kill_me;
+ if (force_purge)
+ CT->Context = NULL;
+ become_session(NULL);
+ bind_me->state = CON_IDLE;
+ return force_purge;
+}
+
+
+
+extern void dead_session_purge(int force);
+
+/*
+ * A new worker_thread loop.
+ */
+
+void *new_worker_thread(void *arg)
+{
+ struct CitContext *bind_me;
+ int force_purge;
+
+ while (!CtdlThreadCheckStop()) {
+
+ /* make doubly sure we're not holding any stale db handles
+ * which might cause a deadlock.
+ */
+ cdb_check_handles();
+ force_purge = 0;
+ bind_me = NULL; /* Which session shall we handle? */
+
+ if (CT->Context == NULL)
+ select_on_master();
+ if (CtdlThreadCheckStop())
+ break;
+
+ if (CT->Context)
+ bind_me = select_on_client();
+ if (CtdlThreadCheckStop())
+ break;
+
+ if (bind_me)
+ force_purge = execute_session(bind_me);
+
+ dead_session_purge(force_purge);
+ if (CtdlThreadCheckStop())
+ break;
+
+ do_housekeeping();
+ }
+ return NULL;
+}
projects / citadel.git / blobdiff