* When spawning another worker thread, indicate the new size of the thread pool

[citadel.git] / webcit / context_loop.c

diff --git a/webcit/context_loop.c b/webcit/context_loop.c
index e0c8072b0947471fffa405ed017f4ab19cf5eb8d..b728b268bb9423b7288c463037d3996a42d9a464 100644 (file)
--- a/webcit/context_loop.c
+++ b/webcit/context_loop.c
@@ -15,12 +15,13 @@
 /* Only one thread may manipulate SessionList at a time... */
 pthread_mutex_t SessionListMutex;
 
-wcsession *SessionList = NULL; /**< our sessions ????*/
+wcsession *SessionList = NULL; /* Linked list of all webcit sessions */
 
-pthread_key_t MyConKey;         /**< TSD key for MySession() */
+pthread_key_t MyConKey;         /* TSD key for MySession() */
 HashList *HttpReqTypes = NULL;
 HashList *HttpHeaderHandler = NULL;
 extern HashList *HandlerHash;
+int num_threads = 1;           /* Number of worker threads.  Start at 1 because the parent counts. */
 
 void DestroyHttpHeaderHandler(void *V)
 {
@@ -44,9 +45,8 @@ void do_housekeeping(void)
        wcsession *sptr, *ss;
        wcsession *sessions_to_kill = NULL;
        int num_sessions = 0;
-       static int num_threads = MIN_WORKER_THREADS;
 
-       /**
+       /*
         * Lock the session list, moving any candidates for euthanasia into
         * a separate list.
         */
@@ -55,13 +55,12 @@ void do_housekeeping(void)
        for (sptr = SessionList; sptr != NULL; sptr = sptr->next) {
                ++num_sessions;
 
-               /** Kill idle sessions */
-               if ((time(NULL) - (sptr->lastreq)) >
-                  (time_t) WEBCIT_TIMEOUT) {
+               /* Kill idle sessions */
+               if ((time(NULL) - (sptr->lastreq)) > (time_t) WEBCIT_TIMEOUT) {
                        sptr->killthis = 1;
                }
 
-               /** Remove sessions flagged for kill */
+               /* Remove sessions flagged for kill */
                if (sptr->killthis) {
 
                        /** remove session from linked list */
@@ -80,7 +79,7 @@ void do_housekeeping(void)
        }
        pthread_mutex_unlock(&SessionListMutex);
 
-       /**
+       /*
         * Now free up and destroy the culled sessions.
         */
        while (sessions_to_kill != NULL) {
@@ -94,14 +93,12 @@ void do_housekeeping(void)
                --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) ) {
+       while ( (num_sessions > num_threads) && (num_threads <= MAX_WORKER_THREADS) ) {
                spawn_another_worker_thread();
-               ++num_threads;
                lprintf(3, "There are %d sessions and %d threads active.\n",
                        num_sessions, num_threads);
        }
@@ -138,35 +135,45 @@ int GenerateSessionID(void)
 
 wcsession *FindSession(wcsession **wclist, ParsedHttpHdrs *Hdr, pthread_mutex_t *ListMutex)
 {
-       wcsession  *sptr, *TheSession = NULL;   
+       wcsession *sptr = NULL;
+       wcsession *TheSession = NULL;   
        
+       if (Hdr->HR.got_auth == AUTH_BASIC) {
+               GetAuthBasic(Hdr);
+       }
+
        pthread_mutex_lock(ListMutex);
-       for (sptr = *wclist; 
-            ((sptr != NULL) && (TheSession == NULL)); 
-            sptr = sptr->next) {
+       for (sptr = *wclist; ((sptr != NULL) && (TheSession == NULL)); sptr = sptr->next) {
                
-               /** If HTTP-AUTH, look for a session with matching credentials */
+               /* If HTTP-AUTH, look for a session with matching credentials */
                switch (Hdr->HR.got_auth)
                {
                case AUTH_BASIC:
                        if ( (Hdr->HR.SessionKey != sptr->SessionKey))
                                continue;
-                       GetAuthBasic(Hdr);
                        if ((!strcasecmp(ChrPtr(Hdr->c_username), ChrPtr(sptr->wc_username))) &&
-                           (!strcasecmp(ChrPtr(Hdr->c_password), ChrPtr(sptr->wc_password))) ) 
+                           (!strcasecmp(ChrPtr(Hdr->c_password), ChrPtr(sptr->wc_password))) ) {
                                TheSession = sptr;
+                       }
+                       if (TheSession == NULL)
+                               lprintf(1, "found sessionkey [%ld], but credentials for [%s|%s] didn't match\n",
+                                       Hdr->HR.SessionKey,ChrPtr(Hdr->c_username), ChrPtr(sptr->wc_username));
                        break;
                case AUTH_COOKIE:
-                       /** If cookie-session, look for a session with matching session ID */
+                       /* If cookie-session, look for a session with matching session ID */
                        if ( (Hdr->HR.desired_session != 0) && 
-                            (sptr->wc_session == Hdr->HR.desired_session)) 
+                            (sptr->wc_session == Hdr->HR.desired_session)) {
                                TheSession = sptr;
+                       }
                        break;                       
                case NO_AUTH:
                        break;
                }
        }
        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));
        return TheSession;
 }
 
