Experimental code that uses one locker ID per thread. Seems to work OK,

[openldap] / servers / slapd / attr.c

diff --git a/servers/slapd/attr.c b/servers/slapd/attr.c
index d5b9e3a0780acf2afe41d2cc18c4103426becd48..ab9c56511ed0052bc06f44e07aa350d29230f32a 100644 (file)
--- a/servers/slapd/attr.c
+++ b/servers/slapd/attr.c
@@ -1,6 +1,6 @@
 /* $OpenLDAP$ */
 /*
- * Copyright 1998-2000 The OpenLDAP Foundation, All Rights Reserved.
+ * Copyright 1998-2002 The OpenLDAP Foundation, All Rights Reserved.
  * COPYING RESTRICTIONS APPLY, see COPYRIGHT file
  */
 /* attr.c - routines for dealing with attributes */
@@ -23,13 +23,15 @@
 #include "slap.h"
 
 #ifdef LDAP_DEBUG
-static void at_index_print( void );
+static void at_index_print( void ) 
+{
+}
 #endif
 
 void
 attr_free( Attribute *a )
 {
-       ber_bvecfree( a->a_vals );
+       ber_bvarray_free( a->a_vals );
        free( a );
 }
 
@@ -55,19 +57,18 @@ Attribute *attr_dup( Attribute *a )
        if( a->a_vals != NULL ) {
                int i;
 
-               for( i=0; a->a_vals[i] != NULL; i++ ) {
+               for( i=0; a->a_vals[i].bv_val != NULL; i++ ) {
                        /* EMPTY */ ;
                }
 
-               tmp->a_vals = ch_malloc((i+1) * sizeof(struct berval*));
-
-               for( i=0; a->a_vals[i] != NULL; i++ ) {
-                       tmp->a_vals[i] = ber_bvdup( a->a_vals[i] );
+               tmp->a_vals = ch_malloc((i+1) * sizeof(struct berval));
 
-                       if( tmp->a_vals[i] == NULL ) break;
+               for( i=0; a->a_vals[i].bv_val != NULL; i++ ) {
+                       ber_dupbv( &tmp->a_vals[i], &a->a_vals[i] );
+                       if( tmp->a_vals[i].bv_val == NULL ) break;
                }
 
-               tmp->a_vals[i] = NULL;
+               tmp->a_vals[i].bv_val = NULL;
 
        } else {
                tmp->a_vals = NULL;
@@ -75,6 +76,7 @@ Attribute *attr_dup( Attribute *a )
 
        tmp->a_desc = a->a_desc;
        tmp->a_next = NULL;
+       tmp->a_flags = 0;
 
        return tmp;
 }
@@ -110,13 +112,12 @@ int
 attr_merge(
        Entry           *e,
        AttributeDescription *desc,
-       struct berval   **vals )
+       BerVarray       vals )
 {
        Attribute       **a;
 
        for ( a = &e->e_attrs; *a != NULL; a = &(*a)->a_next ) {
-               if ( ad_cmp( (*a)->a_desc, desc ) == 0 )
-               {
+               if ( ad_cmp( (*a)->a_desc, desc ) == 0 ) {
                        break;
                }
        }
@@ -126,11 +127,37 @@ attr_merge(
                (*a)->a_desc = desc;
                (*a)->a_vals = NULL;
                (*a)->a_next = NULL;
+               (*a)->a_flags = 0;
        }
 
        return( value_add( &(*a)->a_vals, vals ) );
 }
 
+int
+attr_merge_one(
+       Entry           *e,
+       AttributeDescription *desc,
+       struct berval   *val )
+{
+       Attribute       **a;
+
+       for ( a = &e->e_attrs; *a != NULL; a = &(*a)->a_next ) {
+               if ( ad_cmp( (*a)->a_desc, desc ) == 0 ) {
+                       break;
+               }
+       }
+
+       if ( *a == NULL ) {
+               *a = (Attribute *) ch_malloc( sizeof(Attribute) );
+               (*a)->a_desc = desc;
+               (*a)->a_vals = NULL;
+               (*a)->a_next = NULL;
+               (*a)->a_flags = 0;
+       }
+
+       return( value_add_one( &(*a)->a_vals, val ) );
+}
+
 /*
  * attrs_find - find attribute(s) by AttributeDescription
  * returns next attribute which is subtype of provided description.
@@ -162,8 +189,7 @@ attr_find(
 )
 {
        for ( ; a != NULL; a = a->a_next ) {
-               if ( ad_cmp( a->a_desc, desc ) == 0 )
-               {
+               if ( ad_cmp( a->a_desc, desc ) == 0 ) {
                        return( a );
                }
        }
@@ -187,8 +213,7 @@ attr_delete(
        Attribute       **a;
 
        for ( a = attrs; *a != NULL; a = &(*a)->a_next ) {
-               if ( ad_cmp( (*a)->a_desc, desc ) == 0 )
-               {
+               if ( ad_cmp( (*a)->a_desc, desc ) == 0 ) {
                        Attribute       *save = *a;
                        *a = (*a)->a_next;
                        attr_free( save );