From: Howard Chu Date: Mon, 22 Oct 2001 14:07:42 +0000 (+0000) Subject: Moved binary entry_encode/entry_decode into main code. Removed lber version. X-Git-Tag: LDBM_PRE_GIANT_RWLOCK~952 X-Git-Url: https://git.sur5r.net/?a=commitdiff_plain;h=c05de965b57d4c34748f710926b5017e4a4c0176;p=openldap Moved binary entry_encode/entry_decode into main code. Removed lber version. --- diff --git a/servers/slapd/back-bdb/id2entry.c b/servers/slapd/back-bdb/id2entry.c index 8c02c77b3c..ba636bfe58 100644 --- a/servers/slapd/back-bdb/id2entry.c +++ b/servers/slapd/back-bdb/id2entry.c @@ -12,193 +12,6 @@ #include "back-bdb.h" -#ifdef BDB_USE_BINARY_RW - -/* A cache of every AttributeDescription we ever see. We don't want - * to churn thru malloc/free on them all the time since most will be - * encountered repeatedly. - */ -static Avlnode *adcache; - -static int -ad_type_cmp( - char *desc, - AttributeDescription *ad -) -{ - return strcasecmp(desc, ad->ad_cname.bv_val); -} - -static int -ad_info_cmp( - AttributeDescription *a1, - AttributeDescription *a2 -) -{ - return strcasecmp(a1->ad_cname.bv_val, a2->ad_cname.bv_val); -} - -AttributeDescription * -bdb_str2ad(const char *desc) -{ - AttributeDescription *a; - - a = (AttributeDescription *) avl_find(adcache, desc, - (AVL_CMP) ad_type_cmp); - if (!a) { - int rc; - const char *text; - - rc = slap_str2ad(desc, &a, &text); - if (rc != LDAP_SUCCESS) { - return NULL; - } - rc = avl_insert(&adcache, (caddr_t)a, (AVL_CMP) ad_info_cmp, - (AVL_DUP) avl_dup_error); - } - return a; -} - -/* Flatten an Entry into a buffer. The buffer contents become a direct - * copy of the entry, with all pointers converted to offsets from the - * beginning of the buffer. We do this by first walking through all - * the fields of the Entry, adding up their sizes. Then a single chunk - * of memory is malloc'd and the entry is copied. We differentiate between - * fixed size fields and variable-length content when tallying up the - * entry size, so that we can stick all of the variable-length stuff - * into the back half of the buffer. - */ -int bdb_encode(Entry *e, struct berval **bv) -{ - int siz = sizeof(Entry); - int len, dnlen; - int i, j; - Entry *f; - Attribute *a, *b; - struct berval **bvl, *bz; - char *ptr, *base, *data; - - *bv = ch_malloc(sizeof(struct berval)); - /* Compress any white space in the DN */ - dn_validate(e->e_dn); - dnlen = strlen(e->e_dn); - /* The dn and ndn are always the same length */ - len = dnlen + dnlen + 2; /* two trailing NUL bytes */ - for (a=e->e_attrs; a; a=a->a_next) { - /* For AttributeDesc, we only store the attr name */ - siz += sizeof(Attribute); - len += a->a_desc->ad_cname.bv_len+1; - for (i=0; a->a_vals[i]; i++) { - siz += sizeof(struct berval *); - siz += sizeof(struct berval); - len += a->a_vals[i]->bv_len + 1; - } - siz += sizeof(struct berval *); /* NULL pointer at end */ - } - (*bv)->bv_len = siz + len; - (*bv)->bv_val = ch_malloc(siz+len); - base = (*bv)->bv_val; - ptr = base + siz; - f = (Entry *)base; - data = (char *)(f+1); - f->e_id = e->e_id; - f->e_dn = (char *)(ptr-base); - memcpy(ptr, e->e_dn, dnlen); - ptr += dnlen; - *ptr++ = '\0'; - f->e_ndn = (char *)(ptr-base); - memcpy(ptr, e->e_ndn, dnlen); - ptr += dnlen; - *ptr++ = '\0'; - f->e_attrs = e->e_attrs ? (Attribute *)sizeof(Entry) : NULL; - f->e_private = NULL; - for (a=e->e_attrs; a; a=a->a_next) { - b = (Attribute *)data; - data = (char *)(b+1); - b->a_desc = (AttributeDescription *)(ptr-base); - memcpy(ptr, a->a_desc->ad_cname.bv_val, - a->a_desc->ad_cname.bv_len); - ptr += a->a_desc->ad_cname.bv_len; - *ptr++ = '\0'; - if (a->a_vals) { - bvl = (struct berval **)data; - b->a_vals = (struct berval **)(data-base); - for (i=0; a->a_vals[i]; i++); - data = (char *)(bvl+i+1); - bz = (struct berval *)data; - for (j=0; jbv_len = a->a_vals[j]->bv_len; - if (a->a_vals[j]->bv_val) { - bz->bv_val = (char *)(ptr-base); - memcpy(ptr, a->a_vals[j]->bv_val, bz->bv_len); - } else { - bz->bv_val = NULL; - } - ptr += bz->bv_len; - *ptr++ = '\0'; - bvl[j] = (struct berval *)(data-base); - bz++; - data = (char *)bz; - } - bvl[j] = NULL; - } else { - b->a_vals = NULL; - } - - if (a->a_next) - b->a_next = (Attribute *)(data-base); - else - b->a_next = NULL; - } - return 0; -} - -/* Retrieve an Entry that was stored using bdb_encode above. - * All we have to do is add the buffer address to all of the - * stored offsets. We also use the stored attribute names to - * pull AttributeDescriptions from our ad_cache. To detect if - * the attributes of an Entry are later modified, we also store - * the address of the end of this block in e_private. Since - * modify_internal always allocs a new list of attrs to work - * with, we need to free that separately. - */ -int bdb_decode(struct berval *bv, Entry **e) -{ - int i; - long base; - Attribute *a; - Entry *x = (Entry *)bv->bv_val; - - base = (long)bv->bv_val; - x->e_dn += base; - x->e_ndn += base; - x->e_private = bv->bv_val + bv->bv_len; - if (x->e_attrs) - x->e_attrs = (Attribute *)((long)x->e_attrs+base); - for (a=x->e_attrs; a; a=a->a_next) { - if (a->a_next) - a->a_next = (Attribute *)((long)a->a_next+base); - a->a_desc=bdb_str2ad((char *)a->a_desc+base); - if (!a->a_desc) return -1; - if (a->a_vals) { - a->a_vals = (struct berval **)((long)a->a_vals+base); - for (i=0; a->a_vals[i]; i++) { - a->a_vals[i] = (struct berval *) - ((long)a->a_vals[i]+base); - if (a->a_vals[i]->bv_val) - a->a_vals[i]->bv_val += base; - } - } - } - *e = x; - return 0; -} - -#define entry_encode(a, b) bdb_encode(a,b) -#define entry_decode(a, b) bdb_decode(a,b) - -#endif /* BDB_USE_BINARY_RW */ - int bdb_id2entry_add( BackendDB *be, DB_TXN *tid, @@ -291,11 +104,12 @@ int bdb_id2entry( if( rc == 0 ) { (*e)->e_id = id; + } else { + /* only free on error. On success, the entry was + * decoded in place. + */ + ch_free( data.data ); } - -#ifndef BDB_USE_BINARY_RW - ch_free( data.data ); -#endif return rc; } @@ -324,14 +138,16 @@ int bdb_entry_return( BackendDB *be, Entry *e ) { -#ifdef BDB_USE_BINARY_RW - /* bdb_modify_internal always operates on a dup'd set of attrs. */ + /* Our entries are almost always contiguous blocks, so a single + * free() on the Entry pointer suffices. The exception is when + * an entry has been modified, in which case the attr list will + * have been alloc'd separately. + */ if ((void *)e->e_attrs < (void *)e || (void *)e->e_attrs > e->e_private) attrs_free(e->e_attrs); + ch_free(e); -#else - entry_free( e ); -#endif + return 0; } diff --git a/servers/slapd/back-bdb/modify.c b/servers/slapd/back-bdb/modify.c index 5bcd494e78..4e2d19917b 100644 --- a/servers/slapd/back-bdb/modify.c +++ b/servers/slapd/back-bdb/modify.c @@ -147,10 +147,6 @@ int bdb_modify_internal( return rc; } -#ifndef BDB_USE_BINARY_RW - /* cannot free individual elements of the entry */ - attrs_free( save_attrs ); -#endif return rc; } diff --git a/servers/slapd/back-bdb/modrdn.c b/servers/slapd/back-bdb/modrdn.c index b2e989c426..c628c98779 100644 --- a/servers/slapd/back-bdb/modrdn.c +++ b/servers/slapd/back-bdb/modrdn.c @@ -478,21 +478,12 @@ retry: /* transaction retry */ goto return_results; } -#ifdef BDB_USE_BINARY_RW /* Binary format uses a single contiguous block, cannot * free individual fields. Leave new_dn/new_ndn set so * they can be individually freed later. */ e->e_dn = new_dn; e->e_ndn = new_ndn; -#else - free( e->e_dn ); - free( e->e_ndn ); - e->e_dn = new_dn; - e->e_ndn = new_ndn; - new_dn = NULL; - new_ndn = NULL; -#endif /* add new one */ rc = bdb_dn2id_add( be, ltid, e->e_ndn, e->e_id ); @@ -520,10 +511,6 @@ retry: /* transaction retry */ goto return_results; } - /* NOTE: after this you must not free new_dn or new_ndn! - * They are used by cache. - */ - /* id2entry index */ rc = bdb_id2entry_update( be, ltid, e ); if ( rc != 0 ) { diff --git a/servers/slapd/entry.c b/servers/slapd/entry.c index 0bea4e125c..7d553846ce 100644 --- a/servers/slapd/entry.c +++ b/servers/slapd/entry.c @@ -380,240 +380,191 @@ entry_id_cmp( Entry *e1, Entry *e2 ) #ifdef SLAPD_BDB -/* a LBER encoded entry looks like: - * - * entry :== SEQUENCE { - * dn DistinguishedName, - * ndn NormalizedDistinguishedName, - * attrs SEQUENCE OF SEQUENCE { - * type AttributeType, - * values SET OF AttributeValue - * } - * } - * - * Encoding/Decoding of LBER should be much faster than LDIF +/* Flatten an Entry into a buffer. The buffer contents become a direct + * copy of the entry, with all pointers converted to offsets from the + * beginning of the buffer. We do this by first walking through all + * the fields of the Entry, adding up their sizes. Then a single chunk + * of memory is malloc'd and the entry is copied. We differentiate between + * fixed size fields and variable-length content when tallying up the + * entry size, so that we can stick all of the variable-length stuff + * into the back half of the buffer. */ - -int entry_decode( struct berval *bv, Entry **entry ) +int entry_encode(Entry *e, struct berval **bv) { - int rc; - BerElement *ber; - Entry *e; - ber_tag_t tag; - ber_len_t len; - char *last; - - assert( bv != NULL ); - assert( entry != NULL ); - - ber = ber_init( bv ); - if( ber == NULL ) { - assert( 0 ); /* XXYYZ: Temporary assert */ - + int siz = sizeof(Entry); + int len, dnlen; + int i, j; + Entry *f; + Attribute *a, *b; + struct berval **bvl, *bz; + char *ptr, *base, *data; + + *bv = ch_malloc(sizeof(struct berval)); + /* Compress any white space in the DN */ + dn_validate(e->e_dn); #ifdef NEW_LOGGING - LDAP_LOG(( "operation", LDAP_LEVEL_ERR, - "entry_decode: ber_init failed\n" )); + LDAP_LOG(( "operation", LDAP_LEVEL_DETAIL1, + "entry_encode: id: 0x%08lx \"%s\"\n", + (long) e->e_id, e->e_dn )); #else - Debug( LDAP_DEBUG_ANY, - "<= entry_decode: ber_init failed\n", - 0, 0, 0 ); + Debug( LDAP_DEBUG_TRACE, "=> entry_encode(0x%08lx): %s\n", + (long) e->e_id, e->e_dn, 0 ); #endif - return LDAP_LOCAL_ERROR; + dnlen = strlen(e->e_dn); + /* The dn and ndn are always the same length */ + len = dnlen + dnlen + 2; /* two trailing NUL bytes */ + for (a=e->e_attrs; a; a=a->a_next) { + /* For AttributeDesc, we only store the attr name */ + siz += sizeof(Attribute); + len += a->a_desc->ad_cname.bv_len+1; + for (i=0; a->a_vals[i]; i++) { + siz += sizeof(struct berval *); + siz += sizeof(struct berval); + len += a->a_vals[i]->bv_len + 1; + } + siz += sizeof(struct berval *); /* NULL pointer at end */ } + (*bv)->bv_len = siz + len; + (*bv)->bv_val = ch_malloc(siz+len); + base = (*bv)->bv_val; + ptr = base + siz; + f = (Entry *)base; + data = (char *)(f+1); + f->e_id = e->e_id; + f->e_dn = (char *)(ptr-base); + memcpy(ptr, e->e_dn, dnlen); + ptr += dnlen; + *ptr++ = '\0'; + f->e_ndn = (char *)(ptr-base); + memcpy(ptr, e->e_ndn, dnlen); + ptr += dnlen; + *ptr++ = '\0'; + f->e_attrs = e->e_attrs ? (Attribute *)sizeof(Entry) : NULL; + f->e_private = NULL; + for (a=e->e_attrs; a; a=a->a_next) { + b = (Attribute *)data; + data = (char *)(b+1); + b->a_desc = (AttributeDescription *)(ptr-base); + memcpy(ptr, a->a_desc->ad_cname.bv_val, + a->a_desc->ad_cname.bv_len); + ptr += a->a_desc->ad_cname.bv_len; + *ptr++ = '\0'; + if (a->a_vals) { + bvl = (struct berval **)data; + b->a_vals = (struct berval **)(data-base); + for (i=0; a->a_vals[i]; i++); + data = (char *)(bvl+i+1); + bz = (struct berval *)data; + for (j=0; jbv_len = a->a_vals[j]->bv_len; + if (a->a_vals[j]->bv_val) { + bz->bv_val = (char *)(ptr-base); + memcpy(ptr, a->a_vals[j]->bv_val, bz->bv_len); + } else { + bz->bv_val = NULL; + } + ptr += bz->bv_len; + *ptr++ = '\0'; + bvl[j] = (struct berval *)(data-base); + bz++; + data = (char *)bz; + } + bvl[j] = NULL; + } else { + b->a_vals = NULL; + } - /* initialize reader/writer lock */ - e = (Entry *) ch_malloc( sizeof(Entry) ); - - if( e == NULL ) { -#ifdef NEW_LOGGING - LDAP_LOG(( "operation", LDAP_LEVEL_ERR, - "entry_decode: entry allocation failed.\n" )); -#else - Debug( LDAP_DEBUG_ANY, - "<= entry_decode: entry allocation failed\n", - 0, 0, 0 ); -#endif - return LDAP_LOCAL_ERROR; + if (a->a_next) + b->a_next = (Attribute *)(data-base); + else + b->a_next = NULL; } + return 0; +} - /* initialize entry */ - e->e_id = NOID; - e->e_dn = NULL; - e->e_ndn = NULL; - e->e_attrs = NULL; - e->e_private = NULL; - - tag = ber_scanf( ber, "{aa" /*"}"*/, &e->e_dn, &e->e_ndn ); - if( tag == LBER_ERROR ) { - free( e ); - return LDAP_PROTOCOL_ERROR; - } +/* Retrieve an Entry that was stored using entry_encode above. + * All we have to do is add the buffer address to all of the + * stored offsets. We also must lookup the stored attribute names + * to get AttributeDescriptions. To detect if the attributes of + * an Entry are later modified, we also store the address of the + * end of this block in e_private. + * + * Note: everything is stored in a single contiguous block, so + * you can not free individual attributes or names from this + * structure. Attempting to do so will likely corrupt memory. + */ +int entry_decode(struct berval *bv, Entry **e) +{ + int i; + long base; + Attribute *a; + Entry *x = (Entry *)bv->bv_val; + char *type; + const char *text; + AttributeDescription *ad; + base = (long)bv->bv_val; + x->e_dn += base; + x->e_ndn += base; #ifdef NEW_LOGGING LDAP_LOG(( "operation", LDAP_LEVEL_DETAIL2, - "entry_decode: \"%s\"\n", e->e_dn )); + "entry_decode: \"%s\"\n", x->e_dn )); #else Debug( LDAP_DEBUG_TRACE, "entry_decode: \"%s\"\n", - e->e_dn, 0, 0 ); + x->e_dn, 0, 0 ); #endif - /* get the attrs */ - for ( tag = ber_first_element( ber, &len, &last ); - tag != LBER_DEFAULT; - tag = ber_next_element( ber, &len, last ) ) - { - struct berval *type; - struct berval **vals; - AttributeDescription *ad; - const char *text; - - tag = ber_scanf( ber, "{O{V}}", &type, &vals ); - - if ( tag == LBER_ERROR ) { -#ifdef NEW_LOGGING - LDAP_LOG(( "operation", LDAP_LEVEL_ERR, - "entry_decode: decoding error (%s)\n", e->e_dn )); -#else - Debug( LDAP_DEBUG_ANY, "entry_decode: decoding error\n", 0, 0, 0 ); -#endif - entry_free( e ); - return LDAP_PROTOCOL_ERROR; - } - - if ( vals == NULL ) { -#ifdef NEW_LOGGING - LDAP_LOG(( "operation", LDAP_LEVEL_ERR, - "entry_decode: no values for type %s\n", type )); -#else - Debug( LDAP_DEBUG_ANY, "entry_decode: no values for type %s\n", - type, 0, 0 ); -#endif - ber_bvfree( type ); - entry_free( e ); - return LDAP_PROTOCOL_ERROR; - } - + x->e_private = bv->bv_val + bv->bv_len; + if (x->e_attrs) + x->e_attrs = (Attribute *)((long)x->e_attrs+base); + for (a=x->e_attrs; a; a=a->a_next) { + if (a->a_next) + a->a_next = (Attribute *)((long)a->a_next+base); ad = NULL; - rc = slap_bv2ad( type, &ad, &text ); + type = (char *)a->a_desc+base; + i = slap_str2ad( type, &ad, &text ); - if( rc != LDAP_SUCCESS ) { + if( i != LDAP_SUCCESS ) { #ifdef NEW_LOGGING LDAP_LOG(( "operation", LDAP_LEVEL_INFO, - "entry_decode: str2ad(%s): %s\n", type->bv_val, text )); + "entry_decode: str2ad(%s): %s\n", type, text )); #else Debug( LDAP_DEBUG_TRACE, - "<= entry_decode: str2ad(%s): %s\n", type->bv_val, text, 0 ); + "<= entry_decode: str2ad(%s): %s\n", type, text, 0 ); #endif - rc = slap_bv2undef_ad( type, &ad, &text ); + i = slap_str2undef_ad( type, &ad, &text ); - if( rc != LDAP_SUCCESS ) { + if( i != LDAP_SUCCESS ) { #ifdef NEW_LOGGING LDAP_LOG(( "operation", LDAP_LEVEL_INFO, - "entry_decode: str2undef_ad(%s): %s\n", type->bv_val, text)); + "entry_decode: str2undef_ad(%s): %s\n", type, text)); #else Debug( LDAP_DEBUG_ANY, "<= entry_decode: str2undef_ad(%s): %s\n", - type->bv_val, text, 0 ); + type, text, 0 ); #endif - ber_bvfree( type ); - ber_bvecfree( vals ); - entry_free( e ); - return rc; + return i; } } - - rc = attr_merge( e, ad, vals ); - - if( rc != 0 ) { -#ifdef NEW_LOGGING - LDAP_LOG(( "operation", LDAP_LEVEL_INFO, - "entry_decode: attr_merge failed\n")); -#else - Debug( LDAP_DEBUG_ANY, - "<= entry_decode: attr_merge failed\n", 0, 0, 0 ); -#endif - ber_bvfree( type ); - ber_bvecfree( vals ); - entry_free( e ); - return LDAP_LOCAL_ERROR; + a->a_desc = ad; + if (a->a_vals) { + a->a_vals = (struct berval **)((long)a->a_vals+base); + for (i=0; a->a_vals[i]; i++) { + a->a_vals[i] = (struct berval *) + ((long)a->a_vals[i]+base); + if (a->a_vals[i]->bv_val) + a->a_vals[i]->bv_val += base; + } } - - free( type ); - ber_bvecfree( vals ); } - - rc = ber_scanf( ber, /*"{"*/ "}" ); - if( rc < 0 ) { - entry_free( e ); - return LDAP_PROTOCOL_ERROR; - } - #ifdef NEW_LOGGING LDAP_LOG(( "operation", LDAP_LEVEL_DETAIL1, - "entry_decode: %s\n", e->e_dn )); + "entry_decode: %s\n", x->e_dn )); #else Debug(LDAP_DEBUG_TRACE, "<= entry_decode(%s)\n", - e->e_dn, 0, 0 ); + x->e_dn, 0, 0 ); #endif - - *entry = e; - return LDAP_SUCCESS; -} - -int entry_encode( - Entry *e, - struct berval **bv ) -{ - int rc = -1; - Attribute *a; - BerElement *ber; - -#ifdef NEW_LOGGING - LDAP_LOG(( "operation", LDAP_LEVEL_DETAIL1, - "entry_encode: id: 0x%08lx \"%s\"\n", - (long) e->e_id, e->e_dn )); -#else - Debug( LDAP_DEBUG_TRACE, "=> entry_encode(0x%08lx): %s\n", - (long) e->e_id, e->e_dn, 0 ); -#endif - ber = ber_alloc_t( LBER_USE_DER ); - if( ber == NULL ) { - goto done; - } - - rc = ber_printf( ber, "{ss{" /*"}}"*/, e->e_dn, e->e_ndn ); - if( rc < 0 ) { - goto done; - } - - for ( a = e->e_attrs; a != NULL; a = a->a_next ) { - rc = ber_printf( ber, "{O{V}}", - &a->a_desc->ad_cname, - a->a_vals ); - if( rc < 0 ) { - goto done; - } - } - - rc = ber_printf( ber, /*"{{"*/ "}}" ); - if( rc < 0 ) { - goto done; - } - - rc = ber_flatten( ber, bv ); - -done: - ber_free( ber, 1 ); - if( rc ) { -#ifdef NEW_LOGGING - LDAP_LOG(( "operation", LDAP_LEVEL_INFO, - "entry_encode: id=0x%08lx failed (%d)\n", - (long) e->e_id, rc )); -#else - Debug( LDAP_DEBUG_ANY, "=> entry_encode(0x%08lx): failed (%d)\n", - (long) e->e_id, rc, 0 ); -#endif - } - return rc; + *e = x; + return 0; } #endif