Removed the DEBUG_MEMORY_LEAKS framework because we do this with Valgrind now.

[citadel.git] / citadel / sysdep_decls.h

diff --git a/citadel/sysdep_decls.h b/citadel/sysdep_decls.h
index 802ae3305df533dc778e528c3fc858db9886ffbd..c2f95780459e9a7dec6c4d831d587420c39432ae 100644 (file)
--- a/citadel/sysdep_decls.h
+++ b/citadel/sysdep_decls.h
@@ -1,16 +1,7 @@
-/* $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 <stdarg.h>
 #include "sysdep.h"
 
@@ -40,48 +31,40 @@
 #define SIZE_T_FMT "%ld"
 #endif
 
+void cputbuf(const StrBuf *Buf);
+
 #ifdef __GNUC__
 void cprintf (const char *format, ...) __attribute__((__format__(__printf__,1,2)));
 #else
 void cprintf (const char *format, ...);
 #endif
 
-void CtdlLogPrintf(enum LogLevel loglevel, const char *format, ...);
-void vCtdlLogPrintf (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);
-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);
+int ctdl_tcp_server(char *ip_addr, int port_number, int queue_len, char *errormessage);
+int ctdl_uds_server(char *sockpath, int queue_len, char *errormessage);
 void buffer_output(void);
 void unbuffer_output(void);
 void flush_output(void);
-int client_write (char *buf, int nbytes);
+int client_write (const char *buf, int nbytes);
 int client_read_to (char *buf, int bytes, int timeout);
 int client_read (char *buf, int bytes);
 int client_getln (char *buf, int maxbytes);
+int CtdlClientGetLine(StrBuf *Target);
+int client_read_blob(StrBuf *Target, int bytes, int timeout);
+void client_set_inbound_buf(long N);
+int client_read_random_blob(StrBuf *Target, int timeout);
+void client_close(void);
 void sysdep_master_cleanup (void);
 void kill_session (int session_to_kill);
-void *sd_context_loop (struct CitContext *con);
 void start_daemon (int do_close_stdio);
 void checkcrash(void);
 void cmd_nset (char *cmdbuf);
 int convert_login (char *NameToConvert);
 void *worker_thread (void *arg);
-void *context_cleanup_thread (void *arg);
-void become_session(struct CitContext *which_con);
-void InitializeMasterCC(void);
 void init_master_fdset(void);
 void create_worker(void);
+void *select_on_master (void *arg);
 
-
-extern int num_sessions;
 extern volatile int exit_signal;
 extern volatile int shutdown_and_halt;
 extern volatile int running_as_daemon;
@@ -91,10 +74,7 @@ extern int verbosity;
 extern int rescan[];
 
 
-
-
 extern int SyslogFacility(char *name);
-extern int syslog_facility;
 
 
 /*
@@ -137,18 +117,4 @@ typedef pthread_attr_t     citthread_attr_t;
 
 #endif /* HAVE_PTHREAD_H */
 
-
-#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
-
 #endif /* SYSDEP_DECLS_H */