diff options
| author | Alex Gorrod <alexg@wiredtiger.com> | 2015-07-27 14:52:50 +1000 |
|---|---|---|
| committer | Alex Gorrod <alexg@wiredtiger.com> | 2015-07-27 14:52:50 +1000 |
| commit | d3eb281ef903f55bf583d14abbe5aebc402392cb (patch) | |
| tree | 88aab37bb0454e380d25a6eb1914d4954d09ab0f /bench/wtperf/wtperf_truncate.c | |
| parent | 1bdac5405a9a2f254766d655c09b08f489fcd1a5 (diff) | |
| download | mongo-d3eb281ef903f55bf583d14abbe5aebc402392cb.tar.gz | |
Don't pass a track variable through to truncate code in wtperf.
It keeps the layering nicer.
Diffstat (limited to 'bench/wtperf/wtperf_truncate.c')
| -rw-r--r-- | bench/wtperf/wtperf_truncate.c | 14 |
1 files changed, 5 insertions, 9 deletions
diff --git a/bench/wtperf/wtperf_truncate.c b/bench/wtperf/wtperf_truncate.c index 7727e1cab2d..f47910d6d14 100644 --- a/bench/wtperf/wtperf_truncate.c +++ b/bench/wtperf/wtperf_truncate.c @@ -117,7 +117,7 @@ err: cursor->close(cursor); int run_truncate(CONFIG *cfg, CONFIG_THREAD *thread, - TRACK **trk, WT_CURSOR *cursor, WT_SESSION *session) { + WT_CURSOR *cursor, WT_SESSION *session, int *truncatedp) { TRUNCATE_CONFIG *trunc_cfg; TRUNCATE_QUEUE_ENTRY *truncate_item; @@ -127,6 +127,7 @@ run_truncate(CONFIG *cfg, CONFIG_THREAD *thread, ret = 0; trunc_cfg = &thread->trunc_cfg; + *truncatedp = 0; /* Update the total inserts */ trunc_cfg->total_inserts = sum_insert_ops(cfg); trunc_cfg->expected_total += @@ -134,11 +135,8 @@ run_truncate(CONFIG *cfg, CONFIG_THREAD *thread, trunc_cfg->last_total_inserts = trunc_cfg->total_inserts; /* We are done if there isn't enough data to trigger a new milestone. */ - if (trunc_cfg->expected_total <= trunc_cfg->needed_stones) { - (void)usleep(1000); - *trk = &thread->truncate_sleep; + if (trunc_cfg->expected_total <= trunc_cfg->needed_stones) return (0); - } while (trunc_cfg->num_stones < trunc_cfg->needed_stones) { trunc_cfg->last_key += trunc_cfg->stone_gap; @@ -158,11 +156,8 @@ run_truncate(CONFIG *cfg, CONFIG_THREAD *thread, /* We are done if there isn't enough data to trigger a truncate. */ if (trunc_cfg->num_stones == 0 || - trunc_cfg->expected_total <= thread->workload->truncate_count) { - (void)usleep(1000); - *trk = &thread->truncate_sleep; + trunc_cfg->expected_total <= thread->workload->truncate_count) return (0); - } truncate_item = STAILQ_FIRST(&cfg->stone_head); trunc_cfg->num_stones--; @@ -177,6 +172,7 @@ run_truncate(CONFIG *cfg, CONFIG_THREAD *thread, lprintf(cfg, ret, 0, "Truncate: failed"); return (ret); } + *truncatedp = 1; trunc_cfg->expected_total -= truncate_item->diff; free(truncate_item->key); free(truncate_item); |