// 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));
+ 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);
+
/* We are garbage collector so create us as running */
this_thread->state = CTDL_THREAD_RUNNING;
this_thread->name = strdup("Garbage Collection Thread");
- pthread_mutex_init (&(this_thread->ThreadMutex), NULL);
- pthread_cond_init (&(this_thread->ThreadCond), NULL);
-
this_thread->tid = GC_thread;
num_threads++; // Increase the count of threads in the system.
gettimeofday(&now, NULL);
timersub(&now, &(this_thread->last_state_change), &result);
+ pthread_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);
}
/*
/*
* Wether we change state or not we need update the load values
*/
- pthread_mutex_lock(&this_thread->ThreadMutex); /* To prevent race condition of a sleeping thread */
ctdl_thread_internal_update_avgs(this_thread);
+ pthread_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))
ctdl_thread_internal_change_state (this_thread, CTDL_THREAD_STOP_REQ);
// pthread_mutex_lock(&this_thread->ThreadMutex);
pthread_cond_signal(&this_thread->ThreadCond);
+ pthread_cond_signal(&this_thread->SleepCond);
// pthread_mutex_unlock(&this_thread->ThreadMutex);
CtdlLogPrintf(CTDL_DEBUG, "Thread system stopping thread \"%s\" (%ld).\n", this_thread->name, this_thread->tid);
}
/*
- * A function to signal that we need to do garbage collection on the thread list
+ * A function to wake up all sleeping threads
*/
-void CtdlThreadGC(void)
+void CtdlThreadWakeAll(void)
{
struct CtdlThreadNode *this_thread;
- CtdlLogPrintf(CTDL_DEBUG, "Thread system signalling garbage collection.\n");
+ CtdlLogPrintf(CTDL_DEBUG, "Thread system waking all threads.\n");
begin_critical_section(S_THREAD_LIST);
this_thread = CtdlThreadList;
{
// pthread_mutex_lock(&this_thread->ThreadMutex);
pthread_cond_signal(&this_thread->ThreadCond);
+ pthread_cond_signal(&this_thread->SleepCond);
// pthread_mutex_unlock(&this_thread->ThreadMutex);
}
this_thread = this_thread->next;
*/
int CtdlThreadGetCount(void)
{
- return num_threads;
+ int ret;
+
+ begin_critical_section(S_THREAD_LIST);
+ ret = num_threads;
+ end_critical_section(S_THREAD_LIST);
+ return ret;
}
int CtdlThreadGetWorkers(void)
{
- return num_workers;
+ int ret;
+
+ begin_critical_section(S_THREAD_LIST);
+ ret = num_workers;
+ end_critical_section(S_THREAD_LIST);
+ return ret;
+}
+
+double CtdlThreadGetWorkerAvg(void)
+{
+ double ret;
+
+ begin_critical_section(S_THREAD_LIST);
+ ret = CtdlThreadWorkerAvg;
+ end_critical_section(S_THREAD_LIST);
+ return ret;
+}
+
+double CtdlThreadGetLoadAvg(void)
+{
+ double ret;
+
+ begin_critical_section(S_THREAD_LIST);
+ ret = CtdlThreadLoadAvg;
+ end_critical_section(S_THREAD_LIST);
+ return ret;
}
/*
this_thread = CtdlThreadList;
while(this_thread)
{
+ pthread_mutex_lock(&this_thread->ThreadMutex);
if (pthread_equal(self_tid, this_thread->tid))
{
+ pthread_mutex_unlock(&this_thread->ThreadMutex);
end_critical_section(S_THREAD_LIST);
return this_thread;
}
+ pthread_mutex_unlock(&this_thread->ThreadMutex);
this_thread = this_thread->next;
}
end_critical_section(S_THREAD_LIST);
CtdlLogPrintf(CTDL_WARNING, "Thread system WARNING. Attempt to CtdlThreadRename() a non thread. %s\n", name);
return NULL;
}
- begin_critical_section(S_THREAD_LIST);
+// begin_critical_section(S_THREAD_LIST);
+ pthread_mutex_lock(&this_thread->ThreadMutex);
old_name = this_thread->name;
if (name)
this_thread->name = strdup (name);
else
old_name = strdup(old_name);
- end_critical_section (S_THREAD_LIST);
+ pthread_mutex_unlock(&this_thread->ThreadMutex);
+// end_critical_section (S_THREAD_LIST);
return (old_name);
}
return;
}
- begin_critical_section(S_THREAD_LIST);
+// begin_critical_section(S_THREAD_LIST);
ctdl_thread_internal_change_state (this_thread, CTDL_THREAD_CANCELLED);
pthread_cancel(this_thread->tid);
- end_critical_section (S_THREAD_LIST);
+// end_critical_section (S_THREAD_LIST);
}
pthread_mutex_unlock(&this_thread->ThreadMutex);
return -1;
}
- else if(this_thread->state < CTDL_THREAD_STOP_REQ)
+ else if((this_thread->state < CTDL_THREAD_STOP_REQ) && (this_thread->state > CTDL_THREAD_CREATE))
{
pthread_mutex_unlock(&this_thread->ThreadMutex);
return -1;
if (!(this_thread->thread_func))
return; // Don't stop garbage collector
- begin_critical_section (S_THREAD_LIST);
+// begin_critical_section (S_THREAD_LIST);
ctdl_thread_internal_change_state (this_thread, CTDL_THREAD_STOP_REQ);
// pthread_mutex_lock(&this_thread->ThreadMutex);
pthread_cond_signal(&this_thread->ThreadCond);
+ pthread_cond_signal(&this_thread->SleepCond);
// pthread_mutex_unlock(&this_thread->ThreadMutex);
- end_critical_section(S_THREAD_LIST);
+// end_critical_section(S_THREAD_LIST);
}
/*
return;
}
- begin_critical_section(S_THREAD_LIST);
- ctdl_thread_internal_change_state (self, CTDL_THREAD_SLEEPING);
- pthread_mutex_lock(&self->ThreadMutex); /* Prevent something asking us to awaken before we've gone to sleep */
- end_critical_section(S_THREAD_LIST);
-
memset (&wake_time, 0, sizeof(struct timespec));
gettimeofday(&time_now, NULL);
wake_time.tv_sec = time_now.tv_sec + secs;
wake_time.tv_nsec = time_now.tv_usec * 10;
- pthread_cond_timedwait(&self->ThreadCond, &self->ThreadMutex, &wake_time);
- begin_critical_section(S_THREAD_LIST);
+
+// begin_critical_section(S_THREAD_LIST);
+ ctdl_thread_internal_change_state (self, CTDL_THREAD_SLEEPING);
+// end_critical_section(S_THREAD_LIST);
+
+// pthread_mutex_lock(&self->SleepMutex); /* Prevent something asking us to awaken before we've gone to sleep */
+ pthread_mutex_lock(&self->ThreadMutex); /* Prevent something asking us to awaken before we've gone to sleep */
+ pthread_cond_timedwait(&self->SleepCond, &self->ThreadMutex, &wake_time);
pthread_mutex_unlock(&self->ThreadMutex);
+// pthread_mutex_unlock(&self->SleepMutex);
+
+// begin_critical_section(S_THREAD_LIST);
ctdl_thread_internal_change_state (self, CTDL_THREAD_RUNNING);
- end_critical_section(S_THREAD_LIST);
+// end_critical_section(S_THREAD_LIST);
}
* NB. WE ARE THE CURRENT THREAD
*/
CtdlLogPrintf(CTDL_NOTICE, "Thread \"%s\" (%ld) exited.\n", this_thread->name, this_thread->tid);
- begin_critical_section(S_THREAD_LIST);
+// begin_critical_section(S_THREAD_LIST);
#ifdef HAVE_BACKTRACE
eCrash_UnregisterThread();
#endif
pthread_mutex_lock(&this_thread->ThreadMutex);
this_thread->state = CTDL_THREAD_EXITED; // needs to be last thing else house keeping will unlink us too early
pthread_mutex_unlock(&this_thread->ThreadMutex);
- end_critical_section(S_THREAD_LIST);
+// end_critical_section(S_THREAD_LIST);
// CtdlThreadGC();
}
while(that_thread)
{
/* Update load averages */
- pthread_mutex_lock(&that_thread->ThreadMutex);
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;
that_thread->avg_sleeping /= 2;
* Garbage collection routine.
* Gets called by main() in a loop to clean up the thread list periodically.
*/
-void ctdl_internal_thread_gc (void)
+void CtdlThreadGC (void)
{
struct CtdlThreadNode *this_thread, *that_thread;
int workers = 0;
+ begin_critical_section(S_THREAD_LIST);
+
/* Handle exiting of garbage collector thread */
if(num_threads == 1)
CtdlThreadList->state = CTDL_THREAD_EXITED;
this_thread = this_thread->next;
/* Do we need to clean up this thread? */
+ pthread_mutex_lock(&that_thread->ThreadMutex);
if (that_thread->state != CTDL_THREAD_EXITED)
{
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)
{ /* 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");
- CtdlThreadStopAll();
+ abort();
return;
}
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");
- CtdlThreadStopAll();
+ abort();
return;
}
+ if(that_thread->flags & CTDLTHREAD_WORKER)
+ num_workers--; /* This is a wroker thread so reduce the count. */
+ num_threads--;
/* If we are unlinking the list head then the next becomes the list head */
if (that_thread == CtdlThreadList)
CtdlThreadList = that_thread->next;
that_thread->prev->next = that_thread->next;
if(that_thread->next)
that_thread->next->prev = that_thread->next;
- num_threads--;
- if(that_thread->flags & CTDLTHREAD_WORKER)
- num_workers--; /* This is a wroker thread so reduce the count. */
+ 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);
/*
* 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
free(that_thread->name);
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);
}
/* Sanity check number of worker threads */
if (workers != num_workers)
{
- CtdlLogPrintf(CTDL_WARNING,
- "Thread system WARNING, discrepancy in number of worker threads. Counted %d, should be %d.\n",
+ 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
);
- return;
+ abort();
}
+ end_critical_section(S_THREAD_LIST);
}
* can continue its execution.
*/
begin_critical_section(S_THREAD_LIST);
- // Get our thread data structure
this_thread = (struct CtdlThreadNode *) arg;
- this_thread->state = CTDL_THREAD_RUNNING;
- this_thread->pid = getpid();
gettimeofday(&this_thread->start_time, NULL); /* Time this thread started */
+ pthread_mutex_lock(&this_thread->ThreadMutex);
+
+ // Register the cleanup function to take care of when we exit.
+ pthread_cleanup_push(ctdl_internal_thread_cleanup, NULL);
+ // Get our thread data structure
+ this_thread->pid = getpid();
memcpy(&this_thread->last_state_change, &this_thread->start_time, sizeof (struct timeval)); /* Changed state so mark it. */
- end_critical_section(S_THREAD_LIST);
+ /* Only change to running state if we weren't asked to stop during the create cycle
+ * 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);
+ if (!CtdlThreadCheckStop(this_thread))
+ {
+ pthread_mutex_lock(&this_thread->ThreadMutex);
+ this_thread->state = CTDL_THREAD_RUNNING;
+ pthread_mutex_unlock(&this_thread->ThreadMutex);
+ }
+ end_critical_section(S_THREAD_LIST);
+
+ // Register for tracing
+ #ifdef HAVE_BACKTRACE
+ eCrash_RegisterThread(this_thread->name, 0);
+ #endif
+
// Tell the world we are here
CtdlLogPrintf(CTDL_NOTICE, "Created a new thread \"%s\" (%ld). \n", this_thread->name, this_thread->tid);
- // Register the cleanup function to take care of when we exit.
- pthread_cleanup_push(ctdl_internal_thread_cleanup, NULL);
/*
- * run the thread to do the work
+ * run the thread to do the work but only if we haven't been asked to stop
*/
- ret = (this_thread->thread_func)(this_thread->user_args);
+ if (!CtdlThreadCheckStop(this_thread))
+ ret = (this_thread->thread_func)(this_thread->user_args);
/*
* Our thread is exiting either because it wanted to end or because the server is stopping
// 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);
+
+ pthread_mutex_lock(&this_thread->ThreadMutex);
+
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));
free(this_thread);
return NULL;
{
CtdlLogPrintf(CTDL_INFO, "Thread system. Creating BIG STACK thread.\n");
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",
strerror(ret));
- pthread_attr_destroy(&this_thread->attr);
free(this_thread);
return NULL;
}
* because the creation didn't affect the load average.
*/
this_thread->avg_blocked = 2;
- pthread_mutex_init (&(this_thread->ThreadMutex), NULL);
- pthread_cond_init (&(this_thread->ThreadCond), NULL);
/*
* We want to make sure that only the main thread handles signals,
free (this_thread->name);
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);
free(this_thread);
if (sigtrick)
CtdlThreadList = this_thread;
if (this_thread->next)
this_thread->next->prev = this_thread;
- // Register for tracing
- #ifdef HAVE_BACKTRACE
- eCrash_RegisterThread(this_thread->name, 0);
- #endif
+
+ pthread_mutex_unlock(&this_thread->ThreadMutex);
+
ctdl_thread_internal_calc_loadavg();
return this_thread;
}
* few seconds, because running it after every single unbind would waste a lot
* of CPU time and keep the context list locked too much. To force it to run
* anyway, set "force" to nonzero.
- *
- *
- * After that's done, we raise the size of the worker thread pool
- * if such an action is appropriate.
*/
void dead_session_purge(int force) {
struct CitContext *ptr, *ptr2; /* general-purpose utility pointer */
struct CitContext *rem = NULL; /* list of sessions to be destroyed */
- CtdlThreadPushName("dead_session_purge");
-
if (force == 0) {
if ( (time(NULL) - last_purge) < 5 ) {
- CtdlThreadPopName();
return; /* Too soon, go away */
}
}
time(&last_purge);
- begin_critical_section(S_SESSION_TABLE);
+ if (try_critical_section(S_SESSION_TABLE))
+ return;
+
ptr = ContextList;
while (ptr) {
ptr2 = ptr;
}
--num_sessions;
-
/* And put it on our to-be-destroyed list */
ptr2->next = rem;
rem = ptr2;
-
}
}
end_critical_section(S_SESSION_TABLE);
rem = rem->next;
free(ptr);
}
-
- /* Raise the size of the worker thread pool if necessary. */
- begin_critical_section(S_THREAD_LIST);
- if ( (num_sessions > num_workers)
- && (num_workers < config.c_max_workers) ) {
- ctdl_internal_create_thread("Worker Thread", CTDLTHREAD_BIGSTACK + CTDLTHREAD_WORKER, worker_thread, NULL);
- }
- end_critical_section(S_THREAD_LIST);
- // FIXME: reduce the number of worker threads too
-
- CtdlThreadPopName();
-
}
tv.tv_sec = 1; /* wake up every second if no input */
tv.tv_usec = 0;
retval = CtdlThreadSelect(highest + 1, &readfds, NULL, NULL, &tv, CT);
-// retval = select(highest + 1, &readfds, NULL, NULL, &tv);
}
if (CtdlThreadCheckStop(CT)) return(NULL);
goto do_select;
}
}
- else if(retval == 0) {
- goto SKIP_SELECT;
- }
+// else if(retval == 0) {
+// goto SKIP_SELECT;
+// }
/* Next, check to see if it's a new client connecting
* on a master socket.
*/
dead_session_purge(force_purge);
do_housekeeping();
- check_sched_shutdown();
}
/* If control reaches this point, the server is shutting down */
return(NULL);
projects / citadel.git / blobdiff