Parsing and printing of extensions in schema definitions.

[openldap] / libraries / libldap_r / rdwr.c

diff --git a/libraries/libldap_r/rdwr.c b/libraries/libldap_r/rdwr.c
index b4dabbc134fc82f03b1a73506854b0918b797490..85da7de0258824de59c92ac4554a4509c12fe341 100644 (file)
--- a/libraries/libldap_r/rdwr.c
+++ b/libraries/libldap_r/rdwr.c
@@ -1,3 +1,4 @@
+/* $OpenLDAP$ */
 /*
 ** This is an improved implementation of Reader/Writer locks does
 ** not protect writers from starvation.  That is, if a writer is
@@ -17,14 +18,18 @@
 
 #include "portable.h"
 
-#include <stdlib.h>
+#include <ac/stdlib.h>
 
 #include <ac/errno.h>
+#include <ac/string.h>
+
 #include "ldap_pvt_thread.h"
 
 int 
 ldap_pvt_thread_rdwr_init( ldap_pvt_thread_rdwr_t *rw )
 {
+       assert( rw != NULL );
+
        memset( rw, 0, sizeof(ldap_pvt_thread_rdwr_t) );
 
        /* we should check return results */
@@ -32,20 +37,23 @@ ldap_pvt_thread_rdwr_init( ldap_pvt_thread_rdwr_t *rw )
        ldap_pvt_thread_cond_init( &rw->ltrw_read );
        ldap_pvt_thread_cond_init( &rw->ltrw_write );
 
-       rw->ltrw_valid = LDAP_PVT_THREAD_RDWR_VALUE;
+       rw->ltrw_valid = LDAP_PVT_THREAD_RDWR_VALID;
        return 0;
 }
 
 int 
 ldap_pvt_thread_rdwr_destroy( ldap_pvt_thread_rdwr_t *rw )
 {
-       if( rw->ltrw_valid != LDAP_PVT_THREAD_RDWR_VALUE )
+       assert( rw != NULL );
+       assert( rw->ltrw_valid == LDAP_PVT_THREAD_RDWR_VALID );
+
+       if( rw->ltrw_valid != LDAP_PVT_THREAD_RDWR_VALID )
                return LDAP_PVT_THREAD_EINVAL;
 
        ldap_pvt_thread_mutex_lock( &rw->ltrw_mutex );
 
        /* active threads? */
-       if( rw->ltrw_r_active > 0 || rw->ltrw_w_active > 1) {
+       if( rw->ltrw_r_active > 0 || rw->ltrw_w_active > 0) {
                ldap_pvt_thread_mutex_unlock( &rw->ltrw_mutex );
                return LDAP_PVT_THREAD_EBUSY;
        }
@@ -58,6 +66,8 @@ ldap_pvt_thread_rdwr_destroy( ldap_pvt_thread_rdwr_t *rw )
 
        rw->ltrw_valid = 0;
 
+       ldap_pvt_thread_mutex_unlock( &rw->ltrw_mutex );
+
        ldap_pvt_thread_mutex_destroy( &rw->ltrw_mutex );
        ldap_pvt_thread_cond_destroy( &rw->ltrw_read );
        ldap_pvt_thread_cond_destroy( &rw->ltrw_write );
@@ -67,12 +77,15 @@ ldap_pvt_thread_rdwr_destroy( ldap_pvt_thread_rdwr_t *rw )
 
 int ldap_pvt_thread_rdwr_rlock( ldap_pvt_thread_rdwr_t *rw )
 {
-       if( rw->ltrw_valid != LDAP_PVT_THREAD_RDWR_VALUE )
+       assert( rw != NULL );
+       assert( rw->ltrw_valid == LDAP_PVT_THREAD_RDWR_VALID );
+
+       if( rw->ltrw_valid != LDAP_PVT_THREAD_RDWR_VALID )
                return LDAP_PVT_THREAD_EINVAL;
 
        ldap_pvt_thread_mutex_lock( &rw->ltrw_mutex );
 
-       if( rw->ltrw_w_active > 1 ) {
+       if( rw->ltrw_w_active > 0 ) {
                /* writer is active */
 
                rw->ltrw_r_wait++;
@@ -80,7 +93,7 @@ int ldap_pvt_thread_rdwr_rlock( ldap_pvt_thread_rdwr_t *rw )
                do {
                        ldap_pvt_thread_cond_wait(
                                &rw->ltrw_read, &rw->ltrw_mutex );
-               } while( rw->ltrw_w_active > 1 );
+               } while( rw->ltrw_w_active > 0 );
 
                rw->ltrw_r_wait--;
        }
@@ -94,12 +107,15 @@ int ldap_pvt_thread_rdwr_rlock( ldap_pvt_thread_rdwr_t *rw )
 
 int ldap_pvt_thread_rdwr_rtrylock( ldap_pvt_thread_rdwr_t *rw )
 {
-       if( rw->ltrw_valid != LDAP_PVT_THREAD_RDWR_VALUE )
+       assert( rw != NULL );
+       assert( rw->ltrw_valid == LDAP_PVT_THREAD_RDWR_VALID );
+
+       if( rw->ltrw_valid != LDAP_PVT_THREAD_RDWR_VALID )
                return LDAP_PVT_THREAD_EINVAL;
 
        ldap_pvt_thread_mutex_lock( &rw->ltrw_mutex );
 
-       if( rw->ltrw_w_active > 1) {
+       if( rw->ltrw_w_active > 0) {
                ldap_pvt_thread_mutex_unlock( &rw->ltrw_mutex );
                return LDAP_PVT_THREAD_EBUSY;
        }
@@ -113,7 +129,10 @@ int ldap_pvt_thread_rdwr_rtrylock( ldap_pvt_thread_rdwr_t *rw )
 
 int ldap_pvt_thread_rdwr_runlock( ldap_pvt_thread_rdwr_t *rw )
 {
-       if( rw->ltrw_valid != LDAP_PVT_THREAD_RDWR_VALUE )
+       assert( rw != NULL );
+       assert( rw->ltrw_valid == LDAP_PVT_THREAD_RDWR_VALID );
+
+       if( rw->ltrw_valid != LDAP_PVT_THREAD_RDWR_VALID )
                return LDAP_PVT_THREAD_EINVAL;
 
        ldap_pvt_thread_mutex_lock( &rw->ltrw_mutex );
@@ -131,7 +150,10 @@ int ldap_pvt_thread_rdwr_runlock( ldap_pvt_thread_rdwr_t *rw )
 
 int ldap_pvt_thread_rdwr_wlock( ldap_pvt_thread_rdwr_t *rw )
 {
-       if( rw->ltrw_valid != LDAP_PVT_THREAD_RDWR_VALUE )
+       assert( rw != NULL );
+       assert( rw->ltrw_valid == LDAP_PVT_THREAD_RDWR_VALID );
+
+       if( rw->ltrw_valid != LDAP_PVT_THREAD_RDWR_VALID )
                return LDAP_PVT_THREAD_EINVAL;
 
        ldap_pvt_thread_mutex_lock( &rw->ltrw_mutex );
@@ -156,7 +178,10 @@ int ldap_pvt_thread_rdwr_wlock( ldap_pvt_thread_rdwr_t *rw )
 
 int ldap_pvt_thread_rdwr_wtrylock( ldap_pvt_thread_rdwr_t *rw )
 {
-       if( rw->ltrw_valid != LDAP_PVT_THREAD_RDWR_VALUE )
+       assert( rw != NULL );
+       assert( rw->ltrw_valid == LDAP_PVT_THREAD_RDWR_VALID );
+
+       if( rw->ltrw_valid != LDAP_PVT_THREAD_RDWR_VALID )
                return LDAP_PVT_THREAD_EINVAL;
 
        ldap_pvt_thread_mutex_lock( &rw->ltrw_mutex );
@@ -175,7 +200,10 @@ int ldap_pvt_thread_rdwr_wtrylock( ldap_pvt_thread_rdwr_t *rw )
 
 int ldap_pvt_thread_rdwr_wunlock( ldap_pvt_thread_rdwr_t *rw )
 {
-       if( rw->ltrw_valid != LDAP_PVT_THREAD_RDWR_VALUE )
+       assert( rw != NULL );
+       assert( rw->ltrw_valid == LDAP_PVT_THREAD_RDWR_VALID );
+
+       if( rw->ltrw_valid != LDAP_PVT_THREAD_RDWR_VALID )
                return LDAP_PVT_THREAD_EINVAL;
 
        ldap_pvt_thread_mutex_lock( &rw->ltrw_mutex );
@@ -208,16 +236,25 @@ int ldap_pvt_thread_rdwr_wunlock( ldap_pvt_thread_rdwr_t *rw )
 
 int ldap_pvt_thread_rdwr_readers(ldap_pvt_thread_rdwr_t *rw)
 {
+       assert( rw != NULL );
+       assert( rw->ltrw_valid == LDAP_PVT_THREAD_RDWR_VALID );
+
        return( rw->ltrw_r_active );
 }
 
 int ldap_pvt_thread_rdwr_writers(ldap_pvt_thread_rdwr_t *rw)
 {
+       assert( rw != NULL );
+       assert( rw->ltrw_valid == LDAP_PVT_THREAD_RDWR_VALID );
+
        return( rw->ltrw_w_active );
 }
 
 int ldap_pvt_thread_rdwr_active(ldap_pvt_thread_rdwr_t *rw)
 {
+       assert( rw != NULL );
+       assert( rw->ltrw_valid == LDAP_PVT_THREAD_RDWR_VALID );
+
        return(ldap_pvt_thread_rdwr_readers(rw) +
               ldap_pvt_thread_rdwr_writers(rw));
 }