X-Git-Url: https://git.sur5r.net/?a=blobdiff_plain;ds=sidebyside;f=servers%2Fslapd%2Fback-ldbm%2Fnextid.c;h=d14c4c6688353ae062397a2b362a3a0e1fdb1ecc;hb=21a95f4309ffaa7a13d5f096be80433f1eb91791;hp=7c6f2264135a21400d9a07a3fb73c8d9ec3a91a0;hpb=e4c84b9d36efb1b02d819acc42e07d63afd3249e;p=openldap diff --git a/servers/slapd/back-ldbm/nextid.c b/servers/slapd/back-ldbm/nextid.c index 7c6f226413..d14c4c6688 100644 --- a/servers/slapd/back-ldbm/nextid.c +++ b/servers/slapd/back-ldbm/nextid.c @@ -1,183 +1,136 @@ -/* id.c - keep track of the next id to be given out */ +/* nextid.c - keep track of the next id to be given out */ +/* $OpenLDAP$ */ +/* + * Copyright 1998-2003 The OpenLDAP Foundation, All Rights Reserved. + * COPYING RESTRICTIONS APPLY, see COPYRIGHT file + */ #include "portable.h" #include +#include #include - -#ifdef HAVE_SYS_PARAM_H -#include -#endif +#include #include "slap.h" #include "back-ldbm.h" -static ID -next_id_read( Backend *be ) +static int +next_id_read( Backend *be, ID *idp ) { - struct ldbminfo *li = (struct ldbminfo *) be->be_private; - ID id; - char buf[20]; - char* file = li->li_nextid_file; - FILE* fp; - - if ( (fp = fopen( file, "r" )) == NULL ) { - Debug( LDAP_DEBUG_ANY, - "next_id_read: could not open \"%s\"\n", - file, 0, 0 ); - return NOID; - } + Datum key, data; + DBCache *db; - if ( fgets( buf, sizeof(buf), fp ) == NULL ) { - Debug( LDAP_DEBUG_ANY, - "next_id_read: could not fgets nextid from \"%s\"\n", - file, 0, 0 ); - fclose( fp ); - return NOID; - } + *idp = NOID; - id = atol( buf ); - fclose( fp ); + if ( (db = ldbm_cache_open( be, "nextid", LDBM_SUFFIX, LDBM_WRCREAT )) + == NULL ) { +#ifdef NEW_LOGGING + LDAP_LOG( BACK_LDBM, CRIT, + "next_id_read: could not open/create nextid%s\n", LDBM_SUFFIX, 0, 0 ); +#else + Debug( LDAP_DEBUG_ANY, "Could not open/create nextid" LDBM_SUFFIX "\n", + 0, 0, 0 ); +#endif - if(id < 1) { - Debug( LDAP_DEBUG_ANY, - "next_id_read %ld: atol(%s) return non-positive integer\n", - id, buf, 0 ); - return NOID; + return( -1 ); } - return id; -} + ldbm_datum_init( key ); + key.dptr = (char *) idp; + key.dsize = sizeof(ID); -static int -next_id_write( Backend *be, ID id ) -{ - struct ldbminfo *li = (struct ldbminfo *) be->be_private; - char* file = li->li_nextid_file; - FILE* fp; - int rc; + data = ldbm_cache_fetch( db, key ); - if ( (fp = fopen( file, "w" )) == NULL ) { - Debug( LDAP_DEBUG_ANY, "next_id_write(%ld): could not open \"%s\"\n", - id, file, 0 ); - return -1; - } + if( data.dptr != NULL ) { + AC_MEMCPY( idp, data.dptr, sizeof( ID ) ); + ldbm_datum_free( db->dbc_db, data ); - rc = 0; - - if ( fprintf( fp, "%ld\n", id ) == EOF ) { - Debug( LDAP_DEBUG_ANY, "next_id_write(%ld): cannot fprintf\n", - id, 0, 0 ); - rc = -1; - } - - if( fclose( fp ) != 0 ) { - Debug( LDAP_DEBUG_ANY, "next_id_write %ld: cannot fclose\n", - id, 0, 0 ); - rc = -1; + } else { + *idp = 1; } - return rc; + ldbm_cache_close( be, db ); + return( 0 ); } int -next_id_save( Backend *be ) +next_id_write( Backend *be, ID id ) { - struct ldbminfo *li = (struct ldbminfo *) be->be_private; - ID id = next_id_get( be ); - int rc = next_id_write( be, id ); + Datum key, data; + DBCache *db; + ID noid = NOID; + int flags, rc = 0; + + if ( (db = ldbm_cache_open( be, "nextid", LDBM_SUFFIX, LDBM_WRCREAT )) + == NULL ) { +#ifdef NEW_LOGGING + LDAP_LOG( BACK_LDBM, CRIT, + "next_id_write: Could not open/create nextid%s\n", LDBM_SUFFIX, 0, 0 ); +#else + Debug( LDAP_DEBUG_ANY, "Could not open/create nextid" LDBM_SUFFIX "\n", + 0, 0, 0 ); +#endif - if (rc == 0) { - li->li_nextid_wrote = id; + return( -1 ); } - return rc; -} - -ID -next_id( Backend *be ) -{ - struct ldbminfo *li = (struct ldbminfo *) be->be_private; - ID id; - - ldap_pvt_thread_mutex_lock( &li->li_nextid_mutex ); + ldbm_datum_init( key ); + ldbm_datum_init( data ); - /* first time in here since startup - try to read the nexid */ - if ( li->li_nextid == NOID ) { - li->li_nextid = next_id_read( be ); + key.dptr = (char *) &noid; + key.dsize = sizeof(ID); - if ( li->li_nextid == NOID ) { - li->li_nextid = 1; - } - -#if SLAPD_NEXTID_CHUNK > 1 - li->li_nextid_wrote = li->li_nextid; -#endif - } + data.dptr = (char *) &id; + data.dsize = sizeof(ID); - id = li->li_nextid++; - -#if SLAPD_NEXTID_CHUNK > 1 - if ( li->li_nextid > li->li_nextid_wrote ) { - li->li_nextid_wrote += SLAPD_NEXTID_CHUNK; - (void) next_id_write( be, li->li_nextid_wrote ); + flags = LDBM_REPLACE; + if ( ldbm_cache_store( db, key, data, flags ) != 0 ) { + rc = -1; } -#else - (void) next_id_write( be, li->li_nextid ); -#endif - ldap_pvt_thread_mutex_unlock( &li->li_nextid_mutex ); - return( id ); + ldbm_cache_close( be, db ); + return( rc ); } -void -next_id_return( Backend *be, ID id ) +int +next_id_get( Backend *be, ID *idp ) { -#ifdef SLAPD_NEXTID_RETURN struct ldbminfo *li = (struct ldbminfo *) be->be_private; + int rc = 0; - ldap_pvt_thread_mutex_lock( &li->li_nextid_mutex ); + *idp = NOID; - if ( id != li->li_nextid - 1 ) { - ldap_pvt_thread_mutex_unlock( &li->li_nextid_mutex ); - return; + if ( li->li_nextid == NOID ) { + if ( ( rc = next_id_read( be, idp ) ) ) { + return( rc ); + } + li->li_nextid = *idp; } - li->li_nextid--; - -#if !( SLAPD_NEXTID_CHUNK > 1 ) - (void) next_id_write( be, li->li_nextid ); -#endif + *idp = li->li_nextid; - ldap_pvt_thread_mutex_unlock( &li->li_nextid_mutex ); -#endif + return( rc ); } -ID -next_id_get( Backend *be ) +int +next_id( Backend *be, ID *idp ) { struct ldbminfo *li = (struct ldbminfo *) be->be_private; - ID id; - - ldap_pvt_thread_mutex_lock( &li->li_nextid_mutex ); + int rc = 0; - /* first time in here since startup - try to read the nexid */ if ( li->li_nextid == NOID ) { - li->li_nextid = next_id_read( be ); - - if ( li->li_nextid == NOID ) { - li->li_nextid = 1; + if ( ( rc = next_id_read( be, idp ) ) ) { + return( rc ); } - -#if SLAPD_NEXTID_CHUNK > 1 - li->li_nextid_wrote = li->li_nextid; -#endif + li->li_nextid = *idp; } - id = li->li_nextid; - - ldap_pvt_thread_mutex_unlock( &li->li_nextid_mutex ); + *idp = li->li_nextid++; + if ( next_id_write( be, li->li_nextid ) ) { + rc = -1; + } - return( id ); + return( rc ); }