From ae5affcdd8875dad34fb4404035497fc167bf7f1 Mon Sep 17 00:00:00 2001 From: Adam Tkac Date: Mon, 10 Apr 2017 11:02:41 +0200 Subject: [PATCH] Remove useless DB_CHECKPOINT_{UN,}LOCK use_lock param it was always PR_TRUE... --- ldap/servers/slapd/back-ldbm/dblayer.c | 28 +++++++++++++--------------- 1 file changed, 13 insertions(+), 15 deletions(-) diff --git a/ldap/servers/slapd/back-ldbm/dblayer.c b/ldap/servers/slapd/back-ldbm/dblayer.c index ff97aa4..2cb563f 100644 --- a/ldap/servers/slapd/back-ldbm/dblayer.c +++ b/ldap/servers/slapd/back-ldbm/dblayer.c @@ -83,13 +83,13 @@ } /* 608145: db4.1 and newer does not require exclusive lock for checkpointing * and transactions */ -#define DB_CHECKPOINT_LOCK(use_lock, lock) ; -#define DB_CHECKPOINT_UNLOCK(use_lock, lock) ; +#define DB_CHECKPOINT_LOCK(lock) ; +#define DB_CHECKPOINT_UNLOCK(lock) ; #else /* older then db 41 */ #define DB_OPEN(oflags, db, txnid, file, database, type, flags, mode, rval) \ (rval) = (db)->open((db), (file), (database), (type), (flags), (mode)) -#define DB_CHECKPOINT_LOCK(use_lock, lock) if(use_lock) slapi_rwlock_wrlock(lock); -#define DB_CHECKPOINT_UNLOCK(use_lock, lock) if(use_lock) slapi_rwlock_unlock(lock); +#define DB_CHECKPOINT_LOCK(lock) slapi_rwlock_wrlock(lock); +#define DB_CHECKPOINT_UNLOCK(lock) slapi_rwlock_unlock(lock); #endif #if 1000*DB_VERSION_MAJOR + 100*DB_VERSION_MINOR >= 4000 @@ -424,16 +424,16 @@ dblayer_get_batch_txn_max_sleep(void *arg __attribute__((unused))) { static int dblayer_txn_checkpoint(struct ldbminfo *li, struct dblayer_private_env *env, - PRBool use_lock __attribute__((unused)), PRBool busy_skip, PRBool db_force) + PRBool busy_skip, PRBool db_force) { int ret = 0; if (busy_skip && is_anyinstance_busy(li)) { return ret; } - DB_CHECKPOINT_LOCK(use_lock, env->dblayer_env_lock); + DB_CHECKPOINT_LOCK(env->dblayer_env_lock); ret = TXN_CHECKPOINT(env->dblayer_DB_ENV, db_force?DB_FORCE:0,0,0); - DB_CHECKPOINT_UNLOCK(use_lock, env->dblayer_env_lock); + DB_CHECKPOINT_UNLOCK(env->dblayer_env_lock); return ret; } @@ -4500,8 +4500,7 @@ static int checkpoint_threadmain(void *param) /* now checkpoint */ checkpoint_debug_message(debug_checkpointing, "checkpoint_threadmain - Starting checkpoint\n"); - rval = dblayer_txn_checkpoint(li, priv->dblayer_env, - PR_TRUE, PR_TRUE, PR_FALSE); + rval = dblayer_txn_checkpoint(li, priv->dblayer_env, PR_TRUE, PR_FALSE); #if 1000*DB_VERSION_MAJOR + 100*DB_VERSION_MINOR < 4100 if (DB_INCOMPLETE == rval) { @@ -4528,8 +4527,7 @@ static int checkpoint_threadmain(void *param) checkpoint_debug_message(debug_checkpointing, "checkpoint_threadmain - Starting checkpoint\n"); - rval = dblayer_txn_checkpoint(li, priv->dblayer_env, - PR_TRUE, PR_TRUE, PR_FALSE); + rval = dblayer_txn_checkpoint(li, priv->dblayer_env, PR_TRUE, PR_FALSE); #if 1000*DB_VERSION_MAJOR + 100*DB_VERSION_MINOR < 4100 if (DB_INCOMPLETE == rval) { @@ -4554,7 +4552,7 @@ static int checkpoint_threadmain(void *param) } } /* find out which log files don't contain active txns */ - DB_CHECKPOINT_LOCK(PR_TRUE, penv->dblayer_env_lock); + DB_CHECKPOINT_LOCK(penv->dblayer_env_lock); #if 1000*DB_VERSION_MAJOR + 100*DB_VERSION_MINOR >= 4400 /* Compacting DB borrowing the timing of the log flush */ @@ -4611,7 +4609,7 @@ static int checkpoint_threadmain(void *param) rval = LOG_ARCHIVE(penv->dblayer_DB_ENV, &list, DB_ARCH_ABS, (void *)slapi_ch_malloc); - DB_CHECKPOINT_UNLOCK(PR_TRUE, penv->dblayer_env_lock); + DB_CHECKPOINT_UNLOCK(penv->dblayer_env_lock); if (rval) { slapi_log_err(SLAPI_LOG_ERR, "checkpoint_threadmain", "log archive failed - %s (%d)\n", @@ -5134,7 +5132,7 @@ static int dblayer_force_checkpoint(struct ldbminfo *li) */ for (i = 0; i < 2; i++) { - ret = dblayer_txn_checkpoint(li, pEnv, PR_TRUE, PR_FALSE, PR_TRUE); + ret = dblayer_txn_checkpoint(li, pEnv, PR_FALSE, PR_TRUE); if (ret == 0) continue; #if 1000*DB_VERSION_MAJOR + 100*DB_VERSION_MINOR < 4100 if (ret != DB_INCOMPLETE) @@ -5149,7 +5147,7 @@ static int dblayer_force_checkpoint(struct ldbminfo *li) slapi_log_err(SLAPI_LOG_NOTICE, "dblayer_force_checkpoint", "Busy: retrying checkpoint\n"); /* teletubbies: "again! again!" */ - ret = dblayer_txn_checkpoint(li, pEnv, PR_TRUE, PR_FALSE, PR_TRUE); + ret = dblayer_txn_checkpoint(li, pEnv, PR_FALSE, PR_TRUE); if (ret == DB_INCOMPLETE) { slapi_log_err(SLAPI_LOG_NOTICE, "dblayer_force_checkpoint", "Busy: giving up on checkpoint\n"); break; -- 2.9.3