summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDavid Hows <howsdav@gmail.com>2015-11-30 17:47:35 +1100
committerDavid Hows <howsdav@gmail.com>2015-11-30 17:47:35 +1100
commitf2fa6b9283169ac2b2737de6d929fa6dac544d8b (patch)
treefd1a50b762a980e3cd86586479621b36c8b391d5
parent4d7c9cef6914de4c6baf5cbf711cd5d6a9507432 (diff)
downloadmongo-f2fa6b9283169ac2b2737de6d929fa6dac544d8b.tar.gz
WT-2245 - Use WT_MIN and WT_MAX for increments
-rw-r--r--bench/wtperf/wtperf_truncate.c9
1 files changed, 5 insertions, 4 deletions
diff --git a/bench/wtperf/wtperf_truncate.c b/bench/wtperf/wtperf_truncate.c
index 0ed3861385f..d6e081ba2a9 100644
--- a/bench/wtperf/wtperf_truncate.c
+++ b/bench/wtperf/wtperf_truncate.c
@@ -161,12 +161,13 @@ run_truncate(CONFIG *cfg, CONFIG_THREAD *thread,
*/
if (trunc_cfg->expected_total >
thread->workload->truncate_count + trunc_cfg->stone_gap) {
- if (trunc_cfg->catchup_multiplier < trunc_cfg->needed_stones-1)
- trunc_cfg->catchup_multiplier++;
+ trunc_cfg->catchup_multiplier =
+ WT_MIN(trunc_cfg->catchup_multiplier + 1,
+ trunc_cfg->needed_stones - 1);
} else {
/* Back off if we start seeing an improvement */
- if (trunc_cfg->catchup_multiplier > 1)
- trunc_cfg->catchup_multiplier--;
+ trunc_cfg->catchup_multiplier =
+ WT_MAX(trunc_cfg->catchup_multiplier - 1, 1);
}
used_stone_gap = trunc_cfg->stone_gap * trunc_cfg->catchup_multiplier;