X-Git-Url: https://git.sur5r.net/?a=blobdiff_plain;f=servers%2Fslapd%2Fback-ldbm%2Fadd.c;h=65d1d11370d0c9e29b65da6c32f97e17fd5fbb3e;hb=4d36fd5a3ed407b0a53004d1431f1669222138b4;hp=f176f8166692ed389b525eaedd54a39d1e6befe2;hpb=0e2af54a3ffdeebe3901370683be56fcc53023b0;p=openldap diff --git a/servers/slapd/back-ldbm/add.c b/servers/slapd/back-ldbm/add.c index f176f81666..65d1d11370 100644 --- a/servers/slapd/back-ldbm/add.c +++ b/servers/slapd/back-ldbm/add.c @@ -27,7 +27,6 @@ ldbm_back_add( struct ldbminfo *li = (struct ldbminfo *) be->be_private; struct berval pdn; Entry *p = NULL; - int rootlock = 0; int rc; ID id = NOID; const char *text = NULL; @@ -36,39 +35,36 @@ ldbm_back_add( size_t textlen = sizeof textbuf; #ifdef NEW_LOGGING - LDAP_LOG(( "backend", LDAP_LEVEL_ENTRY,"ldbm_back_add: %s\n", - e->e_dn )); + LDAP_LOG( BACK_LDBM, ENTRY, "ldbm_back_add: %s\n", e->e_dn, 0, 0 ); #else Debug(LDAP_DEBUG_ARGS, "==> ldbm_back_add: %s\n", e->e_dn, 0, 0); #endif - /* nobody else can add until we lock our parent */ - ldap_pvt_thread_mutex_lock(&li->li_add_mutex); + /* grab giant lock for writing */ + ldap_pvt_thread_rdwr_wlock(&li->li_giant_rwlock); if ( ( rc = dn2id( be, &e->e_nname, &id ) ) || id != NOID ) { /* if (rc) something bad happened to ldbm cache */ - ldap_pvt_thread_mutex_unlock(&li->li_add_mutex); + ldap_pvt_thread_rdwr_wunlock(&li->li_giant_rwlock); send_ldap_result( conn, op, - rc ? LDAP_OPERATIONS_ERROR : LDAP_ALREADY_EXISTS, + rc ? LDAP_OTHER : LDAP_ALREADY_EXISTS, NULL, NULL, NULL, NULL ); return( -1 ); } - rc = entry_schema_check( e, NULL, &text, textbuf, textlen ); + rc = entry_schema_check( be, e, NULL, &text, textbuf, textlen ); if ( rc != LDAP_SUCCESS ) { - ldap_pvt_thread_mutex_unlock(&li->li_add_mutex); + ldap_pvt_thread_rdwr_wunlock(&li->li_giant_rwlock); #ifdef NEW_LOGGING - LDAP_LOG(( "backend", LDAP_LEVEL_ERR, - "ldbm_back_add: entry (%s) failed schema check.\n", - e->e_dn )); + LDAP_LOG( BACK_LDBM, ERR, + "ldbm_back_add: entry (%s) failed schema check.\n", e->e_dn, 0, 0 ); #else Debug( LDAP_DEBUG_TRACE, "entry failed schema check: %s\n", text, 0, 0 ); #endif - send_ldap_result( conn, op, rc, NULL, text, NULL, NULL ); return( -1 ); @@ -80,11 +76,11 @@ ldbm_back_add( * add the entry. */ - pdn.bv_val = dn_parent( be, e->e_ndn ); - if (pdn.bv_val && pdn.bv_val[0]) - pdn.bv_len = e->e_nname.bv_len - (pdn.bv_val - e->e_ndn); - else - pdn.bv_len = 0; + if ( be_issuffix( be, &e->e_nname ) ) { + pdn = slap_empty_bv; + } else { + dnParent( &e->e_nname, &pdn ); + } if( pdn.bv_len ) { Entry *matched = NULL; @@ -92,9 +88,7 @@ ldbm_back_add( /* get parent with writer lock */ if ( (p = dn2entry_w( be, &pdn, &matched )) == NULL ) { char *matched_dn = NULL; - BVarray refs; - - ldap_pvt_thread_mutex_unlock(&li->li_add_mutex); + BerVarray refs; if ( matched != NULL ) { matched_dn = ch_strdup( matched->e_dn ); @@ -108,10 +102,12 @@ ldbm_back_add( NULL, &e->e_name, LDAP_SCOPE_DEFAULT ); } + ldap_pvt_thread_rdwr_wunlock(&li->li_giant_rwlock); + #ifdef NEW_LOGGING - LDAP_LOG(( "backend", LDAP_LEVEL_ERR, - "ldbm_back_add: Parent of (%s) does not exist.\n", - e->e_dn )); + LDAP_LOG( BACK_LDBM, ERR, + "ldbm_back_add: Parent of (%s) does not exist.\n", + e->e_dn, 0, 0 ); #else Debug( LDAP_DEBUG_TRACE, "parent does not exist\n", 0, 0, 0 ); @@ -121,25 +117,23 @@ ldbm_back_add( refs == NULL ? "parent does not exist" : "parent is referral", refs, NULL ); - bvarray_free( refs ); + ber_bvarray_free( refs ); free( matched_dn ); return -1; } - /* don't need the add lock anymore */ - ldap_pvt_thread_mutex_unlock(&li->li_add_mutex); - if ( ! access_allowed( be, conn, op, p, - children, NULL, ACL_WRITE ) ) + 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); #ifdef NEW_LOGGING - LDAP_LOG(( "backend", LDAP_LEVEL_ERR, - "ldbm_back_add: No write access to parent (%s).\n", - e->e_dn )); + LDAP_LOG( BACK_LDBM, ERR, + "ldbm_back_add: No write access to parent (%s).\n", + e->e_dn, 0, 0 ); #else Debug( LDAP_DEBUG_TRACE, "no write access to parent\n", 0, 0, 0 ); @@ -148,7 +142,6 @@ ldbm_back_add( send_ldap_result( conn, op, LDAP_INSUFFICIENT_ACCESS, NULL, "no write access to parent", NULL, NULL ); - return -1; } @@ -157,10 +150,11 @@ ldbm_back_add( /* free parent and writer lock */ cache_return_entry_w( &li->li_cache, p ); + ldap_pvt_thread_rdwr_wunlock(&li->li_giant_rwlock); #ifdef NEW_LOGGING - LDAP_LOG(( "backend", LDAP_LEVEL_ERR, - "ldbm_back_add: Parent is an alias.\n")); + LDAP_LOG(BACK_LDBM, ERR, + "ldbm_back_add: Parent is an alias.\n", 0, 0, 0 ); #else Debug( LDAP_DEBUG_TRACE, "parent is alias\n", 0, 0, 0 ); @@ -176,16 +170,17 @@ ldbm_back_add( if ( is_entry_referral( p ) ) { /* parent is a referral, don't allow add */ char *matched_dn = ch_strdup( p->e_dn ); - BVarray refs = is_entry_referral( p ) + BerVarray refs = is_entry_referral( p ) ? get_entry_referrals( be, conn, op, p ) : NULL; /* free parent and writer lock */ cache_return_entry_w( &li->li_cache, p ); + ldap_pvt_thread_rdwr_wunlock(&li->li_giant_rwlock); #ifdef NEW_LOGGING - LDAP_LOG(( "backend", LDAP_LEVEL_ERR, - "ldbm_back_add: Parent is referral.\n" )); + LDAP_LOG( BACK_LDBM, ERR, + "ldbm_back_add: Parent is referral.\n", 0, 0, 0 ); #else Debug( LDAP_DEBUG_TRACE, "parent is referral\n", 0, 0, 0 ); @@ -194,7 +189,7 @@ ldbm_back_add( send_ldap_result( conn, op, LDAP_REFERRAL, matched_dn, NULL, refs, NULL ); - bvarray_free( refs ); + ber_bvarray_free( refs ); free( matched_dn ); return -1; } @@ -206,20 +201,20 @@ ldbm_back_add( /* no parent, must be adding entry to root */ if ( !be_isroot( be, &op->o_ndn ) ) { - if ( be_issuffix( be, "" ) || be_isupdate( be, &op->o_ndn ) ) { + if ( be_issuffix( be, (struct berval *)&slap_empty_bv ) || be_isupdate( be, &op->o_ndn ) ) { p = (Entry *)&slap_entry_root; rc = access_allowed( be, conn, op, p, - children, NULL, ACL_WRITE ); + children, NULL, ACL_WRITE, NULL ); p = NULL; if ( ! rc ) { - ldap_pvt_thread_mutex_unlock(&li->li_add_mutex); + ldap_pvt_thread_rdwr_wunlock(&li->li_giant_rwlock); #ifdef NEW_LOGGING - LDAP_LOG(( "backend", LDAP_LEVEL_ERR, + LDAP_LOG( BACK_LDBM, ERR, "ldbm_back_add: No write " - "access to parent (\"\").\n" )); + "access to parent (\"\").\n", 0, 0, 0 ); #else Debug( LDAP_DEBUG_TRACE, "no write access to parent\n", @@ -236,13 +231,13 @@ ldbm_back_add( } } else { - ldap_pvt_thread_mutex_unlock(&li->li_add_mutex); + ldap_pvt_thread_rdwr_wunlock(&li->li_giant_rwlock); #ifdef NEW_LOGGING - LDAP_LOG(( "backend", LDAP_LEVEL_ERR, + LDAP_LOG( BACK_LDBM, ERR, "ldbm_back_add: %s add denied.\n", pdn.bv_val == NULL ? "suffix" - : "entry at root" )); + : "entry at root", 0, 0 ); #else Debug( LDAP_DEBUG_TRACE, "%s add denied\n", pdn.bv_val == NULL ? "suffix" @@ -256,14 +251,6 @@ ldbm_back_add( return -1; } } - - /* - * no parent, acquire the root write lock - * and release the add lock. - */ - ldap_pvt_thread_mutex_lock(&li->li_root_mutex); - rootlock = 1; - ldap_pvt_thread_mutex_unlock(&li->li_add_mutex); } if ( next_id( be, &e->e_id ) ) { @@ -272,20 +259,16 @@ ldbm_back_add( cache_return_entry_w( &li->li_cache, p ); } - if ( rootlock ) { - /* release root lock */ - ldap_pvt_thread_mutex_unlock(&li->li_root_mutex); - } + ldap_pvt_thread_rdwr_wunlock(&li->li_giant_rwlock); #ifdef NEW_LOGGING - LDAP_LOG(( "backend", LDAP_LEVEL_ERR, - "ldbm_back_add: next_id failed.\n" )); + LDAP_LOG( BACK_LDBM, ERR, + "ldbm_back_add: next_id failed.\n", 0, 0, 0 ); #else Debug( LDAP_DEBUG_ANY, "ldbm_add: next_id failed\n", 0, 0, 0 ); #endif - send_ldap_result( conn, op, LDAP_OTHER, NULL, "next_id add failed", NULL, NULL ); @@ -303,14 +286,11 @@ ldbm_back_add( cache_return_entry_w( &li->li_cache, p ); } - if ( rootlock ) { - /* release root lock */ - ldap_pvt_thread_mutex_unlock(&li->li_root_mutex); - } + ldap_pvt_thread_rdwr_wunlock(&li->li_giant_rwlock); #ifdef NEW_LOGGING - LDAP_LOG(( "backend", LDAP_LEVEL_ERR, - "ldbm_back_add: cache_add_entry_lock failed.\n" )); + LDAP_LOG( BACK_LDBM, ERR, + "ldbm_back_add: cache_add_entry_lock failed.\n", 0, 0, 0 ); #else Debug( LDAP_DEBUG_ANY, "cache_add_entry_lock failed\n", 0, 0, 0 ); @@ -328,8 +308,8 @@ ldbm_back_add( /* attribute indexes */ if ( index_entry_add( be, e, e->e_attrs ) != LDAP_SUCCESS ) { #ifdef NEW_LOGGING - LDAP_LOG(( "backend", LDAP_LEVEL_ERR, - "ldbm_back_add: index_entry_add failed.\n" )); + LDAP_LOG( BACK_LDBM, ERR, + "ldbm_back_add: index_entry_add failed.\n", 0, 0, 0 ); #else Debug( LDAP_DEBUG_TRACE, "index_entry_add failed\n", 0, 0, 0 ); @@ -344,8 +324,8 @@ ldbm_back_add( /* dn2id index */ if ( dn2id_add( be, &e->e_nname, e->e_id ) != 0 ) { #ifdef NEW_LOGGING - LDAP_LOG(( "backend", LDAP_LEVEL_ERR, - "ldbm_back_add: dn2id_add failed.\n" )); + LDAP_LOG( BACK_LDBM, ERR, + "ldbm_back_add: dn2id_add failed.\n", 0, 0, 0 ); #else Debug( LDAP_DEBUG_TRACE, "dn2id_add failed\n", 0, 0, 0 ); @@ -361,8 +341,8 @@ ldbm_back_add( /* id2entry index */ if ( id2entry_add( be, e ) != 0 ) { #ifdef NEW_LOGGING - LDAP_LOG(( "backend", LDAP_LEVEL_ERR, - "ldbm_back_add: id2entry_add failed.\n" )); + LDAP_LOG( BACK_LDBM, ERR, + "ldbm_back_add: id2entry_add failed.\n", 0, 0, 0 ); #else Debug( LDAP_DEBUG_TRACE, "id2entry_add failed\n", 0, 0, 0 ); @@ -392,15 +372,14 @@ return_results:; cache_return_entry_w( &li->li_cache, p ); } - if ( rootlock ) { - /* release root lock */ - ldap_pvt_thread_mutex_unlock(&li->li_root_mutex); - } - if ( rc ) { - /* in case of error, writer lock is freed - * and entry's private data is destroyed */ + /* + * in case of error, writer lock is freed + * and entry's private data is destroyed. + * otherwise, this is done when entry is released + */ cache_return_entry_w( &li->li_cache, e ); + ldap_pvt_thread_rdwr_wunlock(&li->li_giant_rwlock); } return( rc );