bughz/3proxy
1
0
Fork 0
mirror of https://github.com/3proxy/3proxy.git synced 2026-04-19 18:50:12 +08:00
Code Issues Actions 4 Packages Projects Releases Wiki Activity

Использовать tablesize в хештаблице

Browse Source
This commit is contained in:
Vladimir Dubrovin 2026-04-17 21:15:21 +03:00
parent 98604b5421
commit 4ee7f71fb9
2 changed files with 12 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
src/hash.c
View File

@ -7,7 +7,7 @@ static unsigned hashindex(struct hashtable *ht, const unsigned char* hash){
t2 = *(unsigned *)(hash + sizeof(unsigned)); t2 = *(unsigned *)(hash + sizeof(unsigned));
t3 = *(unsigned *)(hash + (2*sizeof(unsigned))); t3 = *(unsigned *)(hash + (2*sizeof(unsigned)));
t4 = *(unsigned *)(hash + (3*sizeof(unsigned))); t4 = *(unsigned *)(hash + (3*sizeof(unsigned)));
return (t1 + (t2 * 7) + (t3 * 17) + (t4 * 29) ) % (ht->hashsize >> 2); return (t1 + (t2 * 7) + (t3 * 17) + (t4 * 29) ) % (ht->tablesize);
} }
@ -22,10 +22,12 @@ void destroyhashtable(struct hashtable *ht){
ht->hashvalues = NULL; ht->hashvalues = NULL;
} }
ht->hashsize = 0; ht->hashsize = 0;
ht->tablesize = 0;
pthread_mutex_unlock(&hash_mutex); pthread_mutex_unlock(&hash_mutex);
} }
#define hvalue(I) ((struct hashentry *)((char *)ht->hashvalues + (I)*(sizeof(struct hashentry) + ht->recsize - 4))) #define hvalue(ht,I) ((struct hashentry *)(ht->hashvalues + (I)*(sizeof(struct hashentry) + ht->recsize - 4)))
int inithashtable(struct hashtable *ht, unsigned nhashsize){ int inithashtable(struct hashtable *ht, unsigned nhashsize){
unsigned i; unsigned i;
clock_t c; clock_t c;
@ -65,17 +67,18 @@ int inithashtable(struct hashtable *ht, unsigned nhashsize){
return 3; return 3;
} }
ht->hashsize = nhashsize; ht->hashsize = nhashsize;
ht->tablesize = (nhashsize>>2);
ht->rnd[0] = myrand(&tb, sizeof(tb)); ht->rnd[0] = myrand(&tb, sizeof(tb));
ht->rnd[1] = myrand(ht->hashtable, sizeof(ht->hashtable)); ht->rnd[1] = myrand(ht->hashtable, sizeof(ht->hashtable));
ht->rnd[2] = myrand(&c, sizeof(c)); ht->rnd[2] = myrand(&c, sizeof(c));
ht->rnd[3] = myrand(ht->hashvalues,sizeof(ht->hashvalues)); ht->rnd[3] = myrand(ht->hashvalues,sizeof(ht->hashvalues));
memset(ht->hashtable, 0, (ht->hashsize>>2) * sizeof(struct hashentry *)); memset(ht->hashtable, 0, ht->tablesize * sizeof(struct hashentry *));
memset(ht->hashvalues, 0, ht->hashsize * (sizeof(struct hashentry) + ht->recsize - 4)); memset(ht->hashvalues, 0, ht->hashsize * (sizeof(struct hashentry) + ht->recsize - 4));
for(i = 0; i< (ht->hashsize - 1); i++) { for(i = 0; i< (ht->hashsize - 1); i++) {
hvalue(i)->next = hvalue(i+1); hvalue(ht,i)->next = hvalue(ht,i+1);
} }
ht->hashempty = ht->hashvalues; ht->hashempty = (struct hashentry *)ht->hashvalues;
pthread_mutex_unlock(&hash_mutex); pthread_mutex_unlock(&hash_mutex);
return 0; return 0;
} }
@ -85,7 +88,7 @@ static void hashcompact(struct hashtable *ht){
struct hashentry *he, **hep; struct hashentry *he, **hep;
if((conf.time - ht->compacted) < 60) return; if((conf.time - ht->compacted) < 60) return;
for(i = 0; i < ht->hashsize; i++){ for(i = 0; i < ht->tablesize; i++){
for(hep = ht->hashtable + i; (he = *hep)!=NULL; ){ for(hep = ht->hashtable + i; (he = *hep)!=NULL; ){
if(he->expires < conf.time ) { if(he->expires < conf.time ) {
(*hep) = he->next; (*hep) = he->next;

3
src/structures.h
View File

@ -766,11 +766,12 @@ struct hashtable {
unsigned recsize; unsigned recsize;
unsigned rnd[4]; unsigned rnd[4];
struct hashentry ** hashtable; struct hashentry ** hashtable;
void * hashvalues; uint8_t * hashvalues;
struct hashentry * hashempty; struct hashentry * hashempty;
void (*index2hash)(const void *index, unsigned char *hash, const unsigned char *rnd); void (*index2hash)(const void *index, unsigned char *hash, const unsigned char *rnd);
int grow; int grow;
time_t compacted; time_t compacted;
int tablesize;
}; };
extern struct hashtable dns_table; extern struct hashtable dns_table;