upstream/openldap
1
0
Fork 0
mirror of https://git.openldap.org/openldap/openldap.git synced 2026-02-20 00:10:59 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

Import slapd nextid chunking from -devel.

Browse source
This commit is contained in:
Kurt Zeilenga 1999-01-23 22:33:52 +00:00
parent f9e3e170e1
commit d9cebead9f
6 changed files with 54 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
CHANGES
View file

@ -5,8 +5,9 @@ Changes included in OpenLDAP 1.2
Add ldappasswd() tool
Add salted MD5/SHA1 password support
Add client/tools password prompting (-W)
Add slapd logging option
Add slapd alternative args/pid file locations
Add slapd logging option
Add slapd nextid chunking
Fixed client SIGPIPE handling
Fixed configure wait3 handling
Fixed lber leaking ber_scanf
@ -15,7 +16,6 @@ Changes included in OpenLDAP 1.2
Updated client -d(ebug) handling
Updated slapd alias deref functionality to be optional
Updated slapd DN handling
Updated slapd .args/.pid file handling
Updated client/tools Kerberos option handling
Changes included in OpenLDAP 1.1.3

8
servers/slapd/back-ldbm/back-ldbm.h
View file

@ -104,8 +104,16 @@ struct attrinfo {
#define MAXDBCACHE 10
/* this could be made an option */
#ifndef SLAPD_NEXTID_CHUNK
#define SLAPD_NEXTID_CHUNK 32
#endif
struct ldbminfo {
ID li_nextid;
#if SLAPD_NEXTID_CHUNK > 1
ID li_nextid_wrote;
#endif
char *li_nextid_file;
pthread_mutex_t li_root_mutex;
pthread_mutex_t li_add_mutex;

5
servers/slapd/back-ldbm/close.c
View file

@ -12,6 +12,11 @@
void
ldbm_back_close( Backend *be )
{
Debug( LDAP_DEBUG_TRACE, "ldbm backend saving nextid\n", 0, 0, 0 );
if ( next_id_save( be ) < 0 ) {
Debug( LDAP_DEBUG_ANY, "ldbm backend nextid save failed!\n", 0, 0, 0 );
}
Debug( LDAP_DEBUG_TRACE, "ldbm backend syncing\n", 0, 0, 0 );
ldbm_cache_flush_all( be );
Debug( LDAP_DEBUG_TRACE, "ldbm backend done syncing\n", 0, 0, 0 );

4
servers/slapd/back-ldbm/init.c
View file

@ -25,6 +25,10 @@ ldbm_back_init(
/* arrange to read nextid later (on first request for it) */
li->li_nextid = NOID;
#if SLAPD_NEXTID_CHUNK > 1
li->li_nextid_wrote = NOID;
#endif
/* default cache size */
li->li_cache.c_maxsize = DEFAULT_CACHE_SIZE;

35
servers/slapd/back-ldbm/nextid.c
View file

@ -82,6 +82,20 @@ next_id_write( Backend *be, ID id )
return rc;
}
int
next_id_save( Backend *be )
{
struct ldbminfo *li = (struct ldbminfo *) be->be_private;
ID id = next_id_get( be );
int rc = next_id_write( be, id );
if (rc == 0) {
li->li_nextid_wrote = id;
}
return rc;
}
ID
next_id( Backend *be )
{
@ -97,10 +111,22 @@ next_id( Backend *be )
if ( li->li_nextid == NOID ) {
li->li_nextid = 1;
}
#if SLAPD_NEXTID_CHUNK > 1
li->li_nextid_wrote = li->li_nextid;
#endif
}
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 );
}
#else
(void) next_id_write( be, li->li_nextid );
#endif
pthread_mutex_unlock( &li->li_nextid_mutex );
return( id );
@ -109,7 +135,7 @@ next_id( Backend *be )
void
next_id_return( Backend *be, ID id )
{
#ifdef NEXT_ID_RETURN
#ifdef SLAPD_NEXTID_RETURN
struct ldbminfo *li = (struct ldbminfo *) be->be_private;
pthread_mutex_lock( &li->li_nextid_mutex );
@ -120,7 +146,10 @@ next_id_return( Backend *be, ID id )
}
li->li_nextid--;
#if !( SLAPD_NEXTID_CHUCK > 1 )
(void) next_id_write( be, li->li_nextid );
#endif
pthread_mutex_unlock( &li->li_nextid_mutex );
#endif
@ -141,6 +170,10 @@ next_id_get( Backend *be )
if ( li->li_nextid == NOID ) {
li->li_nextid = 1;
}
#if SLAPD_NEXTID_CHUNK > 1
li->li_nextid_wrote = li->li_nextid;
#endif
}
id = li->li_nextid;

1
servers/slapd/back-ldbm/proto-back-ldbm.h
View file

@ -130,6 +130,7 @@ int index_add_values LDAP_P(( Backend *be, char *type, struct berval **vals, ID
ID next_id LDAP_P(( Backend *be ));
void next_id_return LDAP_P(( Backend *be, ID id ));
ID next_id_get LDAP_P(( Backend *be ));
int next_id_save LDAP_P(( Backend *be ));
LDAP_END_DECL
#endif