lprintf(CTDL_INFO, "Opening databases\n");
open_databases();
+ ctdl_thread_internal_init_tsd();
+
+ CtdlThreadAllocTSD();
+
if (do_defrag) {
defrag_databases();
}
/* $Id$ */
+
+#ifndef DATABASE_H
+#define DATABASE_H
+
+
void defrag_databases (void);
void open_databases (void);
void close_databases (void);
void *checkpoint_thread(void *arg);
void cdb_chmod_data(void);
void cdb_checkpoint(void);
+void check_handles(void *arg);
/*
* Database records beginning with this magic number are assumed to
size_t compressed_len;
};
+#endif /* DATABASE_H */
static DB *dbp[MAXCDB]; /* One DB handle for each Citadel database */
static DB_ENV *dbenv; /* The DB environment (global) */
-struct cdbtsd { /* Thread-specific DB stuff */
- DB_TXN *tid; /* Transaction handle */
- DBC *cursors[MAXCDB]; /* Cursors, for traversals... */
-};
#ifdef HAVE_ZLIB
#include <zlib.h>
#endif
-static pthread_key_t tsdkey;
-
-#define MYCURSORS (((struct cdbtsd*)pthread_getspecific(tsdkey))->cursors)
-#define MYTID (((struct cdbtsd*)pthread_getspecific(tsdkey))->tid)
/* Verbose logging callback */
void cdb_verbose_log(const DB_ENV *dbenv, const char *msg)
}
}
-static void check_handles(void *arg)
+void check_handles(void *arg)
{
if (arg != NULL) {
- struct cdbtsd *tsd = (struct cdbtsd *) arg;
+ ThreadTSD *tsd = (ThreadTSD *) arg;
bailIfCursor(tsd->cursors, "in check_handles");
}
}
-static void dest_tsd(void *arg)
-{
- if (arg != NULL) {
- check_handles(arg);
- free(arg);
- }
-}
-
-/*
- * Ensure that we have a key for thread-specific data. We don't
- * put anything in here that Citadel cares about; this is just database
- * related stuff like cursors and transactions.
- *
- * This should be called immediately after startup by any thread which wants
- * to use database calls, except for whatever thread calls open_databases.
- */
-void cdb_allocate_tsd(void)
-{
- struct cdbtsd *tsd;
-
- if (pthread_getspecific(tsdkey) != NULL)
- return;
-
- tsd = malloc(sizeof(struct cdbtsd));
-
- tsd->tid = NULL;
-
- memset(tsd->cursors, 0, sizeof tsd->cursors);
- pthread_setspecific(tsdkey, tsd);
-}
-
-void cdb_free_tsd(void)
-{
- dest_tsd(pthread_getspecific(tsdkey));
- pthread_setspecific(tsdkey, NULL);
-}
-
void cdb_check_handles(void)
{
- check_handles(pthread_getspecific(tsdkey));
+ check_handles(pthread_getspecific(ThreadKey));
}
}
}
- if ((ret = pthread_key_create(&tsdkey, dest_tsd))) {
- lprintf(CTDL_EMERG, "pthread_key_create: %s\n",
- strerror(ret));
- exit(CTDLEXIT_DB);
- }
-
- cdb_allocate_tsd();
-
}
int a;
int ret;
- cdb_free_tsd();
-
+ ctdl_thread_internal_free_tsd();
+
if ((ret = dbenv->txn_checkpoint(dbenv, 0, 0, 0))) {
lprintf(CTDL_EMERG,
"txn_checkpoint: %s\n", db_strerror(ret));
struct CtdlThreadNode *CtdlThreadCreate(char *name, long flags, void *(*thread_func) (void *arg), void *args);
void CtdlThreadSleep(int secs);
void CtdlThreadStop(struct CtdlThreadNode *thread);
-int CtdlThreadCheckStop(struct CtdlThreadNode *this_thread);
+int CtdlThreadCheckStop(void);
void CtdlThreadCancel(struct CtdlThreadNode *thread);
-const char *CtdlThreadName(struct CtdlThreadNode *thread, const char *name);
+const char *CtdlThreadName(const char *name);
struct CtdlThreadNode *CtdlThreadSelf(void);
int CtdlThreadGetCount(void);
int CtdlThreadGetWorkers(void);
void CtdlThreadGC(void);
void CtdlThreadStopAll(void);
int CtdlThreadSelect(int n, fd_set *readfds, fd_set *writefds, fd_set *exceptfds, struct timeval *timeout, struct CtdlThreadNode *self);
+void CtdlThreadAllocTSD(void);
/* Macros to speed up getting outr thread */
-#define CT _this_cit_thread
-#define CT_PUSH() \
- struct CtdlThreadNode *_this_cit_thread;\
- _this_cit_thread = CtdlThreadSelf()
+
+#define MYCURSORS (((ThreadTSD*)pthread_getspecific(ThreadKey))->cursors)
+#define MYTID (((ThreadTSD*)pthread_getspecific(ThreadKey))->tid)
+#define CT (((ThreadTSD*)pthread_getspecific(ThreadKey))->self)
+
#endif /* CTDL_MODULE_H */
void *checkpoint_thread(void *arg) {
struct CitContext checkpointCC;
- CT_PUSH();
+ CtdlThreadAllocTSD();
CtdlLogPrintf(CTDL_DEBUG, "checkpoint_thread() initializing\n");
checkpointCC.cs_pid = 0;
pthread_setspecific(MyConKey, (void *)&checkpointCC );
- cdb_allocate_tsd();
-
- while (!CtdlThreadCheckStop(CT)) {
+ while (!CtdlThreadCheckStop()) {
cdb_checkpoint();
CtdlThreadSleep(60);
}
time_t now;
struct tm tm;
- CT_PUSH(); // Makes it easier to access this threads structure
+ CtdlThreadAllocTSD();
- cdb_allocate_tsd();
-
- while (!CtdlThreadCheckStop(CT)) {
+ while (!CtdlThreadCheckStop()) {
/* Do the auto-purge if the current hour equals the purge hour,
* but not if the operation has already been performed in the
* last twelve hours. This is usually enough granularity.
lprintf(CTDL_INFO, "Auto-purger: starting.\n");
- if (!CtdlThreadCheckStop(CT))
+ if (!CtdlThreadCheckStop())
{
retval = PurgeUsers();
lprintf(CTDL_NOTICE, "Purged %d users.\n", retval);
}
- if (!CtdlThreadCheckStop(CT))
+ if (!CtdlThreadCheckStop())
{
PurgeMessages();
lprintf(CTDL_NOTICE, "Expired %d messages.\n", messages_purged);
}
- if (!CtdlThreadCheckStop(CT))
+ if (!CtdlThreadCheckStop())
{
retval = PurgeRooms();
lprintf(CTDL_NOTICE, "Expired %d rooms.\n", retval);
}
- if (!CtdlThreadCheckStop(CT))
+ if (!CtdlThreadCheckStop())
{
retval = PurgeVisits();
lprintf(CTDL_NOTICE, "Purged %d visits.\n", retval);
}
- if (!CtdlThreadCheckStop(CT))
+ if (!CtdlThreadCheckStop())
{
retval = PurgeUseTable();
lprintf(CTDL_NOTICE, "Purged %d entries from the use table.\n", retval);
}
- if (!CtdlThreadCheckStop(CT))
+ if (!CtdlThreadCheckStop())
{
retval = PurgeEuidIndexTable();
lprintf(CTDL_NOTICE, "Purged %d entries from the EUID index.\n", retval);
}
- if (!CtdlThreadCheckStop(CT))
+ if (!CtdlThreadCheckStop())
{
retval = TDAP_ProcessAdjRefCountQueue();
lprintf(CTDL_NOTICE, "Processed %d message reference count adjustments.\n", retval);
}
- if (!CtdlThreadCheckStop(CT))
+ if (!CtdlThreadCheckStop())
{
lprintf(CTDL_INFO, "Auto-purger: finished.\n");
last_purge = now; /* So we don't do it again soon */
time_t run_time = 0L;
time_t end_time = 0L;
- CT_PUSH();
-
/*
* Don't do this if the site doesn't have it enabled.
*/
ft_index_message(ft_newmsgs[i], 1);
/* Check to see if we need to quit early */
- if (CtdlThreadCheckStop(CT)) {
+ if (CtdlThreadCheckStop()) {
lprintf(CTDL_DEBUG, "Indexer quitting early\n");
ft_newhighest = ft_newmsgs[i];
break;
void *indexer_thread(void *arg) {
struct CitContext indexerCC;
- CT_PUSH();
+ CtdlThreadAllocTSD();
lprintf(CTDL_DEBUG, "indexer_thread() initializing\n");
indexerCC.cs_pid = 0;
pthread_setspecific(MyConKey, (void *)&indexerCC );
- cdb_allocate_tsd();
-
- while (!CtdlThreadCheckStop(CT)) {
+ while (!CtdlThreadCheckStop()) {
do_fulltext_indexing();
CtdlThreadSleep(300);
}
}
else
{
- CtdlThreadCreate("indexer", CTDLTHREAD_BIGSTACK, indexer_thread, NULL);
+ CtdlThreadCreate("Indexer", CTDLTHREAD_BIGSTACK, indexer_thread, NULL);
}
/* return our Subversion id for the Log */
return "$Id$";
int i;
struct CtdlThreadNode *last_worker;
- /* We can't use CT_PUSH() here so we do it the long way
- * So we can still use CT for current thread */
- struct CtdlThreadNode *_this_cit_thread;
-
/*
* Initialise the thread system
*/
ctdl_thread_internal_init();
- _this_cit_thread = CtdlThreadSelf();
/*
* Now create a bunch of worker threads.
*/
static char *CtdlThreadStates[CTDL_THREAD_LAST_STATE];
double CtdlThreadLoadAvg = 0;
double CtdlThreadWorkerAvg = 0;
+pthread_key_t ThreadKey;
+
/*
* Pinched the following bits regarding signals from Kannel.org
*/
}
+
+/*
+ * A function to destroy the TSD
+ */
+static void ctdl_thread_internal_dest_tsd(void *arg)
+{
+ if (arg != NULL) {
+ check_handles(arg);
+ free(arg);
+ }
+}
+
+
+/*
+ * A function to initialise the thread TSD
+ */
+void ctdl_thread_internal_init_tsd(void)
+{
+ int ret;
+
+ if ((ret = pthread_key_create(&ThreadKey, ctdl_thread_internal_dest_tsd))) {
+ lprintf(CTDL_EMERG, "pthread_key_create: %s\n",
+ strerror(ret));
+ exit(CTDLEXIT_DB);
+ }
+}
+
+/*
+ * Ensure that we have a key for thread-specific data.
+ *
+ * This should be called immediately after startup by any thread
+ *
+ */
+void CtdlThreadAllocTSD(void)
+{
+ ThreadTSD *tsd;
+
+ if (pthread_getspecific(ThreadKey) != NULL)
+ return;
+
+ tsd = malloc(sizeof(ThreadTSD));
+
+ tsd->tid = NULL;
+
+ memset(tsd->cursors, 0, sizeof tsd->cursors);
+ tsd->self = NULL;
+
+ pthread_setspecific(ThreadKey, tsd);
+}
+
+
+void ctdl_thread_internal_free_tsd(void)
+{
+ ctdl_thread_internal_dest_tsd(pthread_getspecific(ThreadKey));
+ pthread_setspecific(ThreadKey, NULL);
+}
+
+
void ctdl_thread_internal_cleanup(void)
{
int i;
{
free (CtdlThreadStates[i]);
}
+ ctdl_thread_internal_free_tsd();
}
void ctdl_thread_internal_init(void)
this_thread->name = "Garbage Collection Thread";
this_thread->tid = GC_thread;
+ CT = this_thread;
num_threads++; // Increase the count of threads in the system.
return ret;
}
-/*
- * A function to find the thread structure for this thread
- */
-struct CtdlThreadNode *CtdlThreadSelf(void)
-{
- pthread_t self_tid;
- struct CtdlThreadNode *this_thread;
-
- self_tid = pthread_self();
-
- begin_critical_section(S_THREAD_LIST);
- this_thread = CtdlThreadList;
- while(this_thread)
- {
- pthread_mutex_lock(&this_thread->ThreadMutex);
- if (pthread_equal(self_tid, this_thread->tid))
- {
- pthread_mutex_unlock(&this_thread->ThreadMutex);
- end_critical_section(S_THREAD_LIST);
- return this_thread;
- }
- pthread_mutex_unlock(&this_thread->ThreadMutex);
- this_thread = this_thread->next;
- }
- end_critical_section(S_THREAD_LIST);
- return NULL;
-}
-
* A function to rename a thread
* Returns a const char *
*/
-const char *CtdlThreadName(struct CtdlThreadNode *thread, const char *name)
+const char *CtdlThreadName(const char *name)
{
- struct CtdlThreadNode *this_thread;
const char *old_name;
- if (!thread)
- this_thread = CtdlThreadSelf();
- else
- this_thread = thread;
- if (!this_thread)
+ if (!CT)
{
CtdlLogPrintf(CTDL_WARNING, "Thread system WARNING. Attempt to CtdlThreadRename() a non thread. %s\n", name);
return NULL;
}
-// begin_critical_section(S_THREAD_LIST);
- pthread_mutex_lock(&this_thread->ThreadMutex);
- old_name = this_thread->name;
+ pthread_mutex_lock(&CT->ThreadMutex);
+ old_name = CT->name;
if (name)
- this_thread->name = name;
- pthread_mutex_unlock(&this_thread->ThreadMutex);
-// end_critical_section (S_THREAD_LIST);
+ CT->name = name;
+ pthread_mutex_unlock(&CT->ThreadMutex);
return (old_name);
}
struct CtdlThreadNode *this_thread;
if (!thread)
- this_thread = CtdlThreadSelf();
+ this_thread = CT;
else
this_thread = thread;
if (!this_thread)
/*
* A function for a thread to check if it has been asked to stop
*/
-int CtdlThreadCheckStop(struct CtdlThreadNode *this_thread)
+int CtdlThreadCheckStop(void)
{
- if (!this_thread)
+ if (!CT)
{
CtdlLogPrintf(CTDL_EMERG, "Thread system PANIC, CtdlThreadCheckStop() called by a non thread.\n");
CtdlThreadStopAll();
return -1;
}
- pthread_mutex_lock(&this_thread->ThreadMutex);
- if(this_thread->state == CTDL_THREAD_STOP_REQ)
+ pthread_mutex_lock(&CT->ThreadMutex);
+ if(CT->state == CTDL_THREAD_STOP_REQ)
{
- this_thread->state = CTDL_THREAD_STOPPING;
- pthread_mutex_unlock(&this_thread->ThreadMutex);
+ CT->state = CTDL_THREAD_STOPPING;
+ pthread_mutex_unlock(&CT->ThreadMutex);
return -1;
}
- else if((this_thread->state < CTDL_THREAD_STOP_REQ) && (this_thread->state > CTDL_THREAD_CREATE))
+ else if((CT->state < CTDL_THREAD_STOP_REQ) && (CT->state > CTDL_THREAD_CREATE))
{
- pthread_mutex_unlock(&this_thread->ThreadMutex);
+ pthread_mutex_unlock(&CT->ThreadMutex);
return -1;
}
- pthread_mutex_unlock(&this_thread->ThreadMutex);
+ pthread_mutex_unlock(&CT->ThreadMutex);
return 0;
}
struct CtdlThreadNode *this_thread;
if (!thread)
- this_thread = CtdlThreadSelf();
+ this_thread = CT;
else
this_thread = thread;
if (!this_thread)
{
struct timespec wake_time;
struct timeval time_now;
- struct CtdlThreadNode *self;
- self = CtdlThreadSelf();
- if (!self)
+ if (!CT)
{
CtdlLogPrintf(CTDL_WARNING, "CtdlThreadSleep() called by something that is not a thread. Should we die?\n");
return;
wake_time.tv_nsec = time_now.tv_usec * 10;
// begin_critical_section(S_THREAD_LIST);
- ctdl_thread_internal_change_state (self, CTDL_THREAD_SLEEPING);
+ ctdl_thread_internal_change_state (CT, CTDL_THREAD_SLEEPING);
// end_critical_section(S_THREAD_LIST);
// pthread_mutex_lock(&self->SleepMutex); /* Prevent something asking us to awaken before we've gone to sleep */
- pthread_mutex_lock(&self->ThreadMutex); /* Prevent something asking us to awaken before we've gone to sleep */
- pthread_cond_timedwait(&self->SleepCond, &self->ThreadMutex, &wake_time);
- pthread_mutex_unlock(&self->ThreadMutex);
+ pthread_mutex_lock(&CT->ThreadMutex); /* Prevent something asking us to awaken before we've gone to sleep */
+ pthread_cond_timedwait(&CT->SleepCond, &CT->ThreadMutex, &wake_time);
+ pthread_mutex_unlock(&CT->ThreadMutex);
// pthread_mutex_unlock(&self->SleepMutex);
// begin_critical_section(S_THREAD_LIST);
- ctdl_thread_internal_change_state (self, CTDL_THREAD_RUNNING);
+ ctdl_thread_internal_change_state (CT, CTDL_THREAD_RUNNING);
// end_critical_section(S_THREAD_LIST);
}
*/
static void ctdl_internal_thread_cleanup(void *arg)
{
- struct CtdlThreadNode *this_thread;
- this_thread = CtdlThreadSelf();
/*
* In here we were called by the current thread because it is exiting
* NB. WE ARE THE CURRENT THREAD
*/
- CtdlLogPrintf(CTDL_NOTICE, "Thread \"%s\" (%ld) exited.\n", this_thread->name, this_thread->tid);
+ CtdlLogPrintf(CTDL_NOTICE, "Thread \"%s\" (%ld) exited.\n", CT->name, CT->tid);
// begin_critical_section(S_THREAD_LIST);
#ifdef HAVE_BACKTRACE
eCrash_UnregisterThread();
#endif
- pthread_mutex_lock(&this_thread->ThreadMutex);
- this_thread->state = CTDL_THREAD_EXITED; // needs to be last thing else house keeping will unlink us too early
- pthread_mutex_unlock(&this_thread->ThreadMutex);
+ pthread_mutex_lock(&CT->ThreadMutex);
+ CT->state = CTDL_THREAD_EXITED; // needs to be last thing else house keeping will unlink us too early
+ pthread_mutex_unlock(&CT->ThreadMutex);
// end_critical_section(S_THREAD_LIST);
// CtdlThreadGC();
}
// Register the cleanup function to take care of when we exit.
pthread_cleanup_push(ctdl_internal_thread_cleanup, NULL);
// Get our thread data structure
+ CtdlThreadAllocTSD();
+ CT = this_thread;
this_thread->pid = getpid();
memcpy(&this_thread->last_state_change, &this_thread->start_time, sizeof (struct timeval)); /* Changed state so mark it. */
/* Only change to running state if we weren't asked to stop during the create cycle
*/
pthread_mutex_unlock(&this_thread->ThreadMutex);
- if (!CtdlThreadCheckStop(this_thread))
+ if (!CtdlThreadCheckStop())
{
pthread_mutex_lock(&this_thread->ThreadMutex);
this_thread->state = CTDL_THREAD_RUNNING;
/*
* run the thread to do the work but only if we haven't been asked to stop
*/
- if (!CtdlThreadCheckStop(this_thread))
+ if (!CtdlThreadCheckStop())
ret = (this_thread->thread_func)(this_thread->user_args);
/*
int force_purge = 0;
int m;
- CT_PUSH();
-
- cdb_allocate_tsd();
- while (!CtdlThreadCheckStop(CT)) {
+ while (!CtdlThreadCheckStop()) {
/* make doubly sure we're not holding any stale db handles
* which might cause a deadlock.
}
}
- if (!CtdlThreadCheckStop(CT)) {
+ if (!CtdlThreadCheckStop()) {
tv.tv_sec = 1; /* wake up every second if no input */
tv.tv_usec = 0;
retval = CtdlThreadSelect(highest + 1, &readfds, NULL, NULL, &tv, CT);
}
- if (CtdlThreadCheckStop(CT)) return(NULL);
+ if (CtdlThreadCheckStop()) return(NULL);
/* Now figure out who made this select() unblock.
* First, check for an error or exit condition.
if (errno != EINTR) {
CtdlLogPrintf(CTDL_EMERG, "Exiting (%s)\n", strerror(errno));
CtdlThreadStopAll();
- } else if (!CtdlThreadCheckStop(CT)) {
+ } else if (!CtdlThreadCheckStop()) {
CtdlLogPrintf(CTDL_DEBUG, "Un handled select failure.\n");
goto do_select;
}
#include <pthread.h>
#include <stdarg.h>
#include "sysdep.h"
+
+#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 verbosity;
extern int rescan[];
-extern struct worker_node {
- pthread_t tid;
- struct worker_node *next;
-} *worker_list;
-
/*
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);
projects / citadel.git / commitdiff