github-mirror/mergerfs
2
0
Fork 0
mirror of https://github.com/trapexit/mergerfs.git synced 2025-02-02 05:49:28 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

wyhash: use safety mode 1

Browse Source 
mode 0 is not intended for unaligned buffers
This commit is contained in:
Antonio SJ Musumeci 2020-09-24 08:43:53 -04:00
parent 9c352ac555
commit 04844420dc
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/wyhash.h
View File

@ -3,7 +3,7 @@
#define wyhash_final_version #define wyhash_final_version
//defines that change behavior //defines that change behavior
#ifndef WYHASH_CONDOM #ifndef WYHASH_CONDOM
#define WYHASH_CONDOM 0 //0,1,2 #define WYHASH_CONDOM 1 //0: read 8 bytes before and after boudaries, dangerous but fastest. 1: normal valid behavior 2: extra protection against entropy loss (probability=2^-63), aka. "blind multiplication"
#endif #endif
#define WYHASH_32BIT_MUM 0 //faster on 32 bit system #define WYHASH_32BIT_MUM 0 //faster on 32 bit system
//includes //includes
@ -129,7 +129,7 @@ static inline void make_secret(uint64_t seed, uint64_t *secret){
for(size_t j=0;j<i;j++) for(size_t j=0;j<i;j++)
#if defined(__GNUC__) || defined(__INTEL_COMPILER) || defined(__clang__) #if defined(__GNUC__) || defined(__INTEL_COMPILER) || defined(__clang__)
if(__builtin_popcountll(secret[j]^secret[i])!=32){ ok=0; break; } if(__builtin_popcountll(secret[j]^secret[i])!=32){ ok=0; break; }
#elif defined(_MSC_VER) #elif defined(_MSC_VER) && defined(_M_X64)
if(_mm_popcnt_u64(secret[j]^secret[i])!=32){ ok=0; break; } if(_mm_popcnt_u64(secret[j]^secret[i])!=32){ ok=0; break; }
#endif #endif
if(!ok)continue; if(!ok)continue;