diff options
author | Tor Egge <Tor.Egge@broadpark.no> | 2019-08-27 11:42:57 +0200 |
---|---|---|
committer | Tor Egge <Tor.Egge@broadpark.no> | 2019-08-27 11:44:11 +0200 |
commit | bfda7c6337fdee7843a7004fbecceb8694d153d7 (patch) | |
tree | fbcef2cc977a5d9756daa7c10965fd69c6c4fd7c /vespalib | |
parent | 6130643ad1dd31064b47fcac4d07a3a590cbdf29 (diff) |
Also update compaction count for old style compaction.
Test that compaction count is updated when compacting enum store.
Style fixes.
Diffstat (limited to 'vespalib')
-rw-r--r-- | vespalib/src/vespa/vespalib/datastore/datastorebase.cpp | 3 | ||||
-rw-r--r-- | vespalib/src/vespa/vespalib/datastore/datastorebase.h | 2 |
2 files changed, 3 insertions, 2 deletions
diff --git a/vespalib/src/vespa/vespalib/datastore/datastorebase.cpp b/vespalib/src/vespa/vespalib/datastore/datastorebase.cpp index 39c93dd98fe..2f9dc1dc84a 100644 --- a/vespalib/src/vespa/vespalib/datastore/datastorebase.cpp +++ b/vespalib/src/vespa/vespalib/datastore/datastorebase.cpp @@ -370,6 +370,7 @@ DataStoreBase::startCompact(uint32_t typeId) } } switchActiveBuffer(typeId, 0u); + inc_compaction_count(); return toHold; } @@ -454,7 +455,7 @@ DataStoreBase::markCompacting(uint32_t bufferId) state.setCompacting(); state.disableElemHoldList(); state.setFreeListList(nullptr); - ++_compaction_count; + inc_compaction_count(); } std::vector<uint32_t> diff --git a/vespalib/src/vespa/vespalib/datastore/datastorebase.h b/vespalib/src/vespa/vespalib/datastore/datastorebase.h index 2c7f3eae920..59e0d76b638 100644 --- a/vespalib/src/vespa/vespalib/datastore/datastorebase.h +++ b/vespalib/src/vespa/vespalib/datastore/datastorebase.h @@ -358,7 +358,7 @@ public: uint32_t startCompactWorstBuffer(uint32_t typeId); std::vector<uint32_t> startCompactWorstBuffers(bool compactMemory, bool compactAddressSpace); uint64_t get_compaction_count() const { return _compaction_count.load(std::memory_order_relaxed); } - void bump_compaction_count() const { ++_compaction_count; } + void inc_compaction_count() const { ++_compaction_count; } }; } |