Stuart Lynne's UNTESTED thread patch (p1)

[openldap] / servers / slapd / entry.c

diff --git a/servers/slapd/entry.c b/servers/slapd/entry.c
index d5ee966b570ad152344a50176022a9083e5173df..552ecac478a8fa8d518e120b723f3547c2080635 100644 (file)
--- a/servers/slapd/entry.c
+++ b/servers/slapd/entry.c
@@ -46,6 +46,8 @@ str2entry( char       *s )
        Debug( LDAP_DEBUG_TRACE, "=> str2entry\n", s, 0, 0 );
 
        e = (Entry *) ch_calloc( 1, sizeof(Entry) );
+        /* initialize reader/writer lock */
+        pthread_rdwr_init_np(&e->e_rdwr, NULL);
 
        /* check to see if there's an id included */
        next = s;
@@ -112,6 +114,7 @@ str2entry( char     *s )
        }
 
        Debug( LDAP_DEBUG_TRACE, "<= str2entry 0x%x\n", e, 0, 0 );
+
        return( e );
 }
 
@@ -187,6 +190,9 @@ entry_free( Entry *e )
        int             i;
        Attribute       *a, *next;
 
+        /* XXX check that no reader/writer locks exist */
+        assert(!pthread_rdwr_wchk_np(&e->e_rdwr)&&!pthread_rdwr_rchk_np(&e->e_rdwr));
+
        if ( e->e_dn != NULL ) {
                free( e->e_dn );
        }