Continue phase 2 of modules stuff.

[citadel.git] / citadel / sysdep_decls.h

diff --git a/citadel/sysdep_decls.h b/citadel/sysdep_decls.h
index a83c14816f7e5f5ec3fac172b3246e18c3578990..54d889384be131e951fee142a9c94ab0c27a1bf8 100644 (file)
--- a/citadel/sysdep_decls.h
+++ b/citadel/sysdep_decls.h
@@ -1,9 +1,21 @@
 /* $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
+ */
+
+
 #include <pthread.h>
 #include "sysdep.h"
 #include "server.h"
 
+
 /* Logging levels - correspond to syslog(3) */
 enum LogLevel {
        /* When about to exit the server for an unrecoverable error */
@@ -21,7 +33,7 @@ enum LogLevel {
        /* Unimportant progress messages, etc. */
         CTDL_INFO,     /* informational */
        /* Debugging messages */
-        CTDL_DEBUG,    /* debug-level messages */
+        CTDL_DEBUG     /* debug-level messages */
 };
 
 #ifdef __GNUC__
@@ -32,20 +44,25 @@ void lprintf (enum LogLevel loglevel, const char *format, ...);
 void cprintf (const char *format, ...);
 #endif
 
+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);
@@ -54,16 +71,18 @@ 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);
 
 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;
@@ -72,3 +91,20 @@ extern struct worker_node {
 
 extern int SyslogFacility(char *name);
 extern int syslog_facility;
+
+#ifdef DEBUG_MEMORY_LEAKS
+#define malloc(x) tracked_malloc(x, __FILE__, __LINE__)
+#define realloc(x,y) tracked_realloc(x, y, __FILE__, __LINE__)
+#undef strdup
+#define strdup(x) tracked_strdup(x, __FILE__, __LINE__)
+#define free(x) tracked_free(x)
+void *tracked_malloc(size_t size, char *file, int line);
+void *tracked_realloc(void *ptr, size_t size, char *file, int line);
+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 */