diff options
author | Marc Mutz <marc.mutz@kdab.com> | 2021-07-12 08:14:16 +0200 |
---|---|---|
committer | Marc Mutz <marc.mutz@kdab.com> | 2021-07-13 11:55:57 +0000 |
commit | 3c88e12beb22d8ea11b8a7006a71ba9773c6d183 (patch) | |
tree | 84975defd68192ccb4ea344998ca6aa6f9e240ec /src/corelib/tools/qduplicatetracker_p.h | |
parent | ae6590e360fbb04d93940b2651f70df44a28943e (diff) |
QDuplicateTracker: fix the static buffer size calculation
Instead of just sizeof(T), we, of course, also need to take the
support structure into account, to wit: the bucket list and, in the
node, the next pointer and the stored hash value.
Pick-to: 6.2 6.1 5.15
Change-Id: I8227a95c49e316aacf3d4efd8f6170ea3bea1cf0
Reviewed-by: Andrei Golubev <andrei.golubev@qt.io>
Reviewed-by: MÃ¥rten Nordheim <marten.nordheim@qt.io>
Diffstat (limited to 'src/corelib/tools/qduplicatetracker_p.h')
-rw-r--r-- | src/corelib/tools/qduplicatetracker_p.h | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/src/corelib/tools/qduplicatetracker_p.h b/src/corelib/tools/qduplicatetracker_p.h index 914ca35815..47c97100f9 100644 --- a/src/corelib/tools/qduplicatetracker_p.h +++ b/src/corelib/tools/qduplicatetracker_p.h @@ -73,7 +73,13 @@ class QDuplicateTracker { } }; - char buffer[Prealloc * sizeof(T)]; + struct node_guesstimate { void *next; size_t hash; T value; }; + static constexpr size_t bufferSize(size_t N) { + return N * sizeof(void*) // bucket list + + N * sizeof(node_guesstimate); // nodes + } + + char buffer[bufferSize(Prealloc)]; std::pmr::monotonic_buffer_resource res{buffer, sizeof buffer}; std::pmr::unordered_set<T, QHasher<T>> set{&res}; #else |