X-Git-Url: https://code.citadel.org/?a=blobdiff_plain;f=citadel%2Fsysdep_decls.h;h=781d2c02644f4d8fbf4352215672ad2e6004c6d8;hb=50ff39d933b7178377b3a67f8edc31ffa42ffd28;hp=8c7e3059b348ebd9ecb3f0adf9f178380c373b44;hpb=8c538eeb2d9b024970c350730b4748b870762c5f;p=citadel.git diff --git a/citadel/sysdep_decls.h b/citadel/sysdep_decls.h index 8c7e3059b..781d2c026 100644 --- a/citadel/sysdep_decls.h +++ b/citadel/sysdep_decls.h @@ -1,31 +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 #include #include "sysdep.h" +#ifdef HAVE_PTHREAD_H +#include +#endif + #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" @@ -37,72 +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 -/* Logging levels - correspond to syslog(3) */ -enum LogLevel { - /* When about to exit the server for an unrecoverable error */ - CTDL_EMERG, /* system is unusable */ - /* Manual intervention is required to avoid an abnormal exit */ - CTDL_ALERT, /* action must be taken immediately */ - /* The server can continue to run with degraded functionality */ - CTDL_CRIT, /* critical conditions */ - /* An error occurs but the server continues to run normally */ - CTDL_ERR, /* error conditions */ - /* An abnormal condition was detected; server will continue normally */ - CTDL_WARNING, /* warning conditions */ - /* Normal messages (login/out, activity, etc.) */ - CTDL_NOTICE, /* normal but significant condition */ - /* Unimportant progress messages, etc. */ - CTDL_INFO, /* informational */ - /* Debugging messages */ - CTDL_DEBUG /* debug-level messages */ -}; +void cputbuf(const StrBuf *Buf); #ifdef __GNUC__ -void lprintf (enum LogLevel loglevel, const char *format, ...) __attribute__((__format__(__printf__,2,3))); void cprintf (const char *format, ...) __attribute__((__format__(__printf__,1,2))); #else -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 (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); -void 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 InitialiseSemaphores(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; @@ -112,92 +73,6 @@ extern int verbosity; extern int rescan[]; - -/* - * Thread stuff - */ -#define CTDLTHREAD_BIGSTACK 0x0001 -#define CTDLTHREAD_WORKER 0x0002 - -enum CtdlThreadState { - CTDL_THREAD_INVALID, - CTDL_THREAD_VALID, - CTDL_THREAD_CREATE, - CTDL_THREAD_CANCELLED, - CTDL_THREAD_EXITED, - CTDL_THREAD_STOPPING, - CTDL_THREAD_STOP_REQ, /* Do NOT put any running states before this state */ - CTDL_THREAD_SLEEPING, - CTDL_THREAD_BLOCKED, - CTDL_THREAD_RUNNING, - CTDL_THREAD_LAST_STATE -}; - -extern struct CtdlThreadNode { - pthread_t tid; /* id as returned by pthread_create() */ - pid_t pid; /* pid, as best the OS will let us determine */ - time_t when; /* When to start a scheduled thread */ - struct CitConext *Context; /* The session context that this thread mught be working on or NULL if none */ - long number; /* A unigue number for this thread (not implimented yet) */ - int wakefd_recv; /* An fd that this thread can sleep on (not implimented yet) */ - int wakefd_send; /* An fd that this thread can send out on (Not implimented yet) */ - const char *name; /* A name for this thread */ - void *(*thread_func) (void *arg); /* The actual function that does this threads work */ - void *user_args; /* Arguments passed to this threads work function */ - long flags; /* Flags that describe this thread */ - enum CtdlThreadState state; /* Flag to show state of this thread */ - pthread_mutex_t ThreadMutex; /* A mutex to sync this thread to others if this thread allows (also used for sleeping) */ - pthread_cond_t ThreadCond; /* A condition variable to sync this thread with others */ - pthread_mutex_t SleepMutex; /* A mutex for sleeping */ - pthread_cond_t SleepCond; /* A condition variable for sleeping */ - pthread_attr_t attr; /* Attributes of this thread */ - struct timeval start_time; /* Time this thread was started */ - struct timeval last_state_change; /* Time when this thread last changed state */ - double avg_sleeping; /* Average sleeping time */ - double avg_running; /* Average running time */ - double avg_blocked; /* Average blocked time */ - double load_avg; /* Load average for this thread */ - struct CtdlThreadNode *prev; /* Previous thread in the thread table */ - struct CtdlThreadNode *next; /* Next thread in the thread table */ -} *CtdlThreadList; - -typedef struct { - DB_TXN *tid; /* Transaction handle */ - DBC *cursors[MAXCDB]; /* Cursors, for traversals... */ - struct CtdlThreadNode *self; /* Pointer to this threads control structure */ -}ThreadTSD ; - -extern double CtdlThreadLoadAvg; -extern double CtdlThreadWorkerAvg; -extern pthread_key_t ThreadKey; - -void ctdl_thread_internal_init_tsd(void); -void ctdl_internal_thread_gc (void); -void ctdl_thread_internal_init(void); -void ctdl_thread_internal_cleanup(void); -void ctdl_thread_internal_calc_loadavg(void); -void ctdl_thread_internal_free_tsd(void); -struct CtdlThreadNode *ctdl_internal_create_thread(char *name, long flags, void *(*thread_func) (void *arg), void *args); -void ctdl_thread_internal_check_scheduled(void); - - - 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 */