X-Git-Url: https://code.citadel.org/?a=blobdiff_plain;f=citadel%2Fsysdep_decls.h;h=781d2c02644f4d8fbf4352215672ad2e6004c6d8;hb=50ff39d933b7178377b3a67f8edc31ffa42ffd28;hp=cf2b9c3ab5ead46a3e17687f1be35cf14458ce69;hpb=dac9b3ef6f31553f5cae283aaaa7418b8e2bc1e2;p=citadel.git diff --git a/citadel/sysdep_decls.h b/citadel/sysdep_decls.h index cf2b9c3ab..781d2c026 100644 --- 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 #include "sysdep.h" @@ -20,15 +11,11 @@ #ifdef HAVE_DB_H #include -#elif defined(HAVE_DB4_DB_H) -#include -#else -#error Neither nor was found by configure. Install db4-devel. +#error was not found by configure. Install the Berkeley DB development package. #endif - -#if DB_VERSION_MAJOR < 4 || DB_VERSION_MINOR < 1 -#error Citadel requires Berkeley DB v4.1 or newer. Please upgrade. +#if DB_VERSION_MAJOR < 5 +#error Citadel requires Berkeley DB v5 or newer. Please upgrade. #endif #include "server.h" @@ -40,49 +27,43 @@ #define SIZE_T_FMT "%ld" #endif +#if SIZEOF_LOFF_T == SIZEOF_LONG +#define LOFF_T_FMT "%ld" +#else +#define LOFF_T_FMT "%lld" +#endif + +void cputbuf(const StrBuf *Buf); + #ifdef __GNUC__ void cprintf (const char *format, ...) __attribute__((__format__(__printf__,1,2))); -void fold_cprintf (const char *format, ...) __attribute__((__format__(__printf__,1,2))); #else void cprintf (const char *format, ...); -void fold_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 cmd_nset (char *cmdbuf); +void checkcrash(void); 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 *worker_thread(void *); -extern int num_sessions; extern volatile int exit_signal; extern volatile int shutdown_and_halt; extern volatile int running_as_daemon; @@ -92,64 +73,6 @@ extern int verbosity; extern int rescan[]; - - extern int SyslogFacility(char *name); -extern int syslog_facility; - - -/* - * Typdefs and stuff to abstract pthread for Citadel - */ -#ifdef HAVE_PTHREAD_H - -typedef pthread_t citthread_t; -typedef pthread_key_t citthread_key_t; -typedef pthread_mutex_t citthread_mutex_t; -typedef pthread_cond_t citthread_cond_t; -typedef pthread_attr_t citthread_attr_t; - - -#define citthread_mutex_init pthread_mutex_init -#define citthread_cond_init pthread_cond_init -#define citthread_attr_init pthread_attr_init -#define citthread_mutex_trylock pthread_mutex_trylock -#define citthread_mutex_lock pthread_mutex_lock -#define citthread_mutex_unlock pthread_mutex_unlock -#define citthread_key_create pthread_key_create -#define citthread_getspecific pthread_getspecific -#define citthread_setspecific pthread_setspecific -#define citthread_mutex_destroy pthread_mutex_destroy -#define citthread_cond_destroy pthread_cond_destroy -#define citthread_attr_destroy pthread_attr_destroy - -#define citthread_kill pthread_kill -#define citthread_cond_signal pthread_cond_signal -#define citthread_cancel pthread_cancel -#define citthread_cond_timedwait pthread_cond_timedwait -#define citthread_equal pthread_equal -#define citthread_self pthread_self -#define citthread_create pthread_create -#define citthread_attr_setstacksize pthread_attr_setstacksize -#define citthread_join pthread_join -#define citthread_cleanup_push pthread_cleanup_push -#define citthread_cleanup_pop pthread_cleanup_pop - - -#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 */