*/
-#include <pthread.h>
#include <stdarg.h>
#include "sysdep.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"
#if SIZEOF_SIZE_T == SIZEOF_INT
#define SIZE_T_FMT "%d"
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);
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 InitialiseSemaphores(void);
-void ctdl_internal_thread_gc (int shutdown);
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 struct CtdlThreadNode {
- pthread_t tid;
- char *name;
- void *(*thread_func) (void *arg);
- void *user_args;
- int flags;
- int running;
- int valid;
- struct CtdlThreadNode *prev;
- struct CtdlThreadNode *next;
-} *CtdlThreadList;
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_cond_broadcast pthread_cond_broadcast
+#define citthread_cancel pthread_cancel
+#define citthread_cond_timedwait pthread_cond_timedwait
+#define citthread_cond_wait pthread_cond_wait
+#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__)
void dump_heap(void);
#endif
-void create_maintenance_threads(void);
-
#endif /* SYSDEP_DECLS_H */