/*
* $Id$
*
- * Sleepycat (Berkeley) DB driver for Citadel/UX
+ * Sleepycat (Berkeley) DB driver for Citadel
*
*/
#include "database.h"
#include "msgbase.h"
#include "sysdep_decls.h"
+#include "config.h"
static DB *dbp[MAXCDB]; /* One DB handle for each Citadel database */
static DB_ENV *dbenv; /* The DB environment (global) */
ret = tid->abort(tid);
if (ret) {
- lprintf(1, "cdb_*: txn_abort: %s\n", db_strerror(ret));
+ lprintf(CTDL_EMERG, "cdb_*: txn_abort: %s\n", db_strerror(ret));
abort();
}
}
ret = tid->commit(tid, 0);
if (ret) {
- lprintf(1, "cdb_*: txn_commit: %s\n", db_strerror(ret));
+ lprintf(CTDL_EMERG, "cdb_*: txn_commit: %s\n", db_strerror(ret));
abort();
}
}
ret = dbenv->txn_begin(dbenv, NULL, tid, 0);
if (ret) {
- lprintf(1, "cdb_*: txn_begin: %s\n", db_strerror(ret));
+ lprintf(CTDL_EMERG, "cdb_*: txn_begin: %s\n", db_strerror(ret));
abort();
}
}
+static void dbpanic(DB_ENV* env, int errval)
+{
+ lprintf(CTDL_EMERG, "cdb_*: Berkeley DB panic: %d\n", errval);
+}
+
static void cclose(DBC *cursor) {
int ret;
if ((ret = cursor->c_close(cursor))) {
- lprintf(1, "cdb_*: c_close: %s\n", db_strerror(ret));
+ lprintf(CTDL_EMERG, "cdb_*: c_close: %s\n", db_strerror(ret));
abort();
}
}
for (i = 0; i < MAXCDB; i++)
if (cursors[i] != NULL)
{
- lprintf(1, "cdb_*: cursor still in progress on cdb %d: %s\n", i, msg);
+ lprintf(CTDL_EMERG, "cdb_*: cursor still in progress on cdb %d: %s\n", i, msg);
abort();
}
}
bailIfCursor(tsd->cursors, "in check_handles");
if (tsd->tid != NULL) {
- lprintf(1, "cdb_*: transaction still in progress!");
+ lprintf(CTDL_EMERG, "cdb_*: transaction still in progress!");
abort();
}
}
static void dest_tsd(void *arg) {
if (arg != NULL) {
check_handles(arg);
- phree(arg);
+ free(arg);
}
}
if (pthread_getspecific(tsdkey) != NULL)
return;
- tsd = mallok(sizeof(struct cdbtsd));
+ tsd = malloc(sizeof(struct cdbtsd));
tsd->tid = NULL;
char **file, **list;
char errmsg[SIZ];
- lprintf(5, "Database log file cull started.\n");
+ lprintf(CTDL_INFO, "Database log file cull started.\n");
flags = DB_ARCH_ABS;
/* Get the list of names. */
if ((ret = dbenv->log_archive(dbenv, &list, flags)) != 0) {
- lprintf(1, "cdb_cull_logs: %s\n", db_strerror(ret));
+ lprintf(CTDL_ERR, "cdb_cull_logs: %s\n", db_strerror(ret));
return;
}
/* Print the list of names. */
if (list != NULL) {
for (file = list; *file != NULL; ++file) {
- lprintf(9, "Deleting log: %s\n", *file);
+ lprintf(CTDL_DEBUG, "Deleting log: %s\n", *file);
ret = unlink(*file);
if (ret != 0) {
snprintf(errmsg, sizeof(errmsg),
free(list);
}
- lprintf(5, "Database log file cull ended.\n");
+ lprintf(CTDL_INFO, "Database log file cull ended.\n");
}
0);
if (ret != 0) {
- lprintf(1, "cdb_checkpoint: txn_checkpoint: %s\n",
+ lprintf(CTDL_EMERG, "cdb_checkpoint: txn_checkpoint: %s\n",
db_strerror(ret));
abort();
}
/*
* Open the various databases we'll be using. Any database which
- * does not exist should be created. Note that we don't need an S_DATABASE
- * critical section here, because there aren't any active threads manipulating
- * the database yet -- and besides, it causes problems on BSDI.
+ * does not exist should be created. Note that we don't need a
+ * critical section here, because there aren't any active threads
+ * manipulating the database yet.
*/
void open_databases(void)
{
int i;
char dbfilename[SIZ];
u_int32_t flags = 0;
+ char dbdirname[PATH_MAX];
+ DIR *dp;
+ struct dirent *d;
+ char filename[PATH_MAX];
- lprintf(9, "cdb_*: open_databases() starting\n");
- lprintf(5, "%s\n", db_version(NULL, NULL, NULL));
+
+ getcwd(dbdirname, sizeof dbdirname);
+ strcat(dbdirname, "/data");
+
+ lprintf(CTDL_DEBUG, "cdb_*: open_databases() starting\n");
+ lprintf(CTDL_DEBUG, "Compiled db: %s\n", DB_VERSION_STRING);
+ lprintf(CTDL_INFO, " Linked db: %s\n", db_version(NULL, NULL, NULL));
#ifdef HAVE_ZLIB
- lprintf(5, "zlib compression version %s\n", zlibVersion());
+ lprintf(CTDL_INFO, "Linked zlib: %s\n", zlibVersion());
#endif
/*
* Silently try to create the database subdirectory. If it's
* already there, no problem.
*/
- system("exec mkdir data 2>/dev/null");
+ mkdir(dbdirname, 0700);
+ chmod(dbdirname, 0700);
+ chown(dbdirname, CTDLUID, (-1) );
- lprintf(9, "cdb_*: Setting up DB environment\n");
+ lprintf(CTDL_DEBUG, "cdb_*: Setting up DB environment\n");
db_env_set_func_yield(sched_yield);
ret = db_env_create(&dbenv, 0);
if (ret) {
- lprintf(1, "cdb_*: db_env_create: %s\n", db_strerror(ret));
+ lprintf(CTDL_EMERG, "cdb_*: db_env_create: %s\n", db_strerror(ret));
exit(ret);
}
dbenv->set_errpfx(dbenv, "citserver");
+ dbenv->set_paniccall(dbenv, dbpanic);
/*
* We want to specify the shared memory buffer pool cachesize,
*/
ret = dbenv->set_cachesize(dbenv, 0, 64 * 1024, 0);
if (ret) {
- lprintf(1, "cdb_*: set_cachesize: %s\n", db_strerror(ret));
+ lprintf(CTDL_EMERG, "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, "cdb_*: set_lk_detect: %s\n", db_strerror(ret));
+ lprintf(CTDL_EMERG, "cdb_*: set_lk_detect: %s\n", db_strerror(ret));
dbenv->close(dbenv, 0);
exit(ret);
}
flags = DB_CREATE|DB_RECOVER|DB_INIT_MPOOL|DB_PRIVATE|DB_INIT_TXN|
DB_INIT_LOCK|DB_THREAD;
- ret = dbenv->open(dbenv, "./data", flags, 0);
+ lprintf(CTDL_DEBUG, "dbenv->open(dbenv, %s, %d, 0)\n", dbdirname, flags);
+ ret = dbenv->open(dbenv, dbdirname, flags, 0);
if (ret) {
- lprintf(1, "cdb_*: dbenv->open: %s\n", db_strerror(ret));
+ lprintf(CTDL_DEBUG, "cdb_*: dbenv->open: %s\n", db_strerror(ret));
dbenv->close(dbenv, 0);
exit(ret);
}
- lprintf(7, "cdb_*: Starting up DB\n");
+ lprintf(CTDL_INFO, "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, "cdb_*: db_create: %s\n", db_strerror(ret));
+ lprintf(CTDL_DEBUG, "cdb_*: db_create: %s\n", db_strerror(ret));
exit(ret);
}
dbfilename,
NULL,
DB_BTREE,
- DB_CREATE|DB_THREAD
- |DB_AUTO_COMMIT
+ DB_CREATE|DB_AUTO_COMMIT|DB_THREAD
,
0600);
if (ret) {
- lprintf(1, "cdb_*: db_open[%d]: %s\n", i, db_strerror(ret));
+ lprintf(CTDL_EMERG, "cdb_*: db_open[%d]: %s\n", i, db_strerror(ret));
exit(ret);
}
}
if ((ret = pthread_key_create(&tsdkey, dest_tsd))) {
- lprintf(1, "cdb_*: pthread_key_create: %s\n", strerror(ret));
+ lprintf(CTDL_EMERG, "cdb_*: pthread_key_create: %s\n", strerror(ret));
exit(1);
}
cdb_allocate_tsd();
CtdlRegisterSessionHook(cdb_checkpoint, EVT_TIMER);
- lprintf(9, "cdb_*: open_databases() finished\n");
+
+ /* Now make sure we own all the files, because in a few milliseconds
+ * we're going to drop root privs.
+ */
+ dp = opendir(dbdirname);
+ if (dp != NULL) {
+ while (d = readdir(dp), d != NULL) {
+ if (d->d_name[0] != '.') {
+ snprintf(filename, sizeof filename, "%s/%s",
+ dbdirname, d->d_name);
+ chmod(filename, 0600);
+ chown(filename, CTDLUID, (-1) );
+ }
+ }
+ closedir(dp);
+ }
+
+ lprintf(CTDL_DEBUG, "cdb_*: open_databases() finished\n");
}
cdb_free_tsd();
if ((ret = dbenv->txn_checkpoint(dbenv, 0, 0, 0))) {
- lprintf(1, "cdb_*: txn_checkpoint: %s\n", db_strerror(ret));
- abort();
+ lprintf(CTDL_EMERG,
+ "cdb_*: txn_checkpoint: %s\n",
+ db_strerror(ret));
}
for (a = 0; a < MAXCDB; ++a) {
- lprintf(7, "cdb_*: Closing database %d\n", a);
+ lprintf(CTDL_INFO, "cdb_*: Closing database %d\n", a);
ret = dbp[a]->close(dbp[a], 0);
if (ret) {
- lprintf(1, "cdb_*: db_close: %s\n", db_strerror(ret));
- abort();
+ lprintf(CTDL_EMERG,
+ "cdb_*: db_close: %s\n",
+ db_strerror(ret));
}
}
/* Close the handle. */
ret = dbenv->close(dbenv, 0);
if (ret) {
- lprintf(1, "cdb_*: DBENV->close: %s\n", db_strerror(ret));
- abort();
+ lprintf(CTDL_EMERG,
+ "cdb_*: DBENV->close: %s\n",
+ db_strerror(ret));
}
}
sourceLen = (uLongf) zheader.compressed_len;
destLen = (uLongf) zheader.uncompressed_len;
- uncompressed_data = mallok(zheader.uncompressed_len);
+ uncompressed_data = malloc(zheader.uncompressed_len);
if (uncompress( (Bytef *) uncompressed_data,
- &destLen,
- compressed_data,
- sourceLen
+ (uLongf *)&destLen,
+ (const Bytef *)compressed_data,
+ (uLong)sourceLen
) != Z_OK) {
- lprintf(1, "uncompress() error\n");
+ lprintf(CTDL_EMERG, "uncompress() error\n");
abort();
}
- phree(cdb->ptr);
+ free(cdb->ptr);
cdb->len = (size_t) destLen;
cdb->ptr = uncompressed_data;
}
buffer_len = ( (cdatalen * 101) / 100 ) + 100
+ sizeof(struct CtdlCompressHeader) ;
destLen = (uLongf) buffer_len;
- compressed_data = mallok(buffer_len);
+ compressed_data = malloc(buffer_len);
if (compress2(
(Bytef *) (compressed_data +
sizeof(struct CtdlCompressHeader)),
(uLongf) cdatalen,
1
) != Z_OK) {
- lprintf(1, "compress2() error\n");
+ lprintf(CTDL_EMERG, "compress2() error\n");
abort();
}
zheader.compressed_len = (size_t) destLen;
0); /* flags */
if (ret)
{
- lprintf(1, "cdb_store(%d): %s\n", cdb,
- db_strerror(ret));
+ lprintf(CTDL_EMERG, "cdb_store(%d): %s\n", cdb, db_strerror(ret));
abort();
}
#ifdef HAVE_ZLIB
- if (compressing) phree(compressed_data);
+ if (compressing) free(compressed_data);
#endif
return ret;
}
else
{
- lprintf(1, "cdb_store(%d): %s\n", cdb,
- db_strerror(ret));
+ lprintf(CTDL_EMERG, "cdb_store(%d): %s\n", cdb, db_strerror(ret));
abort();
}
}
{
txcommit(tid);
#ifdef HAVE_ZLIB
- if (compressing) phree(compressed_data);
+ if (compressing) free(compressed_data);
#endif
return ret;
}
ret = dbp[cdb]->del(dbp[cdb], MYTID, &dkey, 0);
if (ret)
{
- lprintf(1, "cdb_delete(%d): %s\n", cdb,
- db_strerror(ret));
+ lprintf(CTDL_EMERG, "cdb_delete(%d): %s\n", cdb, db_strerror(ret));
if (ret != DB_NOTFOUND)
abort();
}
}
else
{
- lprintf(1, "cdb_delete(%d): %s\n", cdb,
- db_strerror(ret));
+ lprintf(CTDL_EMERG, "cdb_delete(%d): %s\n", cdb, db_strerror(ret));
abort();
}
}
if (ret)
{
- lprintf(1, "localcursor: %s\n", db_strerror(ret));
+ lprintf(CTDL_EMERG, "localcursor: %s\n", db_strerror(ret));
abort();
}
if ((ret != 0) && (ret != DB_NOTFOUND))
{
- lprintf(1, "cdb_fetch(%d): %s\n", cdb, db_strerror(ret));
+ lprintf(CTDL_EMERG, "cdb_fetch(%d): %s\n", cdb, db_strerror(ret));
abort();
}
if (ret != 0) return NULL;
- tempcdb = (struct cdbdata *) mallok(sizeof(struct cdbdata));
+ tempcdb = (struct cdbdata *) malloc(sizeof(struct cdbdata));
if (tempcdb == NULL)
{
- lprintf(2, "cdb_fetch: Cannot allocate memory for tempcdb\n");
+ lprintf(CTDL_EMERG, "cdb_fetch: Cannot allocate memory for tempcdb\n");
abort();
}
*/
void cdb_free(struct cdbdata *cdb)
{
- phree(cdb->ptr);
- phree(cdb);
+ free(cdb->ptr);
+ free(cdb);
}
void cdb_close_cursor(int cdb)
{
int ret = 0;
- if (MYCURSORS[cdb] != NULL)
- cclose(MYCURSORS[cdb]);
+ if (MYCURSORS[cdb] != NULL) {
+ lprintf(CTDL_EMERG, "cdb_rewind: must close cursor on database %d before reopening.\n", cdb);
+ abort();
+ /* cclose(MYCURSORS[cdb]); */
+ }
/*
* Now initialize the cursor
*/
ret = dbp[cdb]->cursor(dbp[cdb], MYTID, &MYCURSORS[cdb], 0);
if (ret) {
- lprintf(1, "cdb_rewind: db_cursor: %s\n", db_strerror(ret));
+ lprintf(CTDL_EMERG, "cdb_rewind: db_cursor: %s\n", db_strerror(ret));
abort();
}
}
if (ret) {
if (ret != DB_NOTFOUND) {
- lprintf(1, "cdb_next_item(%d): %s\n",
+ lprintf(CTDL_EMERG, "cdb_next_item(%d): %s\n",
cdb, db_strerror(ret));
abort();
}
return NULL; /* presumably, end of file */
}
- cdbret = (struct cdbdata *) mallok(sizeof(struct cdbdata));
+ cdbret = (struct cdbdata *) malloc(sizeof(struct cdbdata));
cdbret->len = data.size;
cdbret->ptr = data.data;
#ifdef HAVE_ZLIB
if (MYTID != NULL)
{
- lprintf(1, "cdb_begin_transaction: ERROR: nested transaction\n");
+ lprintf(CTDL_EMERG, "cdb_begin_transaction: ERROR: nested transaction\n");
abort();
}
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);
+ lprintf(CTDL_WARNING, "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");
+ lprintf(CTDL_EMERG, "cdb_end_transaction: ERROR: txcommit(NULL) !!\n");
abort();
}
else
if (MYTID != NULL)
{
- lprintf(1, "cdb_trunc must not be called in a transaction.\n");
+ lprintf(CTDL_EMERG, "cdb_trunc must not be called in a transaction.\n");
abort();
}
else
}
else
{
- lprintf(1, "cdb_truncate(%d): %s\n", cdb,
- db_strerror(ret));
+ lprintf(CTDL_EMERG, "cdb_truncate(%d): %s\n", cdb, db_strerror(ret));
abort();
}
}
projects / citadel.git / blobdiff