struct timeval now, result;
double last_duration;
- pthread_mutex_lock(&this_thread->ThreadMutex); /* To prevent race condition of a sleeping thread */
gettimeofday(&now, NULL);
timersub(&now, &(this_thread->last_state_change), &result);
// result now has a timeval for the time we spent in the last state since we last updated
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
*/
- ctdl_thread_internal_update_avgs(this_thread);
pthread_mutex_lock(&this_thread->ThreadMutex); /* To prevent race condition of a sleeping thread */
+ ctdl_thread_internal_update_avgs(this_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))
*/
void CtdlThreadStopAll(void)
{
+ //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;
begin_critical_section(S_THREAD_LIST);
if (this_thread->thread_func) // Don't tell garbage collector to stop
{
ctdl_thread_internal_change_state (this_thread, CTDL_THREAD_STOP_REQ);
+// pthread_mutex_lock(&this_thread->ThreadMutex);
pthread_cond_signal(&this_thread->ThreadCond);
+// pthread_mutex_unlock(&this_thread->ThreadMutex);
CtdlLogPrintf(CTDL_DEBUG, "Thread system stopping thread \"%s\" (%ld).\n", this_thread->name, this_thread->tid);
}
this_thread = this_thread->next;
while(this_thread)
{
if (!this_thread->thread_func)
+ {
+// pthread_mutex_lock(&this_thread->ThreadMutex);
pthread_cond_signal(&this_thread->ThreadCond);
-
+// pthread_mutex_unlock(&this_thread->ThreadMutex);
+ }
this_thread = this_thread->next;
}
end_critical_section(S_THREAD_LIST);
return num_threads;
}
+int CtdlThreadGetWorkers(void)
+{
+ return num_workers;
+}
+
/*
* A function to find the thread structure for this thread
*/
this_thread = thread;
if (!this_thread)
{
- CtdlLogPrintf(CTDL_WARNING, "Thread system WARNING. Attempt to CtdlThreadRename() a non thread.\n");
+ CtdlLogPrintf(CTDL_WARNING, "Thread system WARNING. Attempt to CtdlThreadRename() a non thread. %s\n", name);
return NULL;
}
begin_critical_section(S_THREAD_LIST);
/*
* A function for a thread to check if it has been asked to stop
*/
-int CtdlThreadCheckStop(void)
+int CtdlThreadCheckStop(struct CtdlThreadNode *this_thread)
{
- struct CtdlThreadNode *this_thread;
-
- this_thread = CtdlThreadSelf();
if (!this_thread)
{
CtdlLogPrintf(CTDL_EMERG, "Thread system PANIC, CtdlThreadCheckStop() called by a non thread.\n");
CtdlThreadStopAll();
return -1;
}
+ pthread_mutex_lock(&this_thread->ThreadMutex);
if(this_thread->state == CTDL_THREAD_STOP_REQ)
{
this_thread->state = CTDL_THREAD_STOPPING;
+ 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;
-
+ }
+ pthread_mutex_unlock(&this_thread->ThreadMutex);
return 0;
}
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_mutex_unlock(&this_thread->ThreadMutex);
end_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);
// CtdlThreadGC();
}
double load_avg, worker_avg;
int workers = 0;
- begin_critical_section(S_THREAD_LIST);
that_thread = CtdlThreadList;
load_avg = 0;
worker_avg = 0;
while(that_thread)
{
/* Update load averages */
- ctdl_thread_internal_update_avgs(that_thread);
pthread_mutex_lock(&that_thread->ThreadMutex);
+ ctdl_thread_internal_update_avgs(that_thread);
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;
CtdlThreadLoadAvg = load_avg/num_threads;
CtdlThreadWorkerAvg = worker_avg/workers;
#ifdef WITH_THREADLOG
- CtdlLogPrintf(CTDL_INFO, "System load average %f, workers averag %f\n", CtdlThreadLoadAvg, CtdlThreadWorkerAvg);
+ 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);
#endif
- end_critical_section(S_THREAD_LIST);
}
/*
* Woke up to do garbage collection
*/
- begin_critical_section(S_THREAD_LIST);
this_thread = CtdlThreadList;
while(this_thread)
{
if (pthread_equal(that_thread->tid, pthread_self()) && that_thread->thread_func)
{ /* Sanity check */
- 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 */
- 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;
}
/* Sanity check number of worker threads */
if (workers != num_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);
- return;
+ CtdlLogPrintf(CTDL_EMERG,
+ "Thread system PANIC, discrepancy in number of worker threads. Counted %d, should be %d.\n",
+ workers, num_workers
+ );
+ abort();
}
- end_critical_section(S_THREAD_LIST);
}
* can continue its execution.
*/
begin_critical_section(S_THREAD_LIST);
+ // 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 = (struct CtdlThreadNode *) arg;
- this_thread->state = CTDL_THREAD_RUNNING;
+ /* 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.
+ */
+ if (!CtdlThreadCheckStop(this_thread))
+ this_thread->state = CTDL_THREAD_RUNNING;
+
this_thread->pid = getpid();
gettimeofday(&this_thread->start_time, NULL); /* Time this thread started */
memcpy(&this_thread->last_state_change, &this_thread->start_time, sizeof (struct timeval)); /* Changed state so mark it. */
// 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
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;
pthread_mutex_init (&(this_thread->ThreadMutex), NULL);
pthread_cond_init (&(this_thread->ThreadCond), NULL);
#ifdef HAVE_BACKTRACE
eCrash_RegisterThread(this_thread->name, 0);
#endif
+ ctdl_thread_internal_calc_loadavg();
return this_thread;
}
/*
* A warapper function for select so we can show a thread as blocked
*/
-int CtdlThreadSelect(int n, fd_set *readfds, fd_set *writefds, fd_set *exceptfds, const struct timeval *timeout)
+int CtdlThreadSelect(int n, fd_set *readfds, fd_set *writefds, fd_set *exceptfds, const struct timeval *timeout, struct CtdlThreadNode *self)
{
- struct CtdlThreadNode *self;
int ret;
- self = CtdlThreadSelf();
ctdl_thread_internal_change_state(self, CTDL_THREAD_BLOCKED);
ret = select(n, readfds, writefds, exceptfds, timeout);
ctdl_thread_internal_change_state(self, CTDL_THREAD_RUNNING);
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();
-
}
struct timeval tv;
int force_purge = 0;
int m;
-
+
+ CT_PUSH();
+
cdb_allocate_tsd();
- while (!CtdlThreadCheckStop()) {
+ while (!CtdlThreadCheckStop(CT)) {
/* make doubly sure we're not holding any stale db handles
* which might cause a deadlock.
}
}
- if (!CtdlThreadCheckStop()) {
+ if (!CtdlThreadCheckStop(CT)) {
tv.tv_sec = 1; /* wake up every second if no input */
tv.tv_usec = 0;
- retval = CtdlThreadSelect(highest + 1, &readfds, NULL, NULL, &tv);
-// retval = select(highest + 1, &readfds, NULL, NULL, &tv);
+ retval = CtdlThreadSelect(highest + 1, &readfds, NULL, NULL, &tv, CT);
}
- if (CtdlThreadCheckStop()) return(NULL);
+ if (CtdlThreadCheckStop(CT)) return(NULL);
/* Now figure out who made this select() unblock.
* First, check for an error or exit condition.
if (errno != EINTR) {
CtdlLogPrintf(CTDL_EMERG, "Exiting (%s)\n", strerror(errno));
CtdlThreadStopAll();
- } else if (!CtdlThreadCheckStop()) {
+ } else if (!CtdlThreadCheckStop(CT)) {
CtdlLogPrintf(CTDL_DEBUG, "Un handled select failure.\n");
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