X-Git-Url: https://code.citadel.org/?a=blobdiff_plain;f=citadel%2Fsysdep_decls.h;h=8a16f7305beb4915dfea149328c4c428a234118e;hb=85a7e6b84462d72e14a287d4bbdbd3e41c97e76d;hp=f77d6e4a5d6f886453f83592bee01aea9e743ede;hpb=01cc19a4c2da27b4db0e980ccd3ca54d834319c8;p=citadel.git

diff --git a/citadel/sysdep_decls.h b/citadel/sysdep_decls.h
index f77d6e4a5..8a16f7305 100644
--- a/citadel/sysdep_decls.h
+++ b/citadel/sysdep_decls.h
@@ -11,46 +11,49 @@
  */
 
 
-#include <pthread.h>
+#include <stdarg.h>
 #include "sysdep.h"
-#include "server.h"
 
+#ifdef HAVE_PTHREAD_H
+#include <pthread.h>
+#endif
+
+#ifdef HAVE_DB_H
+#include <db.h>
+#elif defined(HAVE_DB4_DB_H)
+#include <db4/db.h>
+#else
+#error Neither <db.h> nor <db4/db.h> was found by configure. Install db4-devel.
+#endif
+
+
+#if DB_VERSION_MAJOR < 4 || DB_VERSION_MINOR < 1
+#error Citadel requires Berkeley DB v4.1 or newer.  Please upgrade.
+#endif
+
+#include "server.h"
+#include "database.h"
 
-/* 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 */
-};
+#if SIZEOF_SIZE_T == SIZEOF_INT 
+#define SIZE_T_FMT "%d"
+#else
+#define SIZE_T_FMT "%ld"
+#endif
 
 #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 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);
-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);
@@ -59,7 +62,7 @@ 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_write (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);
@@ -70,26 +73,70 @@ void start_daemon (int do_close_stdio);
 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);
 
+
 extern int num_sessions;
-extern volatile int time_to_die;
+extern volatile int exit_signal;
 extern volatile int shutdown_and_halt;
+extern volatile int running_as_daemon;
+extern volatile int restart_server;
 
 extern int verbosity;
 extern int rescan[];
 
-extern struct worker_node {
-        pthread_t tid;
-        struct worker_node *next;
-} *worker_list;
+
+
 
 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__)
@@ -103,8 +150,4 @@ char *tracked_strdup(const char *s, char *file, int line);
 void dump_heap(void);
 #endif
 
-void create_maintenance_threads(void);
-extern pthread_t indexer_thread_tid;
-extern pthread_t checkpoint_thread_tid;
-
 #endif /* SYSDEP_DECLS_H */