/* $OpenLDAP$ */
/* This work is part of OpenLDAP Software <http://www.openldap.org/>.
*
- * Copyright 1998-2004 The OpenLDAP Foundation.
+ * Copyright 1998-2005 The OpenLDAP Foundation.
* All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
#include "slap.h"
#include "back-ldbm.h"
+#include <ldap_rq.h>
int
ldbm_back_initialize(
{
static char *controls[] = {
LDAP_CONTROL_MANAGEDSAIT,
- LDAP_CONTROL_VALUESRETURNFILTER,
+#ifdef LDAP_CONTROL_X_PERMISSIVE_MODIFY
+ LDAP_CONTROL_X_PERMISSIVE_MODIFY,
+#endif
NULL
};
/* delay interval */
li->li_dbsyncwaitinterval = 5;
- /* flag to notify ldbm_cache_sync_daemon to shut down */
- li->li_dbshutdown = 0;
+ /* current wait counter */
+ li->li_dbsyncwaitcount = 0;
/* initialize various mutex locks & condition variables */
ldap_pvt_thread_rdwr_init( &li->li_giant_rwlock );
li->li_dbenv = ldbm_initialize_env( li->li_directory,
li->li_dbcachesize, &li->li_envdirok );
- /* sync thread */
- if ( li->li_dbsyncfreq > 0 )
+ /* If we're in server mode and a sync frequency was set,
+ * submit a task to perform periodic db syncs.
+ */
+ if (( slapMode & SLAP_SERVER_MODE ) && li->li_dbsyncfreq > 0 )
{
- int rc;
- rc = ldap_pvt_thread_create( &li->li_dbsynctid,
- 0, ldbm_cache_sync_daemon, (void*)be );
-
- if ( rc != 0 )
- {
- Debug( LDAP_DEBUG_ANY,
- "sync ldap_pvt_thread_create failed (%d)\n", rc, 0, 0 );
- return 1;
- }
+ ldap_pvt_thread_mutex_lock( &slapd_rq.rq_mutex );
+ ldap_pvt_runqueue_insert( &slapd_rq, li->li_dbsyncfreq,
+ ldbm_cache_sync_daemon, be,
+ "ldbm_cache_sync", be->be_suffix[0].bv_val );
+ ldap_pvt_thread_mutex_unlock( &slapd_rq.rq_mutex );
}
return 0;