Change slapd/delete stats message for consistency.

[openldap] / servers / slapd / entry.c

diff --git a/servers/slapd/entry.c b/servers/slapd/entry.c
index b5f25d70d80d3ca4accdadf0d651c40fd0b2956e..bc0f2de4da36bf19bcd5b554d2119f6933bb01ad 100644 (file)
--- a/servers/slapd/entry.c
+++ b/servers/slapd/entry.c
@@ -5,6 +5,7 @@
 #include <stdio.h>
 
 #include <ac/ctype.h>
+#include <ac/errno.h>
 #include <ac/socket.h>
 #include <ac/string.h>
 
@@ -48,7 +49,7 @@ str2entry( char       *s )
 
        /* check to see if there's an id included */
        next = s;
-       if ( isdigit( *s ) ) {
+       if ( isdigit( (unsigned char) *s ) ) {
                id = atoi( s );
                if ( (s = str_getline( &next )) == NULL ) {
                        Debug( LDAP_DEBUG_TRACE,
@@ -150,7 +151,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 ); \
@@ -218,11 +219,20 @@ entry_free( Entry *e )
        int             i;
        Attribute       *a, *next;
 
-       /* XXX check that no reader/writer locks exist */
+       /* check that no reader/writer locks exist */
+
+       if ( ldap_pvt_thread_rdwr_wtrylock( &e->e_rdwr ) == 
+               LDAP_PVT_THREAD_EBUSY )
+       {
+               Debug( LDAP_DEBUG_ANY, "entry_free(%ld): active (%d, %d)\n",
+                       e->e_id,
+                       ldap_pvt_thread_rdwr_readers( &e->e_rdwr ),
+                       ldap_pvt_thread_rdwr_writers( &e->e_rdwr ));
+
 #ifdef LDAP_DEBUG
-       assert( !pthread_rdwr_wchk_np(&e->e_rdwr) &&
-               !pthread_rdwr_rchk_np(&e->e_rdwr) );
+               assert(!ldap_pvt_thread_rdwr_active( &e->e_rdwr ));
 #endif
+       }
 
        if ( e->e_dn != NULL ) {
                free( e->e_dn );
@@ -243,9 +253,9 @@ 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);
+               return ldap_pvt_thread_rdwr_wlock(&e->e_rdwr);
        else
-               return pthread_rdwr_rlock_np(&e->e_rdwr);
+               return ldap_pvt_thread_rdwr_rlock(&e->e_rdwr);
 }
 
 int
@@ -260,15 +270,26 @@ entry_rdwr_wlock(Entry *e)
        return entry_rdwr_lock( e, 1 );
 }
 
+int
+entry_rdwr_trylock(Entry *e, int rw)
+{
+       Debug( LDAP_DEBUG_ARGS, "entry_rdwr_%strylock: ID: %ld\n",
+               rw ? "w" : "r", e->e_id, 0);
+       if (rw)
+               return ldap_pvt_thread_rdwr_wtrylock(&e->e_rdwr);
+       else
+               return ldap_pvt_thread_rdwr_rtrylock(&e->e_rdwr);
+}
+
 int
 entry_rdwr_unlock(Entry *e, int rw)
 {
        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);
+               return ldap_pvt_thread_rdwr_wunlock(&e->e_rdwr);
        else
-               return pthread_rdwr_runlock_np(&e->e_rdwr);
+               return ldap_pvt_thread_rdwr_runlock(&e->e_rdwr);
 }
 
 int
@@ -286,5 +307,5 @@ entry_rdwr_wunlock(Entry *e)
 int
 entry_rdwr_init(Entry *e)
 {
-       return pthread_rdwr_init_np(&e->e_rdwr, NULL);
+       return ldap_pvt_thread_rdwr_init( &e->e_rdwr );
 }