* Noticed that when serv_chat.c sets async_waiting to 1, it also checks to see if...

[citadel.git] / citadel / context.c

diff --git a/citadel/context.c b/citadel/context.c
index 70fdd2795051dc4c6caffd453eba4c3e814c7ddf..6c6a20453c214e7d5dad07d10923a5f35c75c24e 100644 (file)
--- a/citadel/context.c
+++ b/citadel/context.c
@@ -2,10 +2,23 @@
  * $Id: sysdep.c 7989 2009-10-31 15:29:37Z davew $
  *
  * Citadel context management stuff.
- * See COPYING for copyright information.
- *
  * Here's where we (hopefully) have all the code that manipulates contexts.
  *
+ * Copyright (c) 1987-2010 by the citadel.org team
+ *
+ * This program is free 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 "sysdep.h"
@@ -327,6 +340,8 @@ void RemoveContext (CitContext *con)
                con->ldap_dn = NULL;
        }
 
+       FreeStrBuf(&con->MigrateBuf);
+       FreeStrBuf(&con->ReadBuf);
        CtdlLogPrintf(CTDL_DEBUG, "Done with RemoveContext()\n");
 }
 
@@ -362,6 +377,8 @@ CitContext *CreateNewContext(void) {
         * Generate a unique session number and insert this context into
         * the list.
         */
+       me->MigrateBuf = NewStrBuf();
+       me->ReadBuf = NewStrBuf();
        begin_critical_section(S_SESSION_TABLE);
        me->cs_pid = ++next_pid;
        me->prev = NULL;
@@ -376,6 +393,11 @@ CitContext *CreateNewContext(void) {
 }
 
 
+/*
+ * Return an array containing a copy of the context list.
+ * This allows worker threads to perform "for each context" operations without
+ * having to lock and traverse the live list.
+ */
 CitContext *CtdlGetContextArray(int *count)
 {
        int nContexts, i;
@@ -383,11 +405,14 @@ CitContext *CtdlGetContextArray(int *count)
        
        nContexts = num_sessions;
        nptr = malloc(sizeof(CitContext) * nContexts);
-       if (!nptr)
+       if (!nptr) {
+               *count = 0;
                return NULL;
+       }
        begin_critical_section(S_SESSION_TABLE);
-       for (cptr = ContextList, i=0; cptr != NULL && i < nContexts; cptr = cptr->next, i++)
+       for (cptr = ContextList, i=0; cptr != NULL && i < nContexts; cptr = cptr->next, i++) {
                memcpy(&nptr[i], cptr, sizeof (CitContext));
+       }
        end_critical_section (S_SESSION_TABLE);
        
        *count = i;
@@ -396,7 +421,7 @@ CitContext *CtdlGetContextArray(int *count)
 
 
 
-/**
+/*
  * This function fills in a context and its user field correctly
  * Then creates/loads that user
  */
@@ -561,4 +586,16 @@ INLINE void become_session(CitContext *which_con) {
 }
 
 
-
+/*
+ * Set the "async waiting" flag for a session, if applicable
+ */
+void set_async_waiting(struct CitContext *ccptr)
+{
+       CtdlLogPrintf(CTDL_DEBUG, "Setting async_waiting flag for session %d\n", ccptr->cs_pid);
+       if (ccptr->is_async) {
+               ccptr->async_waiting = 1;
+               if (ccptr->state == CON_IDLE) {
+                       ccptr->state = CON_READY;
+               }
+       }
+}