GC_thread->state = CTDL_THREAD_STOP_REQ;
while(this_thread)
{
-#ifdef THREADS_USESIGNALS
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);
citthread_cond_signal(&this_thread->ThreadCond);
citthread_cond_signal(&this_thread->SleepCond);
double CtdlThreadGetLoadAvg(void)
{
- double load_avg[3] ;
+ double load_avg[3] = {0.0, 0.0, 0.0};
- int ret;
+ int ret = 0;
int smp_num_cpus;
/* Borrowed this straight from procps */
smp_num_cpus = sysconf(_SC_NPROCESSORS_ONLN);
if(smp_num_cpus<1) smp_num_cpus=1; /* SPARC glibc is buggy */
+#ifdef HAVE_GETLOADAVG
ret = getloadavg(load_avg, 3);
+#endif
if (ret < 0)
return 0;
return load_avg[0] / smp_num_cpus;
state = CT->state;
-#ifdef THREADS_USESIGNALS
if (CT->signal)
{
CtdlLogPrintf(CTDL_DEBUG, "Thread \"%s\" caught signal %d.\n", CT->name, CT->signal);
+ if (CT->signal == SIGHUP)
+ CT->state = CTDL_THREAD_STOP_REQ;
CT->signal = 0;
}
-#endif
if(state == CTDL_THREAD_STOP_REQ)
{
CT->state = CTDL_THREAD_STOPPING;
return;
if (!(this_thread->thread_func))
return; // Don't stop garbage collector
-#ifdef THREADS_USESIGNALS
+
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);
citthread_cond_signal(&this_thread->ThreadCond);
citthread_cond_signal(&this_thread->SleepCond);
* In here we were called by the current thread because it is exiting
* NB. WE ARE THE CURRENT THREAD
*/
- CtdlLogPrintf(CTDL_NOTICE, "Thread \"%s\" (0x%08lx) exited.\n", CT->name, CT->tid);
+ if (CT)
+ {
+ const char *name = CT->name;
+ const pid_t tid = CT->tid;
+
+ CtdlLogPrintf(CTDL_NOTICE, "Thread \"%s\" (0x%08lx) exited.\n", name, tid);
+ }
+ else
+ {
+ CtdlLogPrintf(CTDL_NOTICE, "some ((unknown ? ? ?) Thread exited.\n");
+ }
#ifdef HAVE_BACKTRACE
- eCrash_UnregisterThread();
+/// eCrash_UnregisterThread();
#endif
citthread_mutex_lock(&CT->ThreadMutex);
CtdlThreadNode *this_thread, *that_thread;
int workers = 0, sys_workers;
int ret=0;
-
+
begin_critical_section(S_THREAD_LIST);
/* Handle exiting of garbage collector thread */
begin_critical_section(S_THREAD_LIST);
this_thread = (CtdlThreadNode *) arg;
gettimeofday(&this_thread->start_time, NULL); /* Time this thread started */
-// citthread_mutex_lock(&this_thread->ThreadMutex);
// Register the cleanup function to take care of when we exit.
citthread_cleanup_push(ctdl_internal_thread_cleanup, NULL);
* Other wise there is a window to allow this threads creation to continue to full grown and
* therby prevent a shutdown of the server.
*/
-// citthread_mutex_unlock(&this_thread->ThreadMutex);
-
if (!CtdlThreadCheckStop())
{
citthread_mutex_lock(&this_thread->ThreadMutex);
// Register for tracing
#ifdef HAVE_BACKTRACE
- eCrash_RegisterThread(this_thread->name, 0);
+/// eCrash_RegisterThread(this_thread->name, 0);
#endif
// Tell the world we are here
this_thread->thread_func = thread_func;
this_thread->user_args = args;
-// 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
this_thread->next->prev = this_thread;
ctdl_thread_internal_calc_loadavg();
-// citthread_mutex_unlock(&this_thread->ThreadMutex);
end_critical_section(S_THREAD_LIST);
return 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
{
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));
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);
CtdlThreadNode *last_worker;
struct timeval start, now, result;
double last_duration;
-
+
/*
* Initialise the thread system
*/
ctdl_thread_internal_init();
/* Second call to module init functions now that threading is up */
- if (!statcount)
+ if (!statcount) {
initialise_modules(1);
+ CtdlThreadCreate("select_on_master", CTDLTHREAD_BIGSTACK, select_on_master, NULL);
+ }
else {
CtdlLogPrintf(CTDL_EMERG, "Running connection simulation stats\n");
gettimeofday(&start, NULL);
if (exit_signal)
{
CtdlThreadStopAll();
-// close_masters();
}
check_sched_shutdown();
if (CT->state > CTDL_THREAD_STOP_REQ)
* based on the system load
*/
if (!statcount) {
-#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)) || CtdlThreadGetWorkers() < config.c_min_workers) && (CT->state > CTDL_THREAD_STOP_REQ))
-#endif /* NEW_WORKER */
{
/* Only start new threads if we are not going to overload the machine */
- if (CtdlThreadGetLoadAvg() < ((double)1.00)) {
+ /* Temporarily set to 10 should be enough to make sure we don't stranglew the server
+ * at least until we make this a config option */
+ if (CtdlThreadGetLoadAvg() < ((double)10.00)) {
for (i=0; i<5 ; i++) {
-#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
);
-#endif /* NEW_WORKER */
}
}
else
-/*
- * 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;
-}
-
-
-
-
-/*
- * 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