#include <ac/unistd.h>
#include <ac/stdlib.h>
+#include <lutil.h>
+
#include "back-bdb.h"
#include "external.h"
{ NULL, NULL, 0, 0 }
};
+struct berval bdb_uuid = { 0, NULL };
+
+typedef void * db_malloc(size_t);
+typedef void * db_realloc(void *, size_t);
+
#if 0
static int
-bdb_destroy( BackendInfo *bi )
+bdb_open( BackendInfo *bi )
{
return 0;
}
static int
-bdb_open( BackendInfo *bi )
+bdb_destroy( BackendInfo *bi )
{
- /* initialize the underlying database system */
- Debug( LDAP_DEBUG_TRACE, "bdb_open: initialize BDB backend\n",
- 0, 0, 0 );
-
return 0;
}
{
struct bdb_info *bdb;
+#ifdef NEW_LOGGING
+ LDAP_LOG( BACK_BDB, ENTRY, "bdb_db_init", 0, 0, 0 );
+#else
Debug( LDAP_DEBUG_ANY,
"bdb_db_init: Initializing BDB database\n",
0, 0, 0 );
+#endif
/* indicate system schema supported */
- be->be_flags |= SLAP_BFLAG_ALIASES
- | SLAP_BFLAG_REFERRALS
- | SLAP_BFLAG_SUBENTRIES;
+ be->be_flags |=
+#ifdef BDB_SUBENTRIES
+ SLAP_BFLAG_SUBENTRIES |
+#endif
+#ifdef BDB_ALIASES
+ SLAP_BFLAG_ALIASES |
+#endif
+ SLAP_BFLAG_REFERRALS;
/* allocate backend-database-specific stuff */
bdb = (struct bdb_info *) ch_calloc( 1, sizeof(struct bdb_info) );
/* DBEnv parameters */
- bdb->bi_dbenv_home = ch_strdup( BDB_DBENV_HOME );
+ bdb->bi_dbenv_home = ch_strdup( SLAPD_DEFAULT_DB_DIR );
bdb->bi_dbenv_xflags = 0;
- bdb->bi_dbenv_mode = DEFAULT_MODE;
+ bdb->bi_dbenv_mode = SLAPD_DEFAULT_DB_MODE;
bdb->bi_cache.c_maxsize = DEFAULT_CACHE_SIZE;
-#ifndef NO_THREADS
-#if 0
- bdb->bi_lock_detect = DB_LOCK_NORUN;
-#else
bdb->bi_lock_detect = DB_LOCK_DEFAULT;
-#endif
+ bdb->bi_search_stack_depth = DEFAULT_SEARCH_STACK_DEPTH;
+ bdb->bi_search_stack = NULL;
+
+#ifdef LDAP_CLIENT_UPDATE
+ LDAP_LIST_INIT (&bdb->psearch_list);
#endif
ldap_pvt_thread_mutex_init( &bdb->bi_database_mutex );
ldap_pvt_thread_mutex_init( &bdb->bi_lastid_mutex );
- ldap_pvt_thread_mutex_init( &bdb->bi_cache.c_mutex );
+ ldap_pvt_thread_mutex_init( &bdb->bi_cache.lru_mutex );
+ ldap_pvt_thread_rdwr_init ( &bdb->bi_cache.c_rwlock );
#ifdef BDB_HIER
ldap_pvt_thread_rdwr_init( &bdb->bi_tree_rdwr );
#endif
be->be_private = bdb;
- return 0;
-}
-
-#if 0 /* ifndef NO_THREADS */
-static void *lock_detect_task( void *arg )
-{
- struct bdb_info *bdb = (struct bdb_info *) arg;
-
- while( bdb->bi_dbenv != NULL ) {
- int rc;
- int aborted;
- sleep( bdb->bi_lock_detect_seconds );
-
- rc = LOCK_DETECT( bdb->bi_dbenv, 0,
- bdb->bi_lock_detect, &aborted );
- if( rc != 0 ) {
- break;
- }
-
- Debug( LDAP_DEBUG_ANY,
- "bdb_lock_detect: aborted %d locks\n",
- aborted, 0, 0 );
- }
-
- return NULL;
+ return 0;
}
-#endif
int
bdb_bt_compare(
)
{
unsigned char *u, *c;
- int i;
+ int i, x;
u = usrkey->data;
c = curkey->data;
for( i = sizeof(ID)-1; i >= 0; i--)
#endif
{
- if( u[i] - c[i] )
- return u[i] - c[i];
+ x = u[i] - c[i];
+ if( x ) return x;
}
+
return 0;
}
int rc, i;
struct bdb_info *bdb = (struct bdb_info *) be->be_private;
u_int32_t flags;
+#ifdef HAVE_EBCDIC
+ char path[MAXPATHLEN];
+#endif
+#ifdef NEW_LOGGING
+ LDAP_LOG( BACK_BDB, ARGS,
+ "bdb_db_open: %s\n", be->be_suffix[0].bv_val, 0, 0 );
+#else
Debug( LDAP_DEBUG_ARGS,
"bdb_db_open: %s\n",
- be->be_suffix[0]->bv_val, 0, 0 );
+ be->be_suffix[0].bv_val, 0, 0 );
+#endif
/* we should check existance of dbenv_home and db_directory */
rc = db_env_create( &bdb->bi_dbenv, 0 );
if( rc != 0 ) {
+#ifdef NEW_LOGGING
+ LDAP_LOG( BACK_BDB, ERR,
+ "bdb_db_open: db_env_create failed: %s (%d)\n",
+ db_strerror(rc), rc, 0 );
+#else
Debug( LDAP_DEBUG_ANY,
"bdb_db_open: db_env_create failed: %s (%d)\n",
db_strerror(rc), rc, 0 );
+#endif
return rc;
}
flags = DB_INIT_MPOOL | DB_THREAD | DB_CREATE
- | DB_INIT_LOCK | DB_INIT_LOG | DB_INIT_TXN | DB_RECOVER;
+ | DB_INIT_LOCK | DB_INIT_LOG | DB_INIT_TXN;
+
+#if 0
+ /* Never do automatic recovery, must perform it manually.
+ * Otherwise restarting with gentlehup will corrupt the
+ * database.
+ */
+ if( !(slapMode & SLAP_TOOL_MODE) ) flags |= DB_RECOVER;
+#endif
- bdb->bi_dbenv->set_errpfx( bdb->bi_dbenv, be->be_suffix[0]->bv_val );
+ bdb->bi_dbenv->set_errpfx( bdb->bi_dbenv, be->be_suffix[0].bv_val );
bdb->bi_dbenv->set_errcall( bdb->bi_dbenv, bdb_errcall );
-#ifndef NO_THREADS
bdb->bi_dbenv->set_lk_detect( bdb->bi_dbenv, bdb->bi_lock_detect );
+
+#ifdef SLAP_IDL_CACHE
+ if ( bdb->bi_idl_cache_max_size ) {
+ ldap_pvt_thread_mutex_init( &bdb->bi_idl_tree_mutex );
+ bdb->bi_idl_cache_size = 0;
+ }
#endif
#ifdef BDB_SUBDIRS
rc = bdb->bi_dbenv->set_tmp_dir( bdb->bi_dbenv, dir );
if( rc != 0 ) {
+#ifdef NEW_LOGGING
+ LDAP_LOG( BACK_BDB, ERR,
+ "bdb_db_open: set_tmp_dir(%s) failed: %s (%d)\n",
+ dir, db_strerror(rc), rc );
+#else
Debug( LDAP_DEBUG_ANY,
"bdb_db_open: set_tmp_dir(%s) failed: %s (%d)\n",
dir, db_strerror(rc), rc );
+#endif
return rc;
}
rc = bdb->bi_dbenv->set_lg_dir( bdb->bi_dbenv, dir );
if( rc != 0 ) {
+#ifdef NEW_LOGGING
+ LDAP_LOG( BACK_BDB, ERR,
+ "bdb_db_open: set_lg_dir(%s) failed: %s (%d)\n",
+ dir, db_strerror(rc), rc );
+#else
Debug( LDAP_DEBUG_ANY,
"bdb_db_open: set_lg_dir(%s) failed: %s (%d)\n",
dir, db_strerror(rc), rc );
+#endif
return rc;
}
rc = bdb->bi_dbenv->set_data_dir( bdb->bi_dbenv, dir );
if( rc != 0 ) {
+#ifdef NEW_LOGGING
+ LDAP_LOG( BACK_BDB, ERR,
+ "bdb_db_open: set_data_dir(%s) failed: %s (%d)\n",
+ dir, db_strerror(rc), rc );
+#else
Debug( LDAP_DEBUG_ANY,
"bdb_db_open: set_data_dir(%s) failed: %s (%d)\n",
dir, db_strerror(rc), rc );
+#endif
return rc;
}
}
#endif
+#ifdef NEW_LOGGING
+ LDAP_LOG( BACK_BDB, DETAIL1,
+ "bdb_db_open: dbenv_open %s\n", bdb->bi_dbenv_home, 0, 0 );
+#else
Debug( LDAP_DEBUG_TRACE,
"bdb_db_open: dbenv_open(%s)\n",
bdb->bi_dbenv_home, 0, 0);
+#endif
+#ifdef HAVE_EBCDIC
+ strcpy( path, bdb->bi_dbenv_home );
+ __atoe( path );
+ rc = bdb->bi_dbenv->open( bdb->bi_dbenv,
+ path,
+ flags,
+ bdb->bi_dbenv_mode );
+#else
rc = bdb->bi_dbenv->open( bdb->bi_dbenv,
bdb->bi_dbenv_home,
flags,
bdb->bi_dbenv_mode );
+#endif
if( rc != 0 ) {
+#ifdef NEW_LOGGING
+ LDAP_LOG( BACK_BDB, ERR,
+ "bdb_db_open: dbenv_open failed: %s (%d)\n",
+ db_strerror(rc), rc, 0 );
+#else
Debug( LDAP_DEBUG_ANY,
"bdb_db_open: dbenv_open failed: %s (%d)\n",
db_strerror(rc), rc, 0 );
+#endif
return rc;
}
rc = bdb->bi_dbenv->set_flags( bdb->bi_dbenv,
bdb->bi_dbenv_xflags, 1);
if( rc != 0 ) {
+#ifdef NEW_LOGGING
+ LDAP_LOG( BACK_BDB, ERR,
+ "bdb_db_open: dbenv_set_flags failed: %s (%d)\n",
+ db_strerror(rc), rc, 0 );
+#else
Debug( LDAP_DEBUG_ANY,
"bdb_db_open: dbenv_set_flags failed: %s (%d)\n",
db_strerror(rc), rc, 0 );
+#endif
return rc;
}
}
rc = db_create( &db->bdi_db, bdb->bi_dbenv, 0 );
if( rc != 0 ) {
+#ifdef NEW_LOGGING
+ LDAP_LOG( BACK_BDB, ERR,
+ "bdb_db_open: db_create(%s) failed: %s (%d)\n",
+ bdb->bi_dbenv_home, db_strerror(rc), rc );
+#else
Debug( LDAP_DEBUG_ANY,
"bdb_db_open: db_create(%s) failed: %s (%d)\n",
bdb->bi_dbenv_home, db_strerror(rc), rc );
+#endif
return rc;
}
#ifdef BDB_HIER
rc = db->bdi_db->set_bt_compare( db->bdi_db,
bdb_bt_compare );
-#elif defined(BDB_IDL_MULTI)
+#else
rc = db->bdi_db->set_flags( db->bdi_db,
DB_DUP | DB_DUPSORT );
rc = db->bdi_db->set_dup_compare( db->bdi_db,
BDB_PAGESIZE );
}
- rc = db->bdi_db->open( db->bdi_db,
+#ifdef HAVE_EBCDIC
+ strcpy( path, bdbi_databases[i].file );
+ __atoe( path );
+ rc = DB_OPEN( db->bdi_db,
+ path,
+ /* bdbi_databases[i].name, */ NULL,
+ bdbi_databases[i].type,
+ bdbi_databases[i].flags | flags,
+ bdb->bi_dbenv_mode );
+#else
+ rc = DB_OPEN( db->bdi_db,
bdbi_databases[i].file,
/* bdbi_databases[i].name, */ NULL,
bdbi_databases[i].type,
bdbi_databases[i].flags | flags,
bdb->bi_dbenv_mode );
+#endif
if( rc != 0 ) {
+#ifdef NEW_LOGGING
+ LDAP_LOG( BACK_BDB, ERR,
+ "bdb_db_open: db_create(%s) failed: %s (%d)\n",
+ bdb->bi_dbenv_home, db_strerror(rc), rc );
+#else
Debug( LDAP_DEBUG_ANY,
"bdb_db_open: db_open(%s) failed: %s (%d)\n",
bdb->bi_dbenv_home, db_strerror(rc), rc );
+#endif
return rc;
}
/* get nextid */
rc = bdb_last_id( be, NULL );
if( rc != 0 ) {
+#ifdef NEW_LOGGING
+ LDAP_LOG( BACK_BDB, ERR,
+ "bdb_db_open: last_id(%s) failed: %s (%d)\n",
+ bdb->bi_dbenv_home, db_strerror(rc), rc );
+#else
Debug( LDAP_DEBUG_ANY,
"bdb_db_open: last_id(%s) failed: %s (%d)\n",
bdb->bi_dbenv_home, db_strerror(rc), rc );
+#endif
return rc;
}
#ifdef BDB_HIER
rc = bdb_build_tree( be );
#endif
-
-#if 0 /* ifndef NO_THREADS */
- if( bdb->bi_lock_detect != DB_LOCK_NORUN ) {
- /* listener as a separate THREAD */
- rc = ldap_pvt_thread_create( &bdb->bi_lock_detect_tid,
- 1, lock_detect_task, bdb );
- }
-#endif
return 0;
}
int rc;
struct bdb_info *bdb = (struct bdb_info *) be->be_private;
struct bdb_db_info *db;
+#ifdef SLAP_IDL_CACHE
+ bdb_idl_cache_entry_t *entry, *next_entry;
+#endif
while( bdb->bi_ndatabases-- ) {
db = bdb->bi_databases[bdb->bi_ndatabases];
bdb_cache_release_all (&bdb->bi_cache);
+#ifdef SLAP_IDL_CACHE
+ ldap_pvt_thread_mutex_lock ( &bdb->bi_idl_tree_mutex );
+ entry = bdb->bi_idl_lru_head;
+ while ( entry != NULL ) {
+ next_entry = entry->idl_lru_next;
+ free( entry->idl );
+ free( entry->kstr.bv_val );
+ free( entry );
+ entry = next_entry;
+ }
+ ldap_pvt_thread_mutex_unlock ( &bdb->bi_idl_tree_mutex );
+#endif
+
return 0;
}
/* force a checkpoint */
rc = TXN_CHECKPOINT( bdb->bi_dbenv, 0, 0, DB_FORCE );
if( rc != 0 ) {
+#ifdef NEW_LOGGING
+ LDAP_LOG( BACK_BDB, ERR,
+ "bdb_db_destroy: txn_checkpoint failed: %s (%d)\n",
+ db_strerror(rc), rc, 0 );
+#else
Debug( LDAP_DEBUG_ANY,
"bdb_db_destroy: txn_checkpoint failed: %s (%d)\n",
db_strerror(rc), rc, 0 );
+#endif
}
bdb_cache_release_all (&bdb->bi_cache);
rc = bdb->bi_dbenv->close( bdb->bi_dbenv, 0 );
bdb->bi_dbenv = NULL;
if( rc != 0 ) {
+#ifdef NEW_LOGGING
+ LDAP_LOG( BACK_BDB, ERR,
+ "bdb_db_destroy: close failed: %s (%d)\n",
+ db_strerror(rc), rc, 0 );
+#else
Debug( LDAP_DEBUG_ANY,
"bdb_db_destroy: close failed: %s (%d)\n",
db_strerror(rc), rc, 0 );
+#endif
return rc;
}
}
+ if( bdb->bi_dbenv_home ) ch_free( bdb->bi_dbenv_home );
+
+#ifdef BDB_HIER
+ ldap_pvt_thread_rdwr_destroy( &bdb->bi_tree_rdwr );
+#endif
+ ldap_pvt_thread_rdwr_destroy ( &bdb->bi_cache.c_rwlock );
+ ldap_pvt_thread_mutex_destroy( &bdb->bi_cache.lru_mutex );
+ ldap_pvt_thread_mutex_destroy( &bdb->bi_lastid_mutex );
+ ldap_pvt_thread_mutex_destroy( &bdb->bi_database_mutex );
+
+ ch_free( bdb );
+ be->be_private = NULL;
+
return 0;
}
{
static char *controls[] = {
LDAP_CONTROL_MANAGEDSAIT,
- LDAP_CONTROL_SUBENTRIES,
LDAP_CONTROL_NOOP,
+ LDAP_CONTROL_PAGEDRESULTS,
+ LDAP_CONTROL_VALUESRETURNFILTER,
+#ifdef LDAP_CONTROL_SUBENTRIES
+ LDAP_CONTROL_SUBENTRIES,
+#endif
+#ifdef LDAP_CLIENT_UPDATE
+ LDAP_CONTROL_CLIENT_UPDATE,
+#endif
NULL
};
+ bi->bi_controls = controls;
+
+ /* initialize the underlying database system */
+#ifdef NEW_LOGGING
+ LDAP_LOG( BACK_BDB, ENTRY, "bdb_db_initialize\n", 0, 0, 0 );
+#else
+ Debug( LDAP_DEBUG_TRACE, "bdb_initialize: initialize BDB backend\n",
+ 0, 0, 0 );
+#endif
+
{ /* version check */
int major, minor, patch;
char *version = db_version( &major, &minor, &patch );
+#ifdef HAVE_EBCDIC
+ char v2[1024];
+
+ /* All our stdio does an ASCII to EBCDIC conversion on
+ * the output. Strings from the BDB library are already
+ * in EBCDIC; we have to go back and forth...
+ */
+ strcpy( v2, version );
+ __etoa( v2 );
+ version = v2;
+#endif
if( major != DB_VERSION_MAJOR ||
minor != DB_VERSION_MINOR ||
patch < DB_VERSION_PATCH )
{
+#ifdef NEW_LOGGING
+ LDAP_LOG( BACK_BDB, ERR,
+ "bdb_db_initialize: version mismatch: "
+ "\texpected: %s \tgot: %s\n", DB_VERSION_STRING, version, 0 );
+#else
Debug( LDAP_DEBUG_ANY,
- "bi_back_initialize: version mismatch\n"
+ "bdb_initialize: version mismatch\n"
"\texpected: " DB_VERSION_STRING "\n"
"\tgot: %s \n", version, 0, 0 );
+#endif
}
+#ifdef NEW_LOGGING
+ LDAP_LOG( BACK_BDB, DETAIL1,
+ "bdb_db_initialize: %s\n", version, 0, 0 );
+#else
Debug( LDAP_DEBUG_ANY, "bdb_initialize: %s\n",
version, 0, 0 );
+#endif
}
-#if 0
- db_env_set_func_malloc( ch_malloc );
- db_env_set_func_realloc( ch_realloc );
- db_env_set_func_free( ch_free );
+ db_env_set_func_free( ber_memfree );
+ db_env_set_func_malloc( (db_malloc *)ber_memalloc );
+ db_env_set_func_realloc( (db_realloc *)ber_memrealloc );
+#ifndef NO_THREAD
+ /* This is a no-op on a NO_THREAD build. Leave the default
+ * alone so that BDB will sleep on interprocess conflicts.
+ */
+ db_env_set_func_yield( ldap_pvt_thread_yield );
#endif
- db_env_set_func_yield( ldap_pvt_thread_yield );
+ {
+ static char uuidbuf[ LDAP_LUTIL_UUIDSTR_BUFSIZE ];
- bi->bi_controls = controls;
+ bdb_uuid.bv_len = lutil_uuidstr( uuidbuf, sizeof( uuidbuf ));
+ bdb_uuid.bv_val = uuidbuf;
+ }
bi->bi_open = 0;
bi->bi_close = 0;
bi->bi_extended = bdb_extended;
-#if 0
+#if 1
/*
* these routines (and their callers) are not yet designed
* to work with transaction. Using them may cause deadlock.
#endif
bi->bi_chk_referrals = bdb_referrals;
+ bi->bi_operational = bdb_operational;
+ bi->bi_has_subordinates = bdb_hasSubordinates;
bi->bi_entry_release_rw = bdb_entry_release;
/*
projects / openldap / blobdiff