[389-commits] ldap/servers

ldap/servers/slapd/connection.c | 16 ++++++++++------
ldap/servers/slapd/libglobs.c | 34 +++++++++++++++++++++++++++++++++-
ldap/servers/slapd/proto-slap.h | 2 ++
ldap/servers/slapd/slap.h | 2 ++
4 files changed, 47 insertions(+), 7 deletions(-)

New commits:
commit 1c0c6b135ae8a54ef6d0ccff0eb797b9b32a66fa
Author: Rich Megginson <rmeggins@redhat.com>
Date: Wed Feb 13 07:18:27 2013 -0700

Ticket #565 - turbo mode and replication - allow disable of turbo mode

https://fedorahosted.org/389/ticket/565
Reviewed by: mreynolds (Thanks!)
Branch: master
Fix Description: Add nsslapd-enable-turbo-mode configuration attribute.
This allows the user to disable turbo mode. The default for this setting
is on.
Platforms tested: RHEL6 x86_64
Flag Day: no
Doc impact: yes - document new config parameter

diff --git a/ldap/servers/slapd/connection.c b/ldap/servers/slapd/connection.c
index 7750bfe..26ac20b 100644
--- a/ldap/servers/slapd/connection.c
+++ b/ldap/servers/slapd/connection.c
@@ -2253,12 +2253,16 @@ connection_threadmain()
#if defined(DB_PERF_TURBO)
/* If it's been a while since we last did it ... */
if (curtime - conn->c_private->previous_count_check_time > CONN_TURBO_CHECK_INTERVAL) {
- int new_turbo_flag = 0;
- /* Check the connection's activity level */
- connection_check_activity_level(conn);
- /* And if appropriate, change into or out of turbo mode */
- connection_enter_leave_turbo(conn,thread_turbo_flag,&new_turbo_flag);
- thread_turbo_flag = new_turbo_flag;
+ if (config_get_enable_turbo_mode()) {
+ int new_turbo_flag = 0;
+ /* Check the connection's activity level */
+ connection_check_activity_level(conn);
+ /* And if appropriate, change into or out of turbo mode */
+ connection_enter_leave_turbo(conn,thread_turbo_flag,&new_turbo_flag);
+ thread_turbo_flag = new_turbo_flag;
+ } else {
+ thread_turbo_flag = 0;
+ }
}

/* turn off turbo mode immediately if any pb waiting in global queue */
diff --git a/ldap/servers/slapd/libglobs.c b/ldap/servers/slapd/libglobs.c
index b7bc999..fbbb4f9 100644
--- a/ldap/servers/slapd/libglobs.c
+++ b/ldap/servers/slapd/libglobs.c
@@ -256,6 +256,7 @@ slapi_onoff_t init_disk_preserve_logging;
slapi_onoff_t init_ndn_cache_enabled;
slapi_onoff_t init_sasl_mapping_fallback;
slapi_onoff_t init_return_orig_type;
+slapi_onoff_t init_enable_turbo_mode;
#ifdef MEMPOOL_EXPERIMENTAL
slapi_onoff_t init_mempool_switch;