organ
/
Sanmill
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

hash: 将其他的64位定义改为由参数决定

This commit is contained in:
Calcitem 2019-11-16 22:12:34 +08:00
parent 9c2b406d9b
commit d55bc8e723
2 changed files with 4 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
src/base/HashNode.h
View File

@ -205,4 +205,3 @@ namespace CTSL //Concurrent Thread Safe Library
}
#endif

8
src/base/hashmap.h
View File

@ -25,7 +25,7 @@ namespace CTSL //Concurrent Thread Safe Library
//during the creation of the bucket. All the hash buckets are created during the construction of the map.
//Locks are taken per bucket, hence multiple threads can write simultaneously in different buckets in the hash map
#ifdef HASH_KEY_DISABLE
#define hashFn uint64_t
#define hashFn hash_t
template <typename K, typename V>
#else
template <typename K, typename V, typename F = std::hash<K> >
@ -58,7 +58,7 @@ namespace CTSL //Concurrent Thread Safe Library
//If key is not found, function returns false.
bool find(const K &key, V &value) const
{
size_t hashValue = hashFn(key) & (hashSize - 1) ;
K hashValue = hashFn(key) & (hashSize - 1) ;
#ifdef DISABLE_HASHBUCKET
// A shared mutex is used to enable multiple concurrent reads
#ifndef HASHMAP_NOLOCK
@ -80,7 +80,7 @@ namespace CTSL //Concurrent Thread Safe Library
//If key already exists, update the value, else insert a new node in the bucket with the <key, value> pair.
void insert(const K &key, const V &value)
{
size_t hashValue = hashFn(key) & (hashSize - 1);
K hashValue = hashFn(key) & (hashSize - 1);
#ifdef DISABLE_HASHBUCKET
#ifndef HASHMAP_NOLOCK
std::unique_lock<std::shared_timed_mutex> lock(mutex_);
@ -153,7 +153,7 @@ namespace CTSL //Concurrent Thread Safe Library
#else
F hashFn;
#endif
const size_t hashSize;
const hash_t hashSize;
#ifdef DISABLE_HASHBUCKET
#ifndef HASHMAP_NOLOCK
mutable std::shared_timed_mutex mutex_;