@@ -174,8 +181,7 @@ wcsession *CreateSession(int Lockable, wcsession **wclist, ParsedHttpHdrs *Hdr,
 {
        wcsession *TheSession;
        lprintf(3, "Creating a new session\n");
-       TheSession = (wcsession *)
-               malloc(sizeof(wcsession));
+       TheSession = (wcsession *) malloc(sizeof(wcsession));
        memset(TheSession, 0, sizeof(wcsession));
        TheSession->Hdr = Hdr;
        TheSession->SessionKey = Hdr->HR.SessionKey;
@@ -218,8 +224,8 @@ wcsession *CreateSession(int Lockable, wcsession **wclist, ParsedHttpHdrs *Hdr,
 }
 
 
-/**
- * \brief Detects a 'mobile' user agent 
+/*
+ * Detects a 'mobile' user agent 
  */
 int is_mobile_ua(char *user_agent) {
       if (strstr(user_agent,"iPhone OS") != NULL) {
@@ -310,7 +316,7 @@ int ReadHttpSubject(ParsedHttpHdrs *Hdr, StrBuf *Line, StrBuf *Buf)
                break;
        } while (1);
        /* remove the handlername from the URL */
-       if (Pos != NULL) {
+       if ((Pos != NULL) && (Pos != StrBufNOTNULL)){
                StrBufCutLeft(Hdr->HR.ReqLine, 
                              Pos - ChrPtr(Hdr->HR.ReqLine));
        }
@@ -495,8 +501,7 @@ void context_loop(ParsedHttpHdrs *Hdr)
                return;
        }
 
-       if ((Hdr->HR.Handler != NULL) && 
-           ((Hdr->HR.Handler->Flags & ISSTATIC) != 0))
+       if ((Hdr->HR.Handler != NULL) && ((Hdr->HR.Handler->Flags & ISSTATIC) != 0))
        {
                wcsession *Static;
                Static = CreateSession(0, NULL, Hdr, NULL);
@@ -521,29 +526,22 @@ void context_loop(ParsedHttpHdrs *Hdr)
                return;
        }
 
-       if (Hdr->HR.got_auth == AUTH_BASIC) 
+       if (Hdr->HR.got_auth == AUTH_BASIC) {
                CheckAuthBasic(Hdr);
+       }
 
-
-/*     dbg_PrintHash(HTTPHeaders, nix, NULL);  */
-
-       /**
+       /*
         * See if there's an existing session open with the desired ID or user/pass
         */
-       TheSession = NULL;
+       TheSession = FindSession(&SessionList, Hdr, &SessionListMutex);
 
-       if (TheSession == NULL) {
-               TheSession = FindSession(&SessionList, Hdr, &SessionListMutex);
-       }
-
-       /**
+       /*
         * Create a new session if we have to
         */
        if (TheSession == NULL) {
                TheSession = CreateSession(1, &SessionList, Hdr, &SessionListMutex);
 
-               if ((StrLength(Hdr->c_username) == 0) &&
-                   (!Hdr->HR.DontNeedAuth)) {
+               if ((StrLength(Hdr->c_username) == 0) && (!Hdr->HR.DontNeedAuth)) {
 
                        if ((Hdr->HR.Handler != NULL) && 
                            (XHTTP_COMMANDS & Hdr->HR.Handler->Flags) == XHTTP_COMMANDS) {