Begun implimentation of a really good thread control interface.

[citadel.git] / citadel / sysdep_decls.h

diff --git a/citadel/sysdep_decls.h b/citadel/sysdep_decls.h
index 008031e4a3b094e7e33b1997a99e8bbbefeab711..ab8745c790c5e0ee1073ddc3b0190c287d441bc9 100644 (file)
--- a/citadel/sysdep_decls.h
+++ b/citadel/sysdep_decls.h
@@ -1,18 +1,28 @@
 /* $Id$ */
 
+#ifndef SYSDEP_DECLS_H
+#define SYSDEP_DECLS_H
 
 /*
  * Uncomment this #define if you are a Citadel developer tracking
  * down memory leaks in the server.  Do NOT do this on a production
  * system because it definitely incurs a lot of additional overhead.
+#define DEBUG_MEMORY_LEAKS
  */
-/* #define DEBUG_MEMORY_LEAKS */
 
 
 #include <pthread.h>
+#include <stdarg.h>
 #include "sysdep.h"
 #include "server.h"
 
+#if SIZEOF_SIZE_T == SIZEOF_INT 
+#define SIZE_T_FMT "%d"
+#else
+#define SIZE_T_FMT "%ld"
+#endif
+
+
 /* Logging levels - correspond to syslog(3) */
 enum LogLevel {
        /* When about to exit the server for an unrecoverable error */
@@ -30,7 +40,7 @@ enum LogLevel {
        /* Unimportant progress messages, etc. */
         CTDL_INFO,     /* informational */
        /* Debugging messages */
-        CTDL_DEBUG,    /* debug-level messages */
+        CTDL_DEBUG     /* debug-level messages */
 };
 
 #ifdef __GNUC__
@@ -41,20 +51,27 @@ void lprintf (enum LogLevel loglevel, const char *format, ...);
 void cprintf (const char *format, ...);
 #endif
 
+void vlprintf (enum LogLevel loglevel, const char *format, va_list arg_ptr);
+
+extern pthread_key_t MyConKey;                 /* TSD key for MyContext() */
+
+extern int enable_syslog;
+
 void init_sysdep (void);
 void begin_critical_section (int which_one);
 void end_critical_section (int which_one);
-int ig_tcp_server (int port_number, int queue_len);
-int ig_uds_server(char *sockpath, int queue_len);
-INLINE struct CitContext *MyContext (void);
+int ig_tcp_server (char *ip_addr, int port_number, int queue_len,char **errormessage);
+int ig_uds_server(char *sockpath, int queue_len, char **errormessage);
+struct CitContext *MyContext (void);
 struct CitContext *CreateNewContext (void);
 void InitMyContext (struct CitContext *con);
 void buffer_output(void);
 void unbuffer_output(void);
+void flush_output(void);
 void client_write (char *buf, int nbytes);
 int client_read_to (char *buf, int bytes, int timeout);
 int client_read (char *buf, int bytes);
-int client_gets (char *buf);
+int client_getln (char *buf, int maxbytes);
 void sysdep_master_cleanup (void);
 void kill_session (int session_to_kill);
 void *sd_context_loop (struct CitContext *con);
@@ -63,22 +80,40 @@ void cmd_nset (char *cmdbuf);
 int convert_login (char *NameToConvert);
 void *worker_thread (void *arg);
 void become_session(struct CitContext *which_con);
-void CtdlRedirectOutput(FILE *fp, int sock);
 void InitializeMasterCC(void);
 void init_master_fdset(void);
 void create_worker(void);
+void InitialiseSemaphores(void);
+void ctdl_internal_thread_gc (int shutdown);
+
 
 extern int num_sessions;
 extern volatile int time_to_die;
+extern volatile int shutdown_and_halt;
+extern volatile int running_as_daemon;
+extern volatile int restart_server;
+
 extern int verbosity;
 extern int rescan[];
-extern pthread_t initial_thread;
 
 extern struct worker_node {
         pthread_t tid;
         struct worker_node *next;
 } *worker_list;
 
+
+extern struct CtdlThreadNode {
+       pthread_t tid;
+       char *name;
+       void *(*thread_func) (void *arg);
+       void *user_args;
+       int flags;
+       int running;
+       int valid;
+       struct CtdlThreadNode *prev;
+       struct CtdlThreadNode *next;
+} *CtdlThreadList;
+
 extern int SyslogFacility(char *name);
 extern int syslog_facility;
 
@@ -94,3 +129,7 @@ void tracked_free(void *ptr);
 char *tracked_strdup(const char *s, char *file, int line);
 void dump_heap(void);
 #endif
+
+void create_maintenance_threads(void);
+
+#endif /* SYSDEP_DECLS_H */