* Rewrote vCtdlLogPrintf() to NOT use any buffers at all, only v*printf() type functi...

[citadel.git] / citadel / context.h

diff --git a/citadel/context.h b/citadel/context.h
index f9c3aeada7a6241271a5ff513fe9ae6b04ace877..7a71d3b96eb04c79bed04a840b071a75995f5ec9 100644 (file)
--- a/citadel/context.h
+++ b/citadel/context.h
@@ -31,12 +31,14 @@ struct CitContext {
        const char *Pos;        /* Our read position inside of the ReadBuf */
        StrBuf *ReadBuf;        /* Our block buffered read buffer */
        StrBuf *MigrateBuf;        /* Our block buffered read buffer */
+
+       const char *sPos;        /* Our read position inside of the ReadBuf */
+       StrBuf *sReadBuf;        /* Our block buffered read buffer */
+       StrBuf *sMigrateBuf;        /* Our block buffered read buffer */
        int client_socket;
        int is_local_socket;    /* set to 1 if client is on unix domain sock */
        /* Redirect this session's output to a memory buffer? */
-       char *redirect_buffer;          /* the buffer */
-       size_t redirect_len;            /* length of data in buffer */
-       size_t redirect_alloc;          /* length of allocated buffer */
+       StrBuf *redirect_buffer;                /* the buffer */
 #ifdef HAVE_OPENSSL
        SSL *ssl;
        int redirect_ssl;
@@ -152,9 +154,9 @@ void RemoveContext (struct CitContext *);
 CitContext *CreateNewContext (void);
 void context_cleanup(void);
 void kill_session (int session_to_kill);
-INLINE void become_session(struct CitContext *which_con);
 void InitializeMasterCC(void);
 void dead_session_purge(int force);
+void set_async_waiting(struct CitContext *ccptr);
 
 /* Deprecated, user CtdlBumpNewMailCounter() instead */
 void BumpNewMailCounter(long) __attribute__ ((deprecated));
@@ -166,4 +168,22 @@ int CtdlTerminateOtherSession (int session_num);
 #define TERM_ALLOWED   0x02
 #define TERM_KILLED    0x03
 #define TERM_NOTALLOWED -1
+
+/*
+ * Bind a thread to a context.  (It's inline merely to speed things up.)
+ */
+static INLINE void become_session(CitContext *which_con) {
+/*
+       pid_t tid = syscall(SYS_gettid);
+*/
+       citthread_setspecific(MyConKey, (void *)which_con );
+/*
+       CtdlLogPrintf(CTDL_DEBUG, "[%d]: Now doing %s\n", 
+                     (int) tid, 
+                     ((which_con != NULL) && (which_con->ServiceName != NULL)) ? 
+                     which_con->ServiceName:"");
+*/
+}
+
+
 #endif /* CONTEXT_H */