#include "slap.h"
#include "back-bdb2.h"
-static ID
-next_id_read( Backend *be )
-{
- 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;
- }
-
- 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;
- }
-
- id = atol( buf );
- fclose( fp );
+/* reading and writing NEXTID is handled in txn.c */
+#define next_id_read(be) bdb2i_get_nextid( (be) )
+#define next_id_write(be,id) bdb2i_put_nextid( (be), (id) )
- if(id < 1) {
- Debug( LDAP_DEBUG_ANY,
- "next_id_read %lu: atol(%s) return non-positive integer\n",
- id, buf, 0 );
- return NOID;
- }
-
- return id;
-}
-
-static int
-next_id_write( Backend *be, ID id )
-{
- struct ldbminfo *li = (struct ldbminfo *) be->be_private;
- char buf[20];
- char* file = li->li_nextid_file;
- FILE* fp;
- int rc;
-
- if ( (fp = fopen( file, "w" )) == NULL ) {
- Debug( LDAP_DEBUG_ANY, "next_id_write(%lu): could not open \"%s\"\n",
- id, file, 0 );
- return -1;
- }
-
- rc = 0;
-
- if ( fprintf( fp, "%ld\n", id ) == EOF ) {
- Debug( LDAP_DEBUG_ANY, "next_id_write(%lu): cannot fprintf\n",
- id, 0, 0 );
- rc = -1;
- }
-
- if( fclose( fp ) != 0 ) {
- Debug( LDAP_DEBUG_ANY, "next_id_write %lu: cannot fclose\n",
- id, 0, 0 );
- rc = -1;
- }
-
- return rc;
-}
int
-bdb2i_next_id_save( Backend *be )
+bdb2i_next_id_save( BackendDB *be )
{
struct ldbminfo *li = (struct ldbminfo *) be->be_private;
- ID id = next_id_get( be );
- int rc = next_id_write( be, id );
+ ID id = bdb2i_next_id_get( be );
+ int rc;
+ rc = next_id_write( be, id );
if (rc == 0) {
li->li_nextid_wrote = id;
}
}
ID
-bdb2i_next_id( Backend *be )
+bdb2i_next_id( BackendDB *be )
{
struct ldbminfo *li = (struct ldbminfo *) be->be_private;
ID id;
- ldap_pvt_thread_mutex_lock( &li->li_nextid_mutex );
-
/* first time in here since startup - try to read the nexid */
if ( li->li_nextid == NOID ) {
li->li_nextid = next_id_read( be );
(void) next_id_write( be, li->li_nextid );
#endif
- ldap_pvt_thread_mutex_unlock( &li->li_nextid_mutex );
return( id );
}
void
-bdb2i_next_id_return( Backend *be, ID id )
+bdb2i_next_id_return( BackendDB *be, ID id )
{
#ifdef SLAPD_NEXTID_RETURN
struct ldbminfo *li = (struct ldbminfo *) be->be_private;
- ldap_pvt_thread_mutex_lock( &li->li_nextid_mutex );
-
if ( id != li->li_nextid - 1 ) {
- ldap_pvt_thread_mutex_unlock( &li->li_nextid_mutex );
return;
}
li->li_nextid--;
-#if !( SLAPD_NEXTID_CHUCK > 1 )
+#if !( SLAPD_NEXTID_CHUNK > 1 )
(void) next_id_write( be, li->li_nextid );
#endif
-
- ldap_pvt_thread_mutex_unlock( &li->li_nextid_mutex );
#endif
}
ID
-bdb2i_next_id_get( Backend *be )
+bdb2i_next_id_get( BackendDB *be )
{
struct ldbminfo *li = (struct ldbminfo *) be->be_private;
ID id;
- ldap_pvt_thread_mutex_lock( &li->li_nextid_mutex );
-
/* first time in here since startup - try to read the nexid */
if ( li->li_nextid == NOID ) {
li->li_nextid = next_id_read( be );
id = li->li_nextid;
- ldap_pvt_thread_mutex_unlock( &li->li_nextid_mutex );
-
return( id );
}