#include <string.h>
#include <errno.h>
#include <sys/types.h>
+#include <sys/stat.h>
+#include <dirent.h>
#include <db.h>
#include <pthread.h>
#include "citadel.h"
#include "sysdep_decls.h"
#include "dynloader.h"
-DB *dbp[MAXCDB]; /* One DB handle for each Citadel database */
-DB_ENV *dbenv; /* The DB environment (global) */
+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 *cursor; /* Cursor, for traversals... */
+ DBC *cursors[MAXCDB]; /* Cursors, for traversals... */
};
-int num_ssd = 0;
-
static pthread_key_t tsdkey;
-#define MYCURSOR (((struct cdbtsd*)pthread_getspecific(tsdkey))->cursor)
+#define MYCURSORS (((struct cdbtsd*)pthread_getspecific(tsdkey))->cursors)
#define MYTID (((struct cdbtsd*)pthread_getspecific(tsdkey))->tid)
/* just a little helper function */
-static int txabort(DB_TXN *tid) {
+static void txabort(DB_TXN *tid) {
int ret = txn_abort(tid);
- if (ret)
- lprintf(1, "txn_abort: %s\n", db_strerror(ret));
-
- return ret;
+ if (ret) {
+ lprintf(1, "cdb_*: txn_abort: %s\n", db_strerror(ret));
+ abort();
+ }
}
/* this one is even more helpful than the last. */
-static int txcommit(DB_TXN *tid) {
+static void txcommit(DB_TXN *tid) {
int ret = txn_commit(tid, 0);
- if (ret)
- lprintf(1, "txn_commit: %s\n", db_strerror(ret));
-
- return ret;
+ if (ret) {
+ lprintf(1, "cdb_*: txn_commit: %s\n", db_strerror(ret));
+ abort();
+ }
}
/* are you sensing a pattern yet? */
-static int txbegin(DB_TXN **tid) {
+static void txbegin(DB_TXN **tid) {
int ret = txn_begin(dbenv, NULL, tid, 0);
- if (ret)
- lprintf(1, "txn_begin: %s\n", db_strerror(ret));
+ if (ret) {
+ lprintf(1, "cdb_*: txn_begin: %s\n", db_strerror(ret));
+ abort();
+ }
+}
+
+static void cclose(DBC *cursor) {
+ int ret;
+
+ if ((ret = cursor->c_close(cursor))) {
+ lprintf(1, "cdb_*: c_close: %s\n", db_strerror(ret));
+ abort();
+ }
+}
- return ret;
+static void bailIfCursor(DBC **cursors, const char *msg)
+{
+ int i;
+
+ for (i = 0; i < MAXCDB; i++)
+ if (cursors[i] != NULL)
+ {
+ lprintf(1, "cdb_*: cursor still in progress on cdb %d: %s\n", i, msg);
+ abort();
+ }
}
-static void release_handles(void *arg) {
+static void check_handles(void *arg) {
if (arg != NULL) {
struct cdbtsd *tsd = (struct cdbtsd *)arg;
- if (tsd->cursor != NULL) {
- lprintf(1, "WARNING: cursor still in progress; "
- "closing!\n");
- tsd->cursor->c_close(tsd->cursor);
- }
+ bailIfCursor(tsd->cursors, "in check_handles");
if (tsd->tid != NULL) {
- lprintf(1, "ERROR: transaction still in progress; "
- "aborting!\n");
- txabort(tsd->tid);
+ lprintf(1, "cdb_*: transaction still in progress!");
+ abort();
}
}
}
static void dest_tsd(void *arg) {
if (arg != NULL) {
- release_handles(arg);
+ check_handles(arg);
phree(arg);
}
}
* to use database calls, except for whatever thread calls open_databases.
*/
void cdb_allocate_tsd(void) {
- struct cdbtsd *tsd = mallok(sizeof *tsd);
+ struct cdbtsd *tsd;
+
+ if (pthread_getspecific(tsdkey) != NULL)
+ return;
+
+ tsd = mallok(sizeof *tsd);
tsd->tid = NULL;
- tsd->cursor = NULL;
+
+ memset(tsd->cursors, 0, sizeof tsd->cursors);
pthread_setspecific(tsdkey, tsd);
}
pthread_setspecific(tsdkey, NULL);
}
-void cdb_release_handles(void) {
- release_handles(pthread_getspecific(tsdkey));
+void cdb_check_handles(void) {
+ check_handles(pthread_getspecific(tsdkey));
}
}
+/*
+ * Cull the database logs
+ */
+static void cdb_cull_logs(void) {
+ DIR *dp;
+ struct dirent *d;
+ char filename[SIZ];
+ struct stat statbuf;
+
+ lprintf(5, "Database log file cull started.\n");
+
+ dp = opendir("data");
+ if (dp == NULL) return;
+
+ while (d = readdir(dp), d != NULL) {
+ if (!strncasecmp(d->d_name, "log.", 4)) {
+ sprintf(filename, "./data/%s", d->d_name);
+ stat(filename, &statbuf);
+ if ((time(NULL) - statbuf.st_mtime) > 432000L) {
+ lprintf(5, "%s ... deleted\n", filename);
+ unlink(filename);
+ }
+ else {
+ lprintf(5, "%s ... kept\n", filename);
+ }
+ }
+ }
+
+ closedir(dp);
+
+ lprintf(5, "Database log file cull ended.\n");
+}
+
/*
* Request a checkpoint of the database.
*/
static void cdb_checkpoint(void) {
int ret;
+ static time_t last_cull = 0L;
ret = txn_checkpoint(dbenv,
MAX_CHECKPOINT_KBYTES,
MAX_CHECKPOINT_MINUTES,
0);
if (ret) {
- lprintf(1, "txn_checkpoint: %s\n", db_strerror(ret));
+ lprintf(1, "cdb_checkpoint: txn_checkpoint: %s\n", db_strerror(ret));
+ abort();
+ }
+
+
+ /* Cull the logs if we haven't done so for 24 hours */
+ if ((time(NULL) - last_cull) > 86400L) {
+ last_cull = time(NULL);
+ cdb_cull_logs();
}
+
}
/*
char dbfilename[SIZ];
u_int32_t flags = 0;
- lprintf(9, "open_databases() starting\n");
+ lprintf(9, "cdb_*: open_databases() starting\n");
/*
* Silently try to create the database subdirectory. If it's
* already there, no problem.
*/
system("exec mkdir data 2>/dev/null");
- lprintf(9, "Setting up DB environment\n");
+ lprintf(9, "cdb_*: Setting up DB environment\n");
db_env_set_func_yield(sched_yield);
ret = db_env_create(&dbenv, 0);
if (ret) {
- lprintf(1, "db_env_create: %s\n", db_strerror(ret));
+ lprintf(1, "cdb_*: db_env_create: %s\n", db_strerror(ret));
exit(ret);
}
dbenv->set_errpfx(dbenv, "citserver");
*/
ret = dbenv->set_cachesize(dbenv, 0, 64 * 1024, 0);
if (ret) {
- lprintf(1, "set_cachesize: %s\n", db_strerror(ret));
+ lprintf(1, "cdb_*: set_cachesize: %s\n", db_strerror(ret));
dbenv->close(dbenv, 0);
exit(ret);
}
if ((ret = dbenv->set_lk_detect(dbenv, DB_LOCK_DEFAULT))) {
- lprintf(1, "set_lk_detect: %s\n", db_strerror(ret));
+ lprintf(1, "cdb_*: set_lk_detect: %s\n", db_strerror(ret));
dbenv->close(dbenv, 0);
exit(ret);
}
DB_INIT_LOCK|DB_THREAD;
ret = dbenv->open(dbenv, "./data", flags, 0);
if (ret) {
- lprintf(1, "dbenv->open: %s\n", db_strerror(ret));
+ lprintf(1, "cdb_*: dbenv->open: %s\n", db_strerror(ret));
dbenv->close(dbenv, 0);
exit(ret);
}
- lprintf(7, "Starting up DB\n");
+ lprintf(7, "cdb_*: Starting up DB\n");
for (i = 0; i < MAXCDB; ++i) {
/* Create a database handle */
ret = db_create(&dbp[i], dbenv, 0);
if (ret) {
- lprintf(1, "db_create: %s\n", db_strerror(ret));
+ lprintf(1, "cdb_*: db_create: %s\n", db_strerror(ret));
exit(ret);
}
dbfilename,
NULL,
DB_BTREE,
- DB_CREATE,
+ DB_CREATE|DB_THREAD,
0600);
if (ret) {
- lprintf(1, "db_open[%d]: %s\n", i, db_strerror(ret));
+ lprintf(1, "cdb_*: db_open[%d]: %s\n", i, db_strerror(ret));
exit(ret);
}
}
if ((ret = pthread_key_create(&tsdkey, dest_tsd))) {
- lprintf(1, "pthread_key_create: %s\n", strerror(ret));
+ lprintf(1, "cdb_*: pthread_key_create: %s\n", strerror(ret));
exit(1);
}
cdb_allocate_tsd();
CtdlRegisterSessionHook(cdb_checkpoint, EVT_TIMER);
- lprintf(9, "open_databases() finished\n");
+ lprintf(9, "cdb_*: open_databases() finished\n");
}
/*
- * Close all of the gdbm database files we've opened. This can be done
+ * Close all of the db database files we've opened. This can be done
* in a loop, since it's just a bunch of closes.
*/
void close_databases(void)
cdb_free_tsd();
if ((ret = txn_checkpoint(dbenv, 0, 0, 0))) {
- lprintf(1, "txn_checkpoint: %s\n", db_strerror(ret));
+ lprintf(1, "cdb_*: txn_checkpoint: %s\n", db_strerror(ret));
+ abort();
}
for (a = 0; a < MAXCDB; ++a) {
- lprintf(7, "Closing database %d\n", a);
+ lprintf(7, "cdb_*: Closing database %d\n", a);
ret = dbp[a]->close(dbp[a], 0);
if (ret) {
- lprintf(1, "db_close: %s\n", db_strerror(ret));
+ lprintf(1, "cdb_*: db_close: %s\n", db_strerror(ret));
+ abort();
}
}
/* Close the handle. */
ret = dbenv->close(dbenv, 0);
if (ret) {
- lprintf(1, "DBENV->close: %s\n", db_strerror(ret));
+ lprintf(1, "cdb_*: DBENV->close: %s\n", db_strerror(ret));
+ abort();
}
}
void *cdata, int cdatalen)
{
- DBT dkey, ddata;
- DB_TXN *tid;
- int ret;
-
- memset(&dkey, 0, sizeof(DBT));
- memset(&ddata, 0, sizeof(DBT));
- dkey.size = ckeylen;
- dkey.data = ckey;
- ddata.size = cdatalen;
- ddata.data = cdata;
-
- if (MYTID != NULL) {
- ret = dbp[cdb]->put(dbp[cdb], /* db */
- MYTID, /* transaction ID */
- &dkey, /* key */
- &ddata, /* data */
- 0); /* flags */
- if (ret) {
- lprintf(1, "cdb_store(%d): %s\n", cdb,
- db_strerror(ret));
- }
- return ret;
- } else {
- retry:
- if (txbegin(&tid))
- return -1;
-
- if ((ret = dbp[cdb]->put(dbp[cdb], /* db */
- tid, /* transaction ID */
- &dkey, /* key */
- &ddata, /* data */
- 0))) { /* flags */
- if (ret == DB_LOCK_DEADLOCK) {
- if (txabort(tid))
- return ret;
- else
- goto retry;
- } else {
- lprintf(1, "cdb_store(%d): %s\n", cdb,
- db_strerror(ret));
- txabort(tid);
- return ret;
- }
- } else {
- return txcommit(tid);
- }
+ DBT dkey, ddata;
+ DB_TXN *tid;
+ int ret;
+
+ memset(&dkey, 0, sizeof(DBT));
+ memset(&ddata, 0, sizeof(DBT));
+ dkey.size = ckeylen;
+ dkey.data = ckey;
+ ddata.size = cdatalen;
+ ddata.data = cdata;
+
+ if (MYTID != NULL)
+ {
+ ret = dbp[cdb]->put(dbp[cdb], /* db */
+ MYTID, /* transaction ID */
+ &dkey, /* key */
+ &ddata, /* data */
+ 0); /* flags */
+ if (ret)
+ {
+ lprintf(1, "cdb_store(%d): %s\n", cdb,
+ db_strerror(ret));
+ abort();
}
+ return ret;
+
+ }
+ else
+ {
+ bailIfCursor(MYCURSORS, "attempt to write during r/o cursor");
+
+ retry:
+ txbegin(&tid);
+
+ if ((ret = dbp[cdb]->put(dbp[cdb], /* db */
+ tid, /* transaction ID */
+ &dkey, /* key */
+ &ddata, /* data */
+ 0))) /* flags */
+ {
+ if (ret == DB_LOCK_DEADLOCK)
+ {
+ txabort(tid);
+ goto retry;
+ }
+ else
+ {
+ lprintf(1, "cdb_store(%d): %s\n", cdb,
+ db_strerror(ret));
+ abort();
+ }
+ }
+ else
+ {
+ txcommit(tid);
+ return ret;
+ }
+ }
}
int cdb_delete(int cdb, void *key, int keylen)
{
- DBT dkey;
- DB_TXN *tid;
- int ret;
-
- dkey.size = keylen;
- dkey.data = key;
-
- if (MYTID != NULL) {
- ret = dbp[cdb]->del(dbp[cdb], MYTID, &dkey, 0);
- return (ret);
- } else {
- retry:
- if (txbegin(&tid))
- return -1;
-
- if ((ret = dbp[cdb]->del(dbp[cdb], tid, &dkey, 0))) {
- if (ret == DB_LOCK_DEADLOCK) {
- if (txabort(tid))
- return ret;
- else
- goto retry;
- } else {
- lprintf(1, "cdb_store(%d): %s\n", cdb,
- db_strerror(ret));
- txabort(tid);
- return ret;
- }
- } else {
- return txcommit(tid);
- }
+ DBT dkey;
+ DB_TXN *tid;
+ int ret;
+
+ memset(&dkey, 0, sizeof dkey);
+ dkey.size = keylen;
+ dkey.data = key;
+
+ if (MYTID != NULL)
+ {
+ ret = dbp[cdb]->del(dbp[cdb], MYTID, &dkey, 0);
+ if (ret)
+ {
+ lprintf(1, "cdb_delete(%d): %s\n", cdb,
+ db_strerror(ret));
+ if (ret != DB_NOTFOUND)
+ abort();
+ }
+ }
+ else
+ {
+ bailIfCursor(MYCURSORS, "attempt to delete during r/o cursor");
+
+ retry:
+ txbegin(&tid);
+
+ if ((ret = dbp[cdb]->del(dbp[cdb], tid, &dkey, 0))
+ && ret != DB_NOTFOUND)
+ {
+ if (ret == DB_LOCK_DEADLOCK)
+ {
+ txabort(tid);
+ goto retry;
+ }
+ else
+ {
+ lprintf(1, "cdb_delete(%d): %s\n", cdb,
+ db_strerror(ret));
+ abort();
+ }
+ }
+ else
+ {
+ txcommit(tid);
}
+ }
+ return ret;
}
+static DBC *localcursor(int cdb)
+{
+ int ret;
+ DBC *curs;
+
+ if (MYCURSORS[cdb] == NULL)
+ ret = dbp[cdb]->cursor(dbp[cdb], MYTID, &curs, 0);
+ else
+ ret = MYCURSORS[cdb]->c_dup(MYCURSORS[cdb], &curs, DB_POSITION);
+ if (ret)
+ {
+ lprintf(1, "localcursor: %s\n", db_strerror(ret));
+ abort();
+ }
+
+ return curs;
+}
/*
struct cdbdata *cdb_fetch(int cdb, void *key, int keylen)
{
- struct cdbdata *tempcdb;
- DBT dkey, dret;
- DB_TXN *tid;
- int ret;
-
- memset(&dkey, 0, sizeof(DBT));
- memset(&dret, 0, sizeof(DBT));
- dkey.size = keylen;
- dkey.data = key;
- dret.flags = DB_DBT_MALLOC;
-
- if (MYTID != NULL) {
- ret = dbp[cdb]->get(dbp[cdb], MYTID, &dkey, &dret, 0);
- } else {
- retry:
- if (txbegin(&tid))
- return NULL;
-
- ret = dbp[cdb]->get(dbp[cdb], tid, &dkey, &dret, 0);
-
- if (ret == DB_LOCK_DEADLOCK) {
- if (txabort(tid))
- return NULL;
- else
- goto retry;
- } else if (txcommit(tid))
- return NULL;
+ struct cdbdata *tempcdb;
+ DBT dkey, dret;
+ int ret;
+
+ memset(&dkey, 0, sizeof(DBT));
+ dkey.size = keylen;
+ dkey.data = key;
+
+ if (MYTID != NULL)
+ {
+ memset(&dret, 0, sizeof(DBT));
+ dret.flags = DB_DBT_MALLOC;
+ ret = dbp[cdb]->get(dbp[cdb], MYTID, &dkey, &dret, 0);
+ }
+ else
+ {
+ DBC *curs;
+
+ do
+ {
+ memset(&dret, 0, sizeof(DBT));
+ dret.flags = DB_DBT_MALLOC;
+
+ curs = localcursor(cdb);
+
+ ret = curs->c_get(curs, &dkey, &dret, DB_SET);
+ cclose(curs);
}
+ while (ret == DB_LOCK_DEADLOCK);
- if ((ret != 0) && (ret != DB_NOTFOUND)) {
- lprintf(1, "cdb_fetch: %s\n", db_strerror(ret));
- }
- if (ret != 0) return NULL;
- tempcdb = (struct cdbdata *) mallok(sizeof(struct cdbdata));
- if (tempcdb == NULL) {
- lprintf(2, "Cannot allocate memory!\n");
- }
- tempcdb->len = dret.size;
- tempcdb->ptr = dret.data;
- return (tempcdb);
+ }
+
+ if ((ret != 0) && (ret != DB_NOTFOUND))
+ {
+ lprintf(1, "cdb_fetch(%d): %s\n", cdb, db_strerror(ret));
+ abort();
+ }
+
+ if (ret != 0) return NULL;
+ tempcdb = (struct cdbdata *) mallok(sizeof(struct cdbdata));
+
+ if (tempcdb == NULL)
+ {
+ lprintf(2, "cdb_fetch: Cannot allocate memory for tempcdb\n");
+ abort();
+ }
+
+ tempcdb->len = dret.size;
+ tempcdb->ptr = dret.data;
+ return (tempcdb);
}
phree(cdb);
}
+void cdb_close_cursor(int cdb)
+{
+ if (MYCURSORS[cdb] != NULL)
+ cclose(MYCURSORS[cdb]);
+
+ MYCURSORS[cdb] = NULL;
+}
/*
* Prepare for a sequential search of an entire database.
{
int ret = 0;
- if (MYCURSOR != NULL)
- MYCURSOR->c_close(MYCURSOR);
-
- if (MYTID == NULL) {
- lprintf(1, "ERROR: cursor use outside transaction\n");
- abort();
- }
+ if (MYCURSORS[cdb] != NULL)
+ cclose(MYCURSORS[cdb]);
/*
* Now initialize the cursor
*/
- ret = dbp[cdb]->cursor(dbp[cdb], MYTID, &MYCURSOR, 0);
+ ret = dbp[cdb]->cursor(dbp[cdb], MYTID, &MYCURSORS[cdb], 0);
if (ret) {
- lprintf(1, "db_cursor: %s\n", db_strerror(ret));
+ lprintf(1, "cdb_rewind: db_cursor: %s\n", db_strerror(ret));
+ abort();
}
}
memset(&data, 0, sizeof(data));
data.flags = DB_DBT_MALLOC;
- ret = MYCURSOR->c_get(MYCURSOR,
+ ret = MYCURSORS[cdb]->c_get(MYCURSORS[cdb],
&key, &data, DB_NEXT);
if (ret) {
- MYCURSOR->c_close(MYCURSOR);
- MYCURSOR = NULL;
+ if (ret != DB_NOTFOUND) {
+ lprintf(1, "cdb_next_item(%d): %s\n",
+ cdb, db_strerror(ret));
+ abort();
+ }
+ cclose(MYCURSORS[cdb]);
+ MYCURSORS[cdb] = NULL;
return NULL; /* presumably, end of file */
}
void cdb_begin_transaction(void) {
- if (MYTID != NULL) { /* FIXME this slows it down, take it out */
- lprintf(1, "ERROR: opening a new transaction with one already open!\n");
- abort();
- }
- else {
- txbegin(&MYTID);
- }
+ bailIfCursor(MYCURSORS, "can't begin transaction during r/o cursor");
+
+ if (MYTID != NULL)
+ {
+ lprintf(1, "cdb_begin_transaction: ERROR: nested transaction\n");
+ abort();
+ }
+
+ txbegin(&MYTID);
}
void cdb_end_transaction(void) {
- if (MYCURSOR != NULL) {
- lprintf(1, "WARNING: cursor still open at transaction end\n");
- MYCURSOR->c_close(MYCURSOR);
- MYCURSOR = NULL;
- }
- if (MYTID == NULL) lprintf(1, "ERROR: txcommit(NULL) !!\n");
- else txcommit(MYTID);
- MYTID = NULL;
+ int i;
+
+ for (i = 0; i < MAXCDB; i++)
+ if (MYCURSORS[i] != NULL) {
+ lprintf(1, "cdb_end_transaction: WARNING: cursor %d still open at transaction end\n", i);
+ cclose(MYCURSORS[i]);
+ MYCURSORS[i] = NULL;
+ }
+
+ if (MYTID == NULL)
+ {
+ lprintf(1, "cdb_end_transaction: ERROR: txcommit(NULL) !!\n");
+ abort();
+ }
+ else
+ txcommit(MYTID);
+
+ MYTID = NULL;
}
projects / citadel.git / blobdiff