X-Git-Url: https://git.sur5r.net/?a=blobdiff_plain;f=servers%2Fslapd%2Fback-ldbm%2Fadd.c;h=cdda78edb03242b51215b32e5c7a3f4955ca5537;hb=2c87d24f31d29bed606b443ef2d8e881b87207c7;hp=849289ca12c3e48ee00f7b0283bd6e4162e47e14;hpb=6abe61b0fa342d9340e943ef0883c766a1e0d0d0;p=openldap diff --git a/servers/slapd/back-ldbm/add.c b/servers/slapd/back-ldbm/add.c index 849289ca12..cdda78edb0 100644 --- a/servers/slapd/back-ldbm/add.c +++ b/servers/slapd/back-ldbm/add.c @@ -20,34 +20,30 @@ ldbm_back_add( ) { struct ldbminfo *li = (struct ldbminfo *) be->be_private; - char *dn = NULL, *pdn; + char *pdn; Entry *p = NULL; int rootlock = 0; int rc = -1; - dn = dn_normalize( ch_strdup( e->e_dn ) ); - - Debug(LDAP_DEBUG_ARGS, "==> ldbm_back_add: %s\n", dn, 0, 0); + Debug(LDAP_DEBUG_ARGS, "==> ldbm_back_add: %s\n", e->e_dn, 0, 0); /* nobody else can add until we lock our parent */ - pthread_mutex_lock(&li->li_add_mutex); + ldap_pvt_thread_mutex_lock(&li->li_add_mutex); - if ( ( dn2id( be, dn ) ) != NOID ) { - pthread_mutex_unlock(&li->li_add_mutex); + if ( ( dn2id( be, e->e_ndn ) ) != NOID ) { + ldap_pvt_thread_mutex_unlock(&li->li_add_mutex); entry_free( e ); - free( dn ); send_ldap_result( conn, op, LDAP_ALREADY_EXISTS, "", "" ); return( -1 ); } if ( global_schemacheck && oc_schema_check( e ) != 0 ) { - pthread_mutex_unlock(&li->li_add_mutex); + ldap_pvt_thread_mutex_unlock(&li->li_add_mutex); Debug( LDAP_DEBUG_TRACE, "entry failed schema check\n", 0, 0, 0 ); entry_free( e ); - free( dn ); send_ldap_result( conn, op, LDAP_OBJECT_CLASS_VIOLATION, "", "" ); return( -1 ); @@ -59,12 +55,12 @@ ldbm_back_add( * add the entry. */ - if ( (pdn = dn_parent( be, dn )) != NULL ) { + if ( (pdn = dn_parent( be, e->e_ndn )) != NULL ) { char *matched = NULL; /* get parent with writer lock */ if ( (p = dn2entry_w( be, pdn, &matched )) == NULL ) { - pthread_mutex_unlock(&li->li_add_mutex); + ldap_pvt_thread_mutex_unlock(&li->li_add_mutex); Debug( LDAP_DEBUG_TRACE, "parent does not exist\n", 0, 0, 0 ); send_ldap_result( conn, op, LDAP_NO_SUCH_OBJECT, @@ -75,13 +71,12 @@ ldbm_back_add( } entry_free( e ); - free( dn ); free( pdn ); return -1; } /* don't need the add lock anymore */ - pthread_mutex_unlock(&li->li_add_mutex); + ldap_pvt_thread_mutex_unlock(&li->li_add_mutex); free(pdn); @@ -89,8 +84,8 @@ ldbm_back_add( free( matched ); } - if ( ! access_allowed( be, conn, op, p, "children", NULL, - op->o_dn, ACL_WRITE ) ) + if ( ! access_allowed( be, conn, op, p, + "children", NULL, ACL_WRITE ) ) { Debug( LDAP_DEBUG_TRACE, "no access to parent\n", 0, 0, 0 ); @@ -101,21 +96,19 @@ ldbm_back_add( cache_return_entry_w( &li->li_cache, p ); entry_free( e ); - free( dn ); return -1; } } else { /* no parent, must be adding entry to root */ - if ( ! be_isroot( be, op->o_dn ) ) { - pthread_mutex_unlock(&li->li_add_mutex); + if ( ! be_isroot( be, op->o_ndn ) ) { + ldap_pvt_thread_mutex_unlock(&li->li_add_mutex); Debug( LDAP_DEBUG_TRACE, "no parent & not root\n", 0, 0, 0 ); send_ldap_result( conn, op, LDAP_INSUFFICIENT_ACCESS, "", "" ); entry_free( e ); - free( dn ); return -1; } @@ -123,43 +116,60 @@ ldbm_back_add( * no parent, acquire the root write lock * and release the add lock. */ - pthread_mutex_lock(&li->li_root_mutex); - pthread_mutex_unlock(&li->li_add_mutex); - rootlock=1; + ldap_pvt_thread_mutex_lock(&li->li_root_mutex); + rootlock = 1; + ldap_pvt_thread_mutex_unlock(&li->li_add_mutex); } + /* acquire required reader/writer lock */ + if (entry_rdwr_lock(e, 1)) { + if( p != NULL) { + /* free parent and writer lock */ + cache_return_entry_w( &li->li_cache, p ); + } + + if ( rootlock ) { + /* release root lock */ + ldap_pvt_thread_mutex_unlock(&li->li_root_mutex); + } + + Debug( LDAP_DEBUG_ANY, "add: could not lock entry\n", + 0, 0, 0 ); + + entry_free(e); + + send_ldap_result( conn, op, LDAP_OPERATIONS_ERROR, "", "" ); + return( -1 ); + } + + e->e_id = next_id( be ); + /* - * Try to add the entry to the cache, assign it a new dnid - * and mark it locked. This should only fail if the entry - * already exists. + * Try to add the entry to the cache, assign it a new dnid. + * This should only fail if the entry already exists. */ - e->e_id = next_id( be ); - if ( cache_add_entry_lock( &li->li_cache, e, ENTRY_STATE_CREATING ) != 0 ) { + if ( cache_add_entry( &li->li_cache, e, ENTRY_STATE_CREATING ) != 0 ) { if( p != NULL) { /* free parent and writer lock */ cache_return_entry_w( &li->li_cache, p ); - } else if ( rootlock ) { + } + if ( rootlock ) { /* release root lock */ - pthread_mutex_unlock(&li->li_root_mutex); + ldap_pvt_thread_mutex_unlock(&li->li_root_mutex); } Debug( LDAP_DEBUG_ANY, "cache_add_entry_lock failed\n", 0, 0, 0 ); next_id_return( be, e->e_id ); - /* XXX this should be ok, no other thread should have access - * because e hasn't been added to the cache yet - */ + entry_rdwr_unlock(e, 1); entry_free( e ); - free( dn ); + send_ldap_result( conn, op, LDAP_ALREADY_EXISTS, "", "" ); return( -1 ); } - /* acquire writer lock */ - entry_rdwr_lock(e, 1); - /* * add it to the id2children index for the parent */ @@ -187,7 +197,7 @@ ldbm_back_add( } /* dn2id index */ - if ( dn2id_add( be, dn, e->e_id ) != 0 ) { + if ( dn2id_add( be, e->e_ndn, e->e_id ) != 0 ) { Debug( LDAP_DEBUG_TRACE, "dn2id_add failed\n", 0, 0, 0 ); send_ldap_result( conn, op, LDAP_OPERATIONS_ERROR, "", "" ); @@ -199,7 +209,7 @@ ldbm_back_add( if ( id2entry_add( be, e ) != 0 ) { Debug( LDAP_DEBUG_TRACE, "id2entry_add failed\n", 0, 0, 0 ); - (void) dn2id_delete( be, dn ); + (void) dn2id_delete( be, e->e_ndn ); send_ldap_result( conn, op, LDAP_OPERATIONS_ERROR, "", "" ); goto return_results; @@ -209,20 +219,18 @@ ldbm_back_add( rc = 0; return_results:; - if ( dn != NULL ) - free( dn ); - - cache_set_state( &li->li_cache, e, 0 ); - if (p != NULL) { /* free parent and writer lock */ cache_return_entry_w( &li->li_cache, p ); + } - } else if ( rootlock ) { + if ( rootlock ) { /* release root lock */ - pthread_mutex_unlock(&li->li_root_mutex); + ldap_pvt_thread_mutex_unlock(&li->li_root_mutex); } + cache_set_state( &li->li_cache, e, 0 ); + /* free entry and writer lock */ cache_return_entry_w( &li->li_cache, e );