X-Git-Url: https://git.sur5r.net/?a=blobdiff_plain;f=servers%2Fslapd%2Fentry.c;h=b0cd52e28fda5384293f95be943bee64000f0968;hb=51190984eefbdbedd47185e41ece37f72773744d;hp=fedab892fa46c4d6617630fb85745de2bb5717ac;hpb=c9242a123f5187f06807af4756c6b4f618642b5f;p=openldap diff --git a/servers/slapd/entry.c b/servers/slapd/entry.c index fedab892fa..b0cd52e28f 100644 --- a/servers/slapd/entry.c +++ b/servers/slapd/entry.c @@ -1,10 +1,16 @@ /* entry.c - routines for dealing with entries */ +/* $OpenLDAP$ */ +/* + * Copyright 1998-1999 The OpenLDAP Foundation, All Rights Reserved. + * COPYING RESTRICTIONS APPLY, see COPYRIGHT file + */ #include "portable.h" #include #include +#include #include #include @@ -14,24 +20,33 @@ static unsigned char *ebuf; /* buf returned by entry2str */ static unsigned char *ecur; /* pointer to end of currently used ebuf */ static int emaxsize;/* max size of ebuf */ +int entry_destroy(void) +{ + free( ebuf ); + ebuf = NULL; + ecur = NULL; + emaxsize = 0; + return 0; +} + Entry * -str2entry( char *s ) +str2entry( char *s ) { - int id = 0; Entry *e; Attribute **a; char *type; char *value; char *next; - int vlen, nvals, maxvals; + ber_len_t vlen; + int nvals, maxvals; struct berval bval; struct berval *vals[2]; char ptype[64]; /* - * In string format, an entry looks like this: + * LDIF is used as the string format. + * An entry looks like this: * - * \n * dn: \n * [:[:] \n] * [\n]* @@ -46,20 +61,10 @@ str2entry( char *s ) Debug( LDAP_DEBUG_TRACE, "=> str2entry\n", s ? s : "NULL", 0, 0 ); - /* check to see if there's an id included */ next = s; - if ( isdigit( *s ) ) { - id = atoi( s ); - if ( (s = ldif_getline( &next )) == NULL ) { - Debug( LDAP_DEBUG_TRACE, - "<= str2entry NULL (missing newline after id)\n", - 0, 0, 0 ); - return( NULL ); - } - } /* initialize reader/writer lock */ - e = (Entry *) ch_calloc( 1, sizeof(Entry) ); + e = (Entry *) ch_malloc( sizeof(Entry) ); if( e == NULL ) { Debug( LDAP_DEBUG_TRACE, @@ -67,15 +72,19 @@ str2entry( char *s ) 0, 0, 0 ); return( NULL ); } - e->e_id = id; - entry_rdwr_init(e); + /* initialize entry */ + e->e_id = NOID; + e->e_dn = NULL; + e->e_ndn = NULL; + e->e_attrs = NULL; + e->e_private = NULL; /* dn + attributes */ - e->e_attrs = NULL; vals[0] = &bval; vals[1] = NULL; ptype[0] = '\0'; + while ( (s = ldif_getline( &next )) != NULL ) { if ( *s == '\n' || *s == '\0' ) { break; @@ -95,21 +104,17 @@ str2entry( char *s ) } if ( strcasecmp( type, "dn" ) == 0 ) { + free( type ); + if ( e->e_dn != NULL ) { Debug( LDAP_DEBUG_ANY, - "str2entry: entry %lu has multiple dns \"%s\" and \"%s\" (second ignored)\n", - e->e_id, e->e_dn, value ); + "str2entry: entry %ld has multiple dns \"%s\" and \"%s\" (second ignored)\n", + e->e_id, e->e_dn, + value != NULL ? value : NULL ); + if( value != NULL ) free( value ); continue; } - e->e_dn = ch_strdup( value ); - - if ( e->e_ndn != NULL ) { - Debug( LDAP_DEBUG_ANY, - "str2entry: entry %lu already has a normalized dn \"%s\" for \"%s\" (first ignored)\n", - e->e_id, e->e_ndn, value ); - free( e->e_ndn ); - } - e->e_ndn = dn_normalize_case( ch_strdup( value ) ); + e->e_dn = value != NULL ? value : ch_strdup( "" ); continue; } @@ -120,28 +125,30 @@ str2entry( char *s ) Debug( LDAP_DEBUG_TRACE, "<= str2entry NULL (attr_merge)\n", 0, 0, 0 ); entry_free( e ); + free( value ); + free( type ); return( NULL ); } + + free( value ); + free( type ); nvals++; } /* check to make sure there was a dn: line */ if ( e->e_dn == NULL ) { - Debug( LDAP_DEBUG_ANY, "str2entry: entry %lu has no dn\n", + Debug( LDAP_DEBUG_ANY, "str2entry: entry %ld has no dn\n", e->e_id, 0, 0 ); entry_free( e ); return( NULL ); } - if ( e->e_ndn == NULL ) { - Debug( LDAP_DEBUG_ANY, - "str2entry: entry %lu (\"%s\") has no normalized dn\n", - e->e_id, e->e_dn, 0 ); - entry_free( e ); - return( NULL ); - } + /* generate normalized dn */ + e->e_ndn = ch_strdup( e->e_dn ); + (void) dn_normalize( e->e_ndn ); - Debug(LDAP_DEBUG_TRACE, "<= str2entry 0x%lx\n", (unsigned long)e, 0,0); + Debug(LDAP_DEBUG_TRACE, "<= str2entry(%s) -> %ld (0x%lx)\n", + e->e_dn, e->e_id, (unsigned long)e ); return( e ); } @@ -150,7 +157,7 @@ str2entry( char *s ) #define MAKE_SPACE( n ) { \ while ( ecur + (n) > ebuf + emaxsize ) { \ - int offset; \ + ptrdiff_t offset; \ offset = (int) (ecur - ebuf); \ ebuf = (unsigned char *) ch_realloc( (char *) ebuf, \ emaxsize + GRABSIZE ); \ @@ -162,9 +169,7 @@ str2entry( char *s ) char * entry2str( Entry *e, - int *len, - int printid -) + int *len ) { Attribute *a; struct berval *bv; @@ -179,19 +184,12 @@ entry2str( ecur = ebuf; - if ( printid ) { - /* id + newline */ - MAKE_SPACE( 10 ); - sprintf( (char *) ecur, "%ld\n", e->e_id ); - ecur = (unsigned char *) strchr( (char *) ecur, '\0' ); - } - /* put the dn */ if ( e->e_dn != NULL ) { /* put "dn: " */ tmplen = strlen( e->e_dn ); MAKE_SPACE( LDIF_SIZE_NEEDED( 2, tmplen )); - ldif_put_type_and_value( (char **) &ecur, "dn", e->e_dn, tmplen ); + ldif_sput( (char **) &ecur, LDIF_PUT_VALUE, "dn", e->e_dn, tmplen ); } /* put the attributes */ @@ -201,7 +199,7 @@ entry2str( bv = a->a_vals[i]; tmplen = strlen( a->a_type ); MAKE_SPACE( LDIF_SIZE_NEEDED( tmplen, bv->bv_len )); - ldif_put_type_and_value( (char **) &ecur, a->a_type, + ldif_sput( (char **) &ecur, LDIF_PUT_VALUE, a->a_type, bv->bv_val, bv->bv_len ); } } @@ -215,76 +213,54 @@ entry2str( void entry_free( Entry *e ) { - int i; Attribute *a, *next; - /* XXX check that no reader/writer locks exist */ -#ifdef LDAP_DEBUG - assert( !pthread_rdwr_wchk_np(&e->e_rdwr) && - !pthread_rdwr_rchk_np(&e->e_rdwr) ); -#endif - if ( e->e_dn != NULL ) { free( e->e_dn ); + e->e_dn = NULL; } if ( e->e_ndn != NULL ) { free( e->e_ndn ); + e->e_ndn = NULL; } for ( a = e->e_attrs; a != NULL; a = next ) { next = a->a_next; attr_free( a ); } + e->e_attrs = NULL; + e->e_private = NULL; free( e ); } -int -entry_rdwr_lock(Entry *e, int rw) -{ - Debug( LDAP_DEBUG_ARGS, "entry_rdwr_%slock: ID: %ld\n", - rw ? "w" : "r", e->e_id, 0); - if (rw) - return pthread_rdwr_wlock_np(&e->e_rdwr); - else - return pthread_rdwr_rlock_np(&e->e_rdwr); -} +/* + * These routines are used only by Backend. + * + * the Entry has three entry points (ways to find things): + * + * by entry e.g., if you already have an entry from the cache + * and want to delete it. (really by entry ptr) + * by dn e.g., when looking for the base object of a search + * by id e.g., for search candidates + * + * these correspond to three different avl trees that are maintained. + */ int -entry_rdwr_rlock(Entry *e) +entry_cmp( Entry *e1, Entry *e2 ) { - return entry_rdwr_lock( e, 0 ); + return( e1 < e2 ? -1 : (e1 > e2 ? 1 : 0) ); } int -entry_rdwr_wlock(Entry *e) +entry_dn_cmp( Entry *e1, Entry *e2 ) { - return entry_rdwr_lock( e, 1 ); + /* compare their normalized UPPERCASED dn's */ + return( strcmp( e1->e_ndn, e2->e_ndn ) ); } int -entry_rdwr_unlock(Entry *e, int rw) +entry_id_cmp( Entry *e1, Entry *e2 ) { - Debug( LDAP_DEBUG_ARGS, "entry_rdwr_%sunlock: ID: %ld\n", - rw ? "w" : "r", e->e_id, 0); - if (rw) - return pthread_rdwr_wunlock_np(&e->e_rdwr); - else - return pthread_rdwr_runlock_np(&e->e_rdwr); + return( e1->e_id < e2->e_id ? -1 : (e1->e_id > e2->e_id ? 1 : 0) ); } -int -entry_rdwr_runlock(Entry *e) -{ - return entry_rdwr_unlock( e, 0 ); -} - -int -entry_rdwr_wunlock(Entry *e) -{ - return entry_rdwr_unlock( e, 1 ); -} - -int -entry_rdwr_init(Entry *e) -{ - return pthread_rdwr_init_np(&e->e_rdwr, NULL); -}