zheiling/BBS-Server
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

close db in more correct way. less unsigned integers

Browse Source
This commit is contained in:
zheiling
2026-05-11 18:28:26 +03:00
parent e681cc366e
commit c6bb849278
13 changed files with 133 additions and 131 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/libs/murmur3/murmur3.c
+61 -61
View File
@@ -18,12 +18,12 @@
#define FORCE_INLINE inline
#endif
static FORCE_INLINE uint32_t rotl32 ( uint32_t x, int8_t r )
static FORCE_INLINE int32_t rotl32 ( int32_t x, int8_t r )
{
return (x << r) | (x >> (32 - r));
}
static FORCE_INLINE uint64_t rotl64 ( uint64_t x, int8_t r )
static FORCE_INLINE int64_t rotl64 ( int64_t x, int8_t r )
{
return (x << r) | (x >> (64 - r));
}
@@ -42,7 +42,7 @@ static FORCE_INLINE uint64_t rotl64 ( uint64_t x, int8_t r )
//-----------------------------------------------------------------------------
// Finalization mix - force all bits of a hash block to avalanche
static FORCE_INLINE uint32_t fmix32 ( uint32_t h )
static FORCE_INLINE int32_t fmix32 ( int32_t h )
{
h ^= h >> 16;
h *= 0x85ebca6b;
@@ -55,7 +55,7 @@ static FORCE_INLINE uint32_t fmix32 ( uint32_t h )
//----------
static FORCE_INLINE uint64_t fmix64 ( uint64_t k )
static FORCE_INLINE int64_t fmix64 ( int64_t k )
{
k ^= k >> 33;
k *= BIG_CONSTANT(0xff51afd7ed558ccd);
@@ -69,25 +69,25 @@ static FORCE_INLINE uint64_t fmix64 ( uint64_t k )
//-----------------------------------------------------------------------------
void MurmurHash3_x86_32 ( const void * key, int len,
uint32_t seed, void * out )
int32_t seed, void * out )
{
const uint8_t * data = (const uint8_t*)key;
const int nblocks = len / 4;
int i;
uint32_t h1 = seed;
int32_t h1 = seed;
uint32_t c1 = 0xcc9e2d51;
uint32_t c2 = 0x1b873593;
int32_t c1 = 0xcc9e2d51;
int32_t c2 = 0x1b873593;
//----------
// body
const uint32_t * blocks = (const uint32_t *)(data + nblocks*4);
const int32_t * blocks = (const int32_t *)(data + nblocks*4);
for(i = -nblocks; i; i++)
{
uint32_t k1 = getblock(blocks,i);
int32_t k1 = getblock(blocks,i);
k1 *= c1;
k1 = ROTL32(k1,15);
@@ -103,7 +103,7 @@ void MurmurHash3_x86_32 ( const void * key, int len,
const uint8_t * tail = (const uint8_t*)(data + nblocks*4);
uint32_t k1 = 0;
int32_t k1 = 0;
switch(len & 3)
{
@@ -120,39 +120,39 @@ void MurmurHash3_x86_32 ( const void * key, int len,
h1 = fmix32(h1);
*(uint32_t*)out = h1;
*(int32_t*)out = h1;
}
//-----------------------------------------------------------------------------
void MurmurHash3_x86_128 ( const void * key, const int len,
uint32_t seed, void * out )
int32_t seed, void * out )
{
const uint8_t * data = (const uint8_t*)key;
const int nblocks = len / 16;
int i;
uint32_t h1 = seed;
uint32_t h2 = seed;
uint32_t h3 = seed;
uint32_t h4 = seed;
int32_t h1 = seed;
int32_t h2 = seed;
int32_t h3 = seed;
int32_t h4 = seed;
uint32_t c1 = 0x239b961b;
uint32_t c2 = 0xab0e9789;
uint32_t c3 = 0x38b34ae5;
uint32_t c4 = 0xa1e38b93;
int32_t c1 = 0x239b961b;
int32_t c2 = 0xab0e9789;
int32_t c3 = 0x38b34ae5;
int32_t c4 = 0xa1e38b93;
//----------
// body
const uint32_t * blocks = (const uint32_t *)(data + nblocks*16);
const int32_t * blocks = (const int32_t *)(data + nblocks*16);
for(i = -nblocks; i; i++)
{
uint32_t k1 = getblock(blocks,i*4+0);
uint32_t k2 = getblock(blocks,i*4+1);
uint32_t k3 = getblock(blocks,i*4+2);
uint32_t k4 = getblock(blocks,i*4+3);
int32_t k1 = getblock(blocks,i*4+0);
int32_t k2 = getblock(blocks,i*4+1);
int32_t k3 = getblock(blocks,i*4+2);
int32_t k4 = getblock(blocks,i*4+3);
k1 *= c1; k1 = ROTL32(k1,15); k1 *= c2; h1 ^= k1;
@@ -176,10 +176,10 @@ void MurmurHash3_x86_128 ( const void * key, const int len,
const uint8_t * tail = (const uint8_t*)(data + nblocks*16);
uint32_t k1 = 0;
uint32_t k2 = 0;
uint32_t k3 = 0;
uint32_t k4 = 0;
int32_t k1 = 0;
int32_t k2 = 0;
int32_t k3 = 0;
int32_t k4 = 0;
switch(len & 15)
{
@@ -223,36 +223,36 @@ void MurmurHash3_x86_128 ( const void * key, const int len,
h1 += h2; h1 += h3; h1 += h4;
h2 += h1; h3 += h1; h4 += h1;
((uint32_t*)out)[0] = h1;
((uint32_t*)out)[1] = h2;
((uint32_t*)out)[2] = h3;
((uint32_t*)out)[3] = h4;
((int32_t*)out)[0] = h1;
((int32_t*)out)[1] = h2;
((int32_t*)out)[2] = h3;
((int32_t*)out)[3] = h4;
}
//-----------------------------------------------------------------------------
void MurmurHash3_x64_128 ( const void * key, const int len,
const uint32_t seed, void * out )
const int32_t seed, void * out )
{
const uint8_t * data = (const uint8_t*)key;
const int nblocks = len / 16;
int i;
uint64_t h1 = seed;
uint64_t h2 = seed;
int64_t h1 = seed;
int64_t h2 = seed;
uint64_t c1 = BIG_CONSTANT(0x87c37b91114253d5);
uint64_t c2 = BIG_CONSTANT(0x4cf5ad432745937f);
int64_t c1 = BIG_CONSTANT(0x87c37b91114253d5);
int64_t c2 = BIG_CONSTANT(0x4cf5ad432745937f);
//----------
// body
const uint64_t * blocks = (const uint64_t *)(data);
const int64_t * blocks = (const int64_t *)(data);
for(i = 0; i < nblocks; i++)
{
uint64_t k1 = getblock(blocks,i*2+0);
uint64_t k2 = getblock(blocks,i*2+1);
int64_t k1 = getblock(blocks,i*2+0);
int64_t k2 = getblock(blocks,i*2+1);
k1 *= c1; k1 = ROTL64(k1,31); k1 *= c2; h1 ^= k1;
@@ -268,28 +268,28 @@ void MurmurHash3_x64_128 ( const void * key, const int len,
const uint8_t * tail = (const uint8_t*)(data + nblocks*16);
uint64_t k1 = 0;
uint64_t k2 = 0;
int64_t k1 = 0;
int64_t k2 = 0;
switch(len & 15)
{
case 15: k2 ^= (uint64_t)(tail[14]) << 48;
case 14: k2 ^= (uint64_t)(tail[13]) << 40;
case 13: k2 ^= (uint64_t)(tail[12]) << 32;
case 12: k2 ^= (uint64_t)(tail[11]) << 24;
case 11: k2 ^= (uint64_t)(tail[10]) << 16;
case 10: k2 ^= (uint64_t)(tail[ 9]) << 8;
case 9: k2 ^= (uint64_t)(tail[ 8]) << 0;
case 15: k2 ^= (int64_t)(tail[14]) << 48;
case 14: k2 ^= (int64_t)(tail[13]) << 40;
case 13: k2 ^= (int64_t)(tail[12]) << 32;
case 12: k2 ^= (int64_t)(tail[11]) << 24;
case 11: k2 ^= (int64_t)(tail[10]) << 16;
case 10: k2 ^= (int64_t)(tail[ 9]) << 8;
case 9: k2 ^= (int64_t)(tail[ 8]) << 0;
k2 *= c2; k2 = ROTL64(k2,33); k2 *= c1; h2 ^= k2;
case 8: k1 ^= (uint64_t)(tail[ 7]) << 56;
case 7: k1 ^= (uint64_t)(tail[ 6]) << 48;
case 6: k1 ^= (uint64_t)(tail[ 5]) << 40;
case 5: k1 ^= (uint64_t)(tail[ 4]) << 32;
case 4: k1 ^= (uint64_t)(tail[ 3]) << 24;
case 3: k1 ^= (uint64_t)(tail[ 2]) << 16;
case 2: k1 ^= (uint64_t)(tail[ 1]) << 8;
case 1: k1 ^= (uint64_t)(tail[ 0]) << 0;
case 8: k1 ^= (int64_t)(tail[ 7]) << 56;
case 7: k1 ^= (int64_t)(tail[ 6]) << 48;
case 6: k1 ^= (int64_t)(tail[ 5]) << 40;
case 5: k1 ^= (int64_t)(tail[ 4]) << 32;
case 4: k1 ^= (int64_t)(tail[ 3]) << 24;
case 3: k1 ^= (int64_t)(tail[ 2]) << 16;
case 2: k1 ^= (int64_t)(tail[ 1]) << 8;
case 1: k1 ^= (int64_t)(tail[ 0]) << 0;
k1 *= c1; k1 = ROTL64(k1,31); k1 *= c2; h1 ^= k1;
};
@@ -307,8 +307,8 @@ void MurmurHash3_x64_128 ( const void * key, const int len,
h1 += h2;
h2 += h1;
((uint64_t*)out)[0] = h1;
((uint64_t*)out)[1] = h2;
((int64_t*)out)[0] = h1;
((int64_t*)out)[1] = h2;
}
//-----------------------------------------------------------------------------
src/libs/murmur3/murmur3.h
+3 -3
View File
@@ -14,11 +14,11 @@ extern "C" {
//-----------------------------------------------------------------------------
void MurmurHash3_x86_32 (const void *key, int len, uint32_t seed, void *out);
void MurmurHash3_x86_32 (const void *key, int len, int32_t seed, void *out);
void MurmurHash3_x86_128(const void *key, int len, uint32_t seed, void *out);
void MurmurHash3_x86_128(const void *key, int len, int32_t seed, void *out);
void MurmurHash3_x64_128(const void *key, int len, uint32_t seed, void *out);
void MurmurHash3_x64_128(const void *key, int len, int32_t seed, void *out);
//-----------------------------------------------------------------------------