X-Git-Url: https://git.sur5r.net/?a=blobdiff_plain;f=servers%2Fslapd%2Fback-ldbm%2Fdbcache.c;h=5589fc2153fc13d06e0cb6f2aaa20636aa664e2e;hb=ebc746bf35bff61e92869a63f8a21c6f6527bed5;hp=7254c6f4c0e7701364d395a2bbed67141014ce10;hpb=eb82000f3fb01baa7db2b1578e450dae23fcfec1;p=openldap

diff --git a/servers/slapd/back-ldbm/dbcache.c b/servers/slapd/back-ldbm/dbcache.c
index 7254c6f4c0..5589fc2153 100644
--- a/servers/slapd/back-ldbm/dbcache.c
+++ b/servers/slapd/back-ldbm/dbcache.c
@@ -40,12 +40,12 @@ ldbm_cache_open(
 	    flags, li->li_mode );
 
 	lru = 0;
-	pthread_mutex_lock( &currenttime_mutex );
+	ldap_pvt_thread_mutex_lock( &currenttime_mutex );
 	curtime = currenttime;
-	pthread_mutex_unlock( &currenttime_mutex );
+	ldap_pvt_thread_mutex_unlock( &currenttime_mutex );
 	oldtime = curtime;
 
-	pthread_mutex_lock( &li->li_dbcache_mutex );
+	ldap_pvt_thread_mutex_lock( &li->li_dbcache_mutex );
 	for ( i = 0; i < MAXDBCACHE && li->li_dbcache[i].dbc_name != NULL;
 	    i++ ) {
 		/* already open - return it */
@@ -53,7 +53,7 @@ ldbm_cache_open(
 			li->li_dbcache[i].dbc_refcnt++;
 			Debug( LDAP_DEBUG_TRACE,
 			    "<= ldbm_cache_open (cache %d)\n", i, 0, 0 );
-			pthread_mutex_unlock( &li->li_dbcache_mutex );
+			ldap_pvt_thread_mutex_unlock( &li->li_dbcache_mutex );
 			return( &li->li_dbcache[i] );
 		}
 
@@ -74,7 +74,7 @@ ldbm_cache_open(
 			    0, 0, 0 );
 			lru = -1;
 			while ( lru == -1 ) {
-				pthread_cond_wait( &li->li_dbcache_cv,
+				ldap_pvt_thread_cond_wait( &li->li_dbcache_cv,
 				    &li->li_dbcache_mutex );
 				for ( i = 0; i < MAXDBCACHE; i++ ) {
 					if ( li->li_dbcache[i].dbc_refcnt
@@ -93,11 +93,12 @@ ldbm_cache_open(
 
 	if ( (li->li_dbcache[i].dbc_db = ldbm_open( buf, flags, li->li_mode,
 	    li->li_dbcachesize )) == NULL ) {
+		int err = errno;
 		Debug( LDAP_DEBUG_TRACE,
 		    "<= ldbm_cache_open NULL \"%s\" errno %d reason \"%s\")\n",
-		    buf, errno, errno > -1 && errno < sys_nerr ?
-		    sys_errlist[errno] : "unknown" );
-		pthread_mutex_unlock( &li->li_dbcache_mutex );
+		    buf, err, err > -1 && err < sys_nerr ?
+		    sys_errlist[err] : "unknown" );
+		ldap_pvt_thread_mutex_unlock( &li->li_dbcache_mutex );
 		return( NULL );
 	}
 	li->li_dbcache[i].dbc_name = ch_strdup( buf );
@@ -109,7 +110,7 @@ ldbm_cache_open(
 		li->li_dbcache[i].dbc_blksize = DEFAULT_BLOCKSIZE;
 	}
 	li->li_dbcache[i].dbc_maxids = (li->li_dbcache[i].dbc_blksize /
-	    sizeof(ID)) - 2;
+	    sizeof(ID)) - ID_BLOCK_IDS_OFFSET;
 	li->li_dbcache[i].dbc_maxindirect = (SLAPD_LDBM_MIN_MAXIDS /
 	    li->li_dbcache[i].dbc_maxids) + 1;
 
@@ -118,7 +119,7 @@ ldbm_cache_open(
 	    li->li_dbcache[i].dbc_blksize, li->li_dbcache[i].dbc_maxids,
 	    li->li_dbcache[i].dbc_maxindirect );
 	Debug( LDAP_DEBUG_TRACE, "<= ldbm_cache_open (opened %d)\n", i, 0, 0 );
-	pthread_mutex_unlock( &li->li_dbcache_mutex );
+	ldap_pvt_thread_mutex_unlock( &li->li_dbcache_mutex );
 	return( &li->li_dbcache[i] );
 }
 
@@ -127,11 +128,11 @@ ldbm_cache_close( Backend *be, struct dbcache *db )
 {
 	struct ldbminfo	*li = (struct ldbminfo *) be->be_private;
 
-	pthread_mutex_lock( &li->li_dbcache_mutex );
+	ldap_pvt_thread_mutex_lock( &li->li_dbcache_mutex );
 	if ( --db->dbc_refcnt == 0 ) {
-		pthread_cond_signal( &li->li_dbcache_cv );
+		ldap_pvt_thread_cond_signal( &li->li_dbcache_cv );
 	}
-	pthread_mutex_unlock( &li->li_dbcache_mutex );
+	ldap_pvt_thread_mutex_unlock( &li->li_dbcache_mutex );
 }
 
 void
@@ -139,14 +140,14 @@ ldbm_cache_really_close( Backend *be, struct dbcache *db )
 {
 	struct ldbminfo	*li = (struct ldbminfo *) be->be_private;
 
-	pthread_mutex_lock( &li->li_dbcache_mutex );
+	ldap_pvt_thread_mutex_lock( &li->li_dbcache_mutex );
 	if ( --db->dbc_refcnt == 0 ) {
-		pthread_cond_signal( &li->li_dbcache_cv );
+		ldap_pvt_thread_cond_signal( &li->li_dbcache_cv );
 		ldbm_close( db->dbc_db );
 		free( db->dbc_name );
 		db->dbc_name = NULL;
 	}
-	pthread_mutex_unlock( &li->li_dbcache_mutex );
+	ldap_pvt_thread_mutex_unlock( &li->li_dbcache_mutex );
 }
 
 void
@@ -155,7 +156,7 @@ ldbm_cache_flush_all( Backend *be )
 	struct ldbminfo	*li = (struct ldbminfo *) be->be_private;
 	int		i;
 
-	pthread_mutex_lock( &li->li_dbcache_mutex );
+	ldap_pvt_thread_mutex_lock( &li->li_dbcache_mutex );
 	for ( i = 0; i < MAXDBCACHE; i++ ) {
 		if ( li->li_dbcache[i].dbc_name != NULL ) {
 			Debug( LDAP_DEBUG_TRACE, "ldbm flushing db (%s)\n",
@@ -163,7 +164,7 @@ ldbm_cache_flush_all( Backend *be )
 			ldbm_sync( li->li_dbcache[i].dbc_db );
 		}
 	}
-	pthread_mutex_unlock( &li->li_dbcache_mutex );
+	ldap_pvt_thread_mutex_unlock( &li->li_dbcache_mutex );
 }
 
 Datum