X-Git-Url: https://code.citadel.org/?a=blobdiff_plain;f=citadel%2Fcontext.h;h=cb7d92f0293f3b451ad85b0930429a6b1dbf92de;hb=4ce1695b8f1f04cdbfb0af09b902859259d9918d;hp=42e0b289863d0ebc78ded2bc2e3e1fbb81431453;hpb=984583756d062536382d78da5ffc70eba9378bfb;p=citadel.git

diff --git a/citadel/context.h b/citadel/context.h
index 42e0b2898..cb7d92f02 100644
--- a/citadel/context.h
+++ b/citadel/context.h
@@ -1,4 +1,3 @@
-/* $Id: sysdep_decls.h 7265 2009-03-25 23:18:46Z dothebart $ */
 
 #ifndef CONTEXT_H
 #define CONTEXT_H
@@ -10,6 +9,26 @@
 #include "threads.h"
 
 
+/*
+ * Values for CitContext.state
+ * 
+ * A session that is doing nothing is in CON_IDLE state.  When activity
+ * is detected on the socket, it goes to CON_READY, indicating that it
+ * needs to have a worker thread bound to it.  When a thread binds to
+ * the session, it goes to CON_EXECUTING and does its thing.  When the
+ * transaction is finished, the thread sets it back to CON_IDLE and lets
+ * it go.
+ */
+typedef enum __CCState {
+	CON_IDLE,		/* This context is doing nothing */
+	CON_GREETING,		/* This context needs to output its greeting */
+	CON_STARTING,		/* This context is outputting its greeting */
+	CON_READY,		/* This context needs attention */
+	CON_EXECUTING,		/* This context is bound to a thread */
+	CON_SYS                 /* This is a system context and mustn't be purged */
+} CCState;
+
+
 /*
  * Here's the big one... the Citadel context structure.
  *
@@ -25,16 +44,16 @@ struct CitContext {
 	int dont_term;          /* for special activities like artv so we don't get killed */
 	time_t lastcmd;		/* time of last command executed */
 	time_t lastidle;	/* For computing idle time */
-	int state;		/* thread state (see CON_ values below) */
+	CCState state;		/* thread state (see CON_ values below) */
 	int kill_me;		/* Set to nonzero to flag for termination */
 
-	const char *Pos;        /* Our read position inside of the ReadBuf */
-	StrBuf *ReadBuf;        /* Our block buffered read buffer */
-	StrBuf *MigrateBuf;        /* Our block buffered read buffer */
+	IOBuffer SendBuf, /* Our write Buffer */
+		RecvBuf, /* Our block buffered read buffer */
+		SBuf; /* Our block buffered read buffer for clients */
 
-	const char *sPos;        /* Our read position inside of the ReadBuf */
-	StrBuf *sReadBuf;        /* Our block buffered read buffer */
+	StrBuf *MigrateBuf;        /* 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? */
@@ -64,6 +83,7 @@ struct CitContext {
 	int cs_clientdev;	/* client developer ID */
 	int cs_clienttyp;	/* client type code */
 	int cs_clientver;	/* client version number */
+	char cs_clientinfo[256];/* if its a unix domain socket, some info for logging. */
 	uid_t cs_UDSclientUID;  /* the uid of the client when talking via UDS */
 	char cs_clientname[32];	/* name of client software */
 	char cs_host[64];	/* host logged in from */
@@ -123,23 +143,6 @@ struct CitContext {
 
 typedef struct CitContext CitContext;
 
-/*
- * Values for CitContext.state
- * 
- * A session that is doing nothing is in CON_IDLE state.  When activity
- * is detected on the socket, it goes to CON_READY, indicating that it
- * needs to have a worker thread bound to it.  When a thread binds to
- * the session, it goes to CON_EXECUTING and does its thing.  When the
- * transaction is finished, the thread sets it back to CON_IDLE and lets
- * it go.
- */
-enum {
-	CON_IDLE,		/* This context is doing nothing */
-	CON_GREETING,		/* This context needs to output its greeting */
-	CON_STARTING,		/* This context is outputting its greeting */
-	CON_READY,		/* This context needs attention */
-	CON_EXECUTING		/* This context is bound to a thread */
-};
 
 #define CC MyContext()
 
@@ -154,11 +157,15 @@ 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);
 
+CitContext *CloneContext(CitContext *CloneMe);
+
+/* forcibly close and flush fd's on shutdown */
+void terminate_stuck_sessions(void);
+
 /* Deprecated, user CtdlBumpNewMailCounter() instead */
 void BumpNewMailCounter(long) __attribute__ ((deprecated));
 
@@ -169,4 +176,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 */