From d3168d0011460ad434540ed6d34c158bab9b1bc7 Mon Sep 17 00:00:00 2001 From: Kurt Zeilenga Date: Wed, 31 Dec 2003 04:26:17 +0000 Subject: [PATCH] cleanup --- servers/slapd/back-bdb/add.c | 30 +++++++------ servers/slapd/back-bdb/cache.c | 77 ++++++++++++++-------------------- servers/slapd/back-ldbm/add.c | 36 +++++++++------- 3 files changed, 71 insertions(+), 72 deletions(-) diff --git a/servers/slapd/back-bdb/add.c b/servers/slapd/back-bdb/add.c index 892e969f9c..33916c7bab 100644 --- a/servers/slapd/back-bdb/add.c +++ b/servers/slapd/back-bdb/add.c @@ -53,17 +53,21 @@ bdb_add(Operation *op, SlapReply *rs ) int num_ctrls = 0; #ifdef NEW_LOGGING - LDAP_LOG ( OPERATION, ARGS, "==> bdb_add: %s\n", op->oq_add.rs_e->e_name.bv_val, 0, 0 ); + LDAP_LOG ( OPERATION, ARGS, "==> bdb_add: %s\n", + op->oq_add.rs_e->e_name.bv_val, 0, 0 ); #else - Debug(LDAP_DEBUG_ARGS, "==> bdb_add: %s\n", op->oq_add.rs_e->e_name.bv_val, 0, 0); + Debug(LDAP_DEBUG_ARGS, "==> bdb_add: %s\n", + op->oq_add.rs_e->e_name.bv_val, 0, 0); #endif /* check entry's schema */ - rs->sr_err = entry_schema_check( op->o_bd, op->oq_add.rs_e, NULL, &rs->sr_text, textbuf, textlen ); + rs->sr_err = entry_schema_check( op->o_bd, op->oq_add.rs_e, + NULL, &rs->sr_text, textbuf, textlen ); if ( rs->sr_err != LDAP_SUCCESS ) { #ifdef NEW_LOGGING - LDAP_LOG ( OPERATION, ERR, - "bdb_add: entry failed schema check: %s (%d)\n", rs->sr_text, rs->sr_err, 0 ); + LDAP_LOG ( OPERATION, ERR, + "bdb_add: entry failed schema check: %s (%d)\n", + rs->sr_text, rs->sr_err, 0 ); #else Debug( LDAP_DEBUG_TRACE, "bdb_add: entry failed schema check: %s (%d)\n", @@ -121,7 +125,8 @@ retry: /* transaction retry */ if( rs->sr_err != 0 ) { #ifdef NEW_LOGGING LDAP_LOG ( OPERATION, ERR, - "bdb_add: txn_begin failed: %s (%d)\n", db_strerror(rs->sr_err), rs->sr_err, 0 ); + "bdb_add: txn_begin failed: %s (%d)\n", + db_strerror(rs->sr_err), rs->sr_err, 0 ); #else Debug( LDAP_DEBUG_TRACE, "bdb_add: txn_begin failed: %s (%d)\n", @@ -182,8 +187,8 @@ retry: /* transaction retry */ bdb_unlocked_cache_return_entry_r( &bdb->bi_cache, p ); p = NULL; #ifdef NEW_LOGGING - LDAP_LOG ( OPERATION, DETAIL1, - "bdb_add: parent does not exist\n", 0, 0, 0 ); + LDAP_LOG ( OPERATION, DETAIL1, "bdb_add: parent does not exist\n", + 0, 0, 0 ); #else Debug( LDAP_DEBUG_TRACE, "bdb_add: parent does not exist\n", 0, 0, 0 ); @@ -214,8 +219,8 @@ retry: /* transaction retry */ LDAP_LOG ( OPERATION, DETAIL1, "bdb_add: no write access to parent\n", 0, 0, 0 ); #else - Debug( LDAP_DEBUG_TRACE, "bdb_add: no write access to parent\n", - 0, 0, 0 ); + Debug( LDAP_DEBUG_TRACE, + "bdb_add: no write access to parent\n", 0, 0, 0 ); #endif rs->sr_err = LDAP_INSUFFICIENT_ACCESS; rs->sr_text = "no write access to parent"; @@ -510,9 +515,8 @@ retry: /* transaction retry */ if ( rs->sr_err != LDAP_SUCCESS ) { #ifdef NEW_LOGGING - LDAP_LOG ( OPERATION, ERR, - "bdb_add: %s : %s (%d)\n", rs->sr_text, - db_strerror(rs->sr_err), rs->sr_err ); + LDAP_LOG ( OPERATION, ERR, "bdb_add: %s : %s (%d)\n", + rs->sr_text, db_strerror(rs->sr_err), rs->sr_err ); #else Debug( LDAP_DEBUG_TRACE, "bdb_add: %s : %s (%d)\n", rs->sr_text, db_strerror(rs->sr_err), rs->sr_err ); diff --git a/servers/slapd/back-bdb/cache.c b/servers/slapd/back-bdb/cache.c index 73a6673585..455f3151ec 100644 --- a/servers/slapd/back-bdb/cache.c +++ b/servers/slapd/back-bdb/cache.c @@ -102,9 +102,10 @@ bdb_cache_entry_db_relock( return rc; #endif } + static int -bdb_cache_entry_db_lock -( DB_ENV *env, u_int32_t locker, EntryInfo *ei, int rw, int tryOnly, DB_LOCK *lock ) +bdb_cache_entry_db_lock( DB_ENV *env, u_int32_t locker, EntryInfo *ei, + int rw, int tryOnly, DB_LOCK *lock ) { #ifdef NO_THREADS return 0; @@ -141,8 +142,7 @@ bdb_cache_entry_db_lock } int -bdb_cache_entry_db_unlock -( DB_ENV *env, DB_LOCK *lock ) +bdb_cache_entry_db_unlock ( DB_ENV *env, DB_LOCK *lock ) { #ifdef NO_THREADS return 0; @@ -360,8 +360,7 @@ hdb_cache_find_parent( Operation *op, DB_TXN *txn, ID id, - EntryInfo **res -) + EntryInfo **res ) { struct bdb_info *bdb = (struct bdb_info *) op->o_bd->be_private; EntryInfo ei, eip, *ei2 = NULL, *ein = NULL, *eir = NULL; @@ -498,8 +497,7 @@ static void bdb_cache_lru_add( struct bdb_info *bdb, u_int32_t locker, - EntryInfo *ei -) + EntryInfo *ei ) { DB_LOCK lock, *lockp; @@ -552,8 +550,7 @@ bdb_cache_lru_add( EntryInfo * bdb_cache_find_info( struct bdb_info *bdb, - ID id -) + ID id ) { EntryInfo ei, *ei2; @@ -580,8 +577,7 @@ bdb_cache_find_id( EntryInfo **eip, int islocked, u_int32_t locker, - DB_LOCK *lock -) + DB_LOCK *lock ) { struct bdb_info *bdb = (struct bdb_info *) op->o_bd->be_private; Entry *ep = NULL; @@ -593,9 +589,9 @@ bdb_cache_find_id( /* If we weren't given any info, see if we have it already cached */ if ( !*eip ) { -again: ldap_pvt_thread_rdwr_rlock( &bdb->bi_cache.c_rwlock ); +again: ldap_pvt_thread_rdwr_rlock( &bdb->bi_cache.c_rwlock ); *eip = (EntryInfo *) avl_find( bdb->bi_cache.c_idtree, - (caddr_t) &ei, bdb_id_cmp ); + (caddr_t) &ei, bdb_id_cmp ); if ( *eip ) { /* If the lock attempt fails, the info is in use */ if ( ldap_pvt_thread_mutex_trylock( @@ -632,8 +628,7 @@ again: ldap_pvt_thread_rdwr_rlock( &bdb->bi_cache.c_rwlock ); if ( rc == 0 ) { rc = bdb_cache_find_ndn( op, tid, &ep->e_nname, eip ); - if ( *eip ) - islocked = 1; + if ( *eip ) islocked = 1; if ( rc ) { bdb_entry_return( ep ); ep = NULL; @@ -641,8 +636,7 @@ again: ldap_pvt_thread_rdwr_rlock( &bdb->bi_cache.c_rwlock ); } #else rc = hdb_cache_find_parent(op, tid, id, eip ); - if ( rc == 0 && *eip ) - islocked = 1; + if ( rc == 0 && *eip ) islocked = 1; #endif } @@ -651,8 +645,7 @@ again: ldap_pvt_thread_rdwr_rlock( &bdb->bi_cache.c_rwlock ); if ( (*eip)->bei_state & CACHE_ENTRY_DELETED ) { rc = DB_NOTFOUND; } else { - bdb_cache_entry_db_lock( bdb->bi_dbenv, locker, - *eip, 0, 0, lock ); + bdb_cache_entry_db_lock( bdb->bi_dbenv, locker, *eip, 0, 0, lock ); if ( !(*eip)->bei_e ) { if (!ep) { rc = bdb_id2entry( op->o_bd, tid, id, &ep ); @@ -718,8 +711,7 @@ int bdb_cache_children( Operation *op, DB_TXN *txn, - Entry *e -) + Entry *e ) { int rc; @@ -743,8 +735,7 @@ bdb_cache_add( EntryInfo *eip, Entry *e, struct berval *nrdn, - u_int32_t locker -) + u_int32_t locker ) { EntryInfo *new, ei; struct berval rdn = e->e_name; @@ -790,8 +781,7 @@ bdb_cache_modify( Attribute *newAttrs, DB_ENV *env, u_int32_t locker, - DB_LOCK *lock -) + DB_LOCK *lock ) { EntryInfo *ei = BEI(e); @@ -820,8 +810,7 @@ bdb_cache_modrdn( EntryInfo *ein, DB_ENV *env, u_int32_t locker, - DB_LOCK *lock -) + DB_LOCK *lock ) { EntryInfo *ei = BEI(e), *pei; struct berval rdn; @@ -837,8 +826,9 @@ bdb_cache_modrdn( attrs_free( e->e_attrs ); } e->e_attrs = new->e_attrs; - if( e->e_nname.bv_val < e->e_bv.bv_val || e->e_nname.bv_val > - e->e_bv.bv_val + e->e_bv.bv_len ) { + if( e->e_nname.bv_val < e->e_bv.bv_val || + e->e_nname.bv_val > e->e_bv.bv_val + e->e_bv.bv_len ) + { ch_free(e->e_name.bv_val); ch_free(e->e_nname.bv_val); } @@ -870,11 +860,11 @@ bdb_cache_modrdn( bdb_cache_entryinfo_lock( ein ); } #ifdef BDB_HIER - { int max = ei->bei_modrdns; - /* Record the generation number of this change */ + { + int max = ei->bei_modrdns; + /* Record the generation number of this change */ for ( pei = ein; pei->bei_parent; pei = pei->bei_parent ) { - if ( pei->bei_modrdns > max ) - max = pei->bei_modrdns; + if ( pei->bei_modrdns > max ) max = pei->bei_modrdns; } ei->bei_modrdns = max + 1; } @@ -896,8 +886,7 @@ bdb_cache_delete( Entry *e, DB_ENV *env, u_int32_t locker, - DB_LOCK *lock -) + DB_LOCK *lock ) { EntryInfo *ei = BEI(e); int rc; @@ -945,8 +934,7 @@ bdb_cache_delete( void bdb_cache_delete_cleanup( Cache *cache, - Entry *e -) + Entry *e ) { EntryInfo *ei = BEI(e); @@ -977,8 +965,7 @@ bdb_cache_delete_cleanup( static int bdb_cache_delete_internal( Cache *cache, - EntryInfo *e -) + EntryInfo *e ) { int rc = 0; /* return code */ @@ -987,14 +974,14 @@ bdb_cache_delete_internal( if ( e->bei_parent->bei_dkids ) e->bei_parent->bei_dkids--; #endif /* dn tree */ - if ( avl_delete( &e->bei_parent->bei_kids, (caddr_t) e, bdb_rdn_cmp ) == NULL ) + if ( avl_delete( &e->bei_parent->bei_kids, (caddr_t) e, bdb_rdn_cmp ) + == NULL ) { rc = -1; } /* id tree */ - if ( avl_delete( &cache->c_idtree, (caddr_t) e, bdb_id_cmp ) == NULL ) - { + if ( avl_delete( &cache->c_idtree, (caddr_t) e, bdb_id_cmp ) == NULL ) { rc = -1; } @@ -1080,7 +1067,6 @@ bdb_locker_id_free( void *key, void *data ) int lockid = (int) data; int rc; - rc = XLOCK_ID_FREE( env, lockid ); if ( rc == EINVAL ) { DB_LOCKREQ lr; @@ -1162,7 +1148,8 @@ bdb_cache_delete_entry( DB_LOCK *lock ) { ldap_pvt_thread_rdwr_wlock( &bdb->bi_cache.c_rwlock ); - if ( bdb_cache_entry_db_lock( bdb->bi_dbenv, locker, ei, 1, 1, lock ) == 0 ) { + if ( bdb_cache_entry_db_lock( bdb->bi_dbenv, locker, ei, 1, 1, lock ) == 0 ) + { if ( ei->bei_e && !(ei->bei_state & CACHE_ENTRY_NOT_LINKED )) { LRU_DELETE( &bdb->bi_cache, ei ); ei->bei_e->e_private = NULL; diff --git a/servers/slapd/back-ldbm/add.c b/servers/slapd/back-ldbm/add.c index 959eeca29a..4bfeea620f 100644 --- a/servers/slapd/back-ldbm/add.c +++ b/servers/slapd/back-ldbm/add.c @@ -43,17 +43,21 @@ ldbm_back_add( #endif #ifdef NEW_LOGGING - LDAP_LOG( BACK_LDBM, ENTRY, "ldbm_back_add: %s\n", op->o_req_dn.bv_val, 0, 0 ); + LDAP_LOG( BACK_LDBM, ENTRY, "ldbm_back_add: %s\n", + op->o_req_dn.bv_val, 0, 0 ); #else - Debug(LDAP_DEBUG_ARGS, "==> ldbm_back_add: %s\n", op->o_req_dn.bv_val, 0, 0); + Debug(LDAP_DEBUG_ARGS, "==> ldbm_back_add: %s\n", + op->o_req_dn.bv_val, 0, 0); #endif - rs->sr_err = entry_schema_check( op->o_bd, op->oq_add.rs_e, NULL, &rs->sr_text, textbuf, textlen ); + rs->sr_err = entry_schema_check( op->o_bd, op->oq_add.rs_e, NULL, + &rs->sr_text, textbuf, textlen ); if ( rs->sr_err != LDAP_SUCCESS ) { #ifdef NEW_LOGGING - LDAP_LOG( BACK_LDBM, ERR, - "ldbm_back_add: entry (%s) failed schema check.\n", op->o_req_dn.bv_val, 0, 0 ); + LDAP_LOG( BACK_LDBM, ERR, + "ldbm_back_add: entry (%s) failed schema check.\n", + op->o_req_dn.bv_val, 0, 0 ); #else Debug( LDAP_DEBUG_TRACE, "entry failed schema check: %s\n", rs->sr_text, 0, 0 ); @@ -88,7 +92,8 @@ ldbm_back_add( /* grab giant lock for writing */ ldap_pvt_thread_rdwr_wlock(&li->li_giant_rwlock); - if ( ( rs->sr_err = dn2id( op->o_bd, &op->o_req_ndn, &id ) ) || id != NOID ) { + rs->sr_err = dn2id( op->o_bd, &op->o_req_ndn, &id ); + if ( rs->sr_err || id != NOID ) { /* if (rs->sr_err) something bad happened to ldbm cache */ ldap_pvt_thread_rdwr_wunlock(&li->li_giant_rwlock); rs->sr_err = rs->sr_err ? LDAP_OTHER : LDAP_ALREADY_EXISTS; @@ -136,7 +141,8 @@ ldbm_back_add( 0, 0, 0 ); #endif - rs->sr_text = rs->sr_ref ? "parent is referral" : "parent does not exist"; + rs->sr_text = rs->sr_ref + ? "parent is referral" : "parent does not exist"; rs->sr_err = LDAP_REFERRAL; send_ldap_result( op, rs ); @@ -147,9 +153,7 @@ ldbm_back_add( return rs->sr_err; } - if ( ! access_allowed( op, p, - children, NULL, ACL_WRITE, NULL ) ) - { + if ( ! access_allowed( op, p, children, NULL, ACL_WRITE, NULL ) ) { /* free parent and writer lock */ cache_return_entry_w( &li->li_cache, p ); ldap_pvt_thread_rdwr_wunlock(&li->li_giant_rwlock); @@ -218,7 +222,7 @@ ldbm_back_add( #ifdef NEW_LOGGING LDAP_LOG( BACK_LDBM, ERR, - "ldbm_back_add: Parent is referral.\n", 0, 0, 0 ); + "ldbm_back_add: Parent is referral.\n", 0, 0, 0 ); #else Debug( LDAP_DEBUG_TRACE, "parent is referral\n", 0, 0, 0 ); @@ -287,7 +291,8 @@ ldbm_back_add( /* * Try to add the entry to the cache, assign it a new dnid. */ - rs->sr_err = cache_add_entry_rw(&li->li_cache, op->oq_add.rs_e, CACHE_WRITE_LOCK); + rs->sr_err = cache_add_entry_rw( &li->li_cache, op->oq_add.rs_e, + CACHE_WRITE_LOCK ); if ( rs->sr_err != 0 ) { if( p != NULL) { @@ -331,7 +336,9 @@ ldbm_back_add( } /* dn2id index */ - if ( dn2id_add( op->o_bd, &op->oq_add.rs_e->e_nname, op->oq_add.rs_e->e_id ) != 0 ) { + if ( dn2id_add( op->o_bd, &op->oq_add.rs_e->e_nname, + op->oq_add.rs_e->e_id ) != 0 ) + { #ifdef NEW_LOGGING LDAP_LOG( BACK_LDBM, ERR, "ldbm_back_add: dn2id_add failed.\n", 0, 0, 0 ); @@ -358,7 +365,8 @@ ldbm_back_add( #endif /* FIXME: delete attr indices? */ - (void) dn2id_delete( op->o_bd, &op->oq_add.rs_e->e_nname, op->oq_add.rs_e->e_id ); + (void) dn2id_delete( op->o_bd, &op->oq_add.rs_e->e_nname, + op->oq_add.rs_e->e_id ); send_ldap_error( op, rs, LDAP_OTHER, "entry store failed" ); -- 2.39.5