/*
- * $Id$
- *
* This is the other half of the webserver. It handles the task of hooking
* up HTTP requests with the sessions they belong to, using HTTP cookies to
* keep track of things. If the HTTP request doesn't belong to any currently
* active session, a new session is started.
*
+ * Copyright (c) 1996-2010 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.
+ *
+ * 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 "webcit.h"
HashList *HttpReqTypes = NULL;
HashList *HttpHeaderHandler = NULL;
extern HashList *HandlerHash;
-int num_threads = 1; /* Number of worker threads. Start at 1 because the parent counts. */
+
+/* the following two values start at 1 because the initial parent thread counts as one. */
+int num_threads_existing = 1; /* Number of worker threads which exist. */
+int num_threads_executing = 1; /* Number of worker threads currently executing. */
void DestroyHttpHeaderHandler(void *V)
{
{
wcsession *sptr, *ss;
wcsession *sessions_to_kill = NULL;
- int num_sessions = 0;
/*
* Lock the session list, moving any candidates for euthanasia into
* a separate list.
*/
- pthread_mutex_lock(&SessionListMutex);
- num_sessions = 0;
+ CtdlLogResult(pthread_mutex_lock(&SessionListMutex));
for (sptr = SessionList; sptr != NULL; sptr = sptr->next) {
- ++num_sessions;
/* Kill idle sessions */
if ((time(NULL) - (sptr->lastreq)) > (time_t) WEBCIT_TIMEOUT) {
sessions_to_kill = sptr;
}
}
- pthread_mutex_unlock(&SessionListMutex);
+ CtdlLogResult(pthread_mutex_unlock(&SessionListMutex));
/*
* Now free up and destroy the culled sessions.
session_destroy_modules(&sessions_to_kill);
sessions_to_kill = sptr;
- --num_sessions;
}
+}
- /*
- * If there are more sessions than threads, then we should spawn
- * more threads ... up to a predefined maximum.
- */
- while ( (num_sessions > num_threads) && (num_threads <= MAX_WORKER_THREADS) ) {
+/*
+ * Check the size of our thread pool. If all threads are executing, spawn another.
+ */
+void check_thread_pool_size(void)
+{
+ if (time_to_die) return; /* don't expand the thread pool during shutdown */
+
+ begin_critical_section(S_SPAWNER); /* only one of these should run at a time */
+ if (
+ (num_threads_executing >= num_threads_existing)
+ && (num_threads_existing < MAX_WORKER_THREADS)
+ ) {
+ lprintf(3, "%d of %d threads are executing. Adding another worker thread.\n",
+ num_threads_executing,
+ num_threads_existing
+ );
spawn_another_worker_thread();
- lprintf(3, "There are %d sessions and %d threads active.\n",
- num_sessions, num_threads);
}
+ end_critical_section(S_SPAWNER);
}
GetAuthBasic(Hdr);
}
- pthread_mutex_lock(ListMutex);
+ CtdlLogResult(pthread_mutex_lock(ListMutex));
for (sptr = *wclist; ((sptr != NULL) && (TheSession == NULL)); sptr = sptr->next) {
/* If HTTP-AUTH, look for a session with matching credentials */
break;
}
}
- pthread_mutex_unlock(ListMutex);
+ CtdlLogResult(pthread_mutex_unlock(ListMutex));
if (TheSession == NULL)
lprintf(1, "didn't find sessionkey [%ld] for user [%s]\n",
Hdr->HR.SessionKey,ChrPtr(Hdr->c_username));
pthread_mutex_init(&TheSession->SessionMutex, NULL);
if (ListMutex != NULL)
- pthread_mutex_lock(ListMutex);
+ CtdlLogResult(pthread_mutex_lock(ListMutex));
if (wclist != NULL) {
TheSession->nonce = rand();
*wclist = TheSession;
}
if (ListMutex != NULL)
- pthread_mutex_unlock(ListMutex);
+ CtdlLogResult(pthread_mutex_unlock(ListMutex));
}
return TheSession;
}
}
StrBufAppendBuf(Hdr->this_page, Hdr->HR.ReqLine, 0);
+
/* chop Filename / query arguments */
Args = strchr(ChrPtr(Hdr->HR.ReqLine), '?');
if (Args == NULL) /* whe're not that picky about params... TODO: this will spoil '&' in filenames.*/
/*
* Bind to the session and perform the transaction
*/
- pthread_mutex_lock(&TheSession->SessionMutex); /* bind */
+ CtdlLogResult(pthread_mutex_lock(&TheSession->SessionMutex));
pthread_setspecific(MyConKey, (void *)TheSession);
TheSession->lastreq = time(NULL); /* log */
session_detach_modules(TheSession);
TheSession->Hdr = NULL;
- pthread_mutex_unlock(&TheSession->SessionMutex); /* unbind */
+ CtdlLogResult(pthread_mutex_unlock(&TheSession->SessionMutex));
}
void tmplput_nonce(StrBuf *Target, WCTemplputParams *TP)
void Header_HandleHost(StrBuf *Line, ParsedHttpHdrs *hdr)
{
- if ((follow_xff) && (hdr->HR.http_host != NULL))
- return;
- else
- hdr->HR.http_host = Line;
+ if (site_prefix == NULL) {
+ site_prefix = NewStrBuf();
+ StrBufAppendPrintf(site_prefix, "%s://", (is_https ? "https" : "http") );
+ StrBufAppendBuf(site_prefix, Line, 0);
+ }
}
void Header_HandleXFFHost(StrBuf *Line, ParsedHttpHdrs *hdr)
{
- if (follow_xff)
- hdr->HR.http_host = Line;
+ if ( (follow_xff) && (site_prefix == NULL)) {
+ site_prefix = NewStrBuf();
+ StrBufAppendPrintf(site_prefix, "http://"); /* this is naive; do something about it */
+ StrBufAppendBuf(site_prefix, Line, 0);
+ }
}
projects / citadel.git / blobdiff