Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

use long for internal counters #12

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

use long for internal counters #12

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
23 changes: 12 additions & 11 deletions source/cachetools/containers/hashmap.d
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -159,11 +159,11 @@ struct HashMap(K, V, Allocator = Mallocator, bool GCRangesAllowed = true) {
private alias BucketStorage = RefCounted!(_BucketStorage, Allocator);

BucketStorage _buckets;
int _buckets_num;
int _mask;
int _allocated;
int _deleted;
int _empty;
long _buckets_num;
long _mask;
long _allocated;
long _deleted;
long _empty;

int _grow_factor = 4;

Expand Down Expand Up @@ -317,7 +317,7 @@ struct HashMap(K, V, Allocator = Mallocator, bool GCRangesAllowed = true) {
// We use this function during resize() only.
//
private long findEmptyIndexExtended(const hash_t start_index,
ref BucketStorage buckets, int new_mask) pure const @safe @nogc
ref BucketStorage buckets, long new_mask) pure const @safe @nogc
in {
assert(start_index < buckets.bs.length);
}
Expand Down Expand Up @@ -368,8 +368,8 @@ struct HashMap(K, V, Allocator = Mallocator, bool GCRangesAllowed = true) {
///
/// actual new size - closest power of 2
///
public void resize(int new_size) {
if ( new_size <= 0 ) {
public void resize(long new_size) {
if (new_size <= 0 ) {
assert(0, "new size must be greater than 0");
}
if (popcnt(new_size) > 1) {
Expand All @@ -378,7 +378,8 @@ struct HashMap(K, V, Allocator = Mallocator, bool GCRangesAllowed = true) {
}
doResize(new_size);
}
private void doResize(int dest) {

private void doResize(long dest) {
immutable _new_buckets_num = dest;
immutable _new_mask = dest - 1;
BucketStorage _new_buckets = BucketStorage(_new_buckets_num);
Expand All @@ -388,7 +389,7 @@ struct HashMap(K, V, Allocator = Mallocator, bool GCRangesAllowed = true) {
debug (cachetools)
safe_tracef("start resizing: old loadfactor: %s", (1.0 * _allocated) / _buckets_num);

for (int i = 0; i < _buckets_num; i++) {
for (long i = 0; i < _buckets_num; i++) {
immutable hash_t h = _buckets.bs[i].hash;
if (h < ALLOCATED_HASH) { // empty or deleted
continue;
Expand Down Expand Up @@ -2094,4 +2095,4 @@ unittest {
HashMap!(int, int) map;
map.resize(7);
assert(map.size == 8, "expected 8 got %s".format(map.size));
}
}