--- parser3/src/include/pa_hash.h 2003/01/28 11:18:01 1.58.2.9 +++ parser3/src/include/pa_hash.h 2004/02/11 15:33:14 1.62 @@ -1,7 +1,7 @@ /** @file Parser: hash class decl. - Copyright (c) 2001, 2003 ArtLebedev Group (http://www.artlebedev.com) + Copyright (c) 2001-2004 ArtLebedev Group (http://www.artlebedev.com) Author: Alexandr Petrosian (http://paf.design.ru) */ @@ -17,11 +17,23 @@ #ifndef PA_HASH_H #define PA_HASH_H -static const char* IDENT_HASH_H="$Date: 2003/01/28 11:18:01 $"; +static const char * const IDENT_HASH_H="$Date: 2004/02/11 15:33:14 $"; -#include "pa_pool.h" +#include "pa_memory.h" #include "pa_types.h" +const int HASH_ALLOCATES_COUNT=29; + +/** Zend comment: Generated on an Octa-ALPHA 300MHz CPU & 2.5GB RAM monster + + paf: HPUX ld could not handle static member: unsatisfied symbols +*/ +static uint Hash_allocates[HASH_ALLOCATES_COUNT]={ + 5, 11, 19, 53, 107, 223, 463, 983, 1979, 3907, 7963, + 16229, 32531, 65407, 130987, 262237, 524521, 1048793, + 2097397, 4194103, 8388857, 16777447, 33554201, 67108961, + 134217487, 268435697, 536870683, 1073741621, 2147483399}; + /** Simple hash. @@ -37,10 +49,10 @@ public: typedef V value_type; Hash() { - allocated=allocates[allocates_index=0]; + allocated=Hash_allocates[allocates_index=0]; threshold=allocated*THRESHOLD_PERCENT/100; fpairs_count=fused_refs=0; - refs=static_cast(pa_calloc(sizeof(Pair *)*allocated)); + refs=new(UseGC) Pair*[allocated]; } Hash(const Hash& source) { @@ -49,16 +61,27 @@ public: threshold=source.threshold; fused_refs=source.fused_refs; fpairs_count=source.fpairs_count; - refs=new Pair*[allocated]; - memcpy(refs, source.refs, sizeof(Pair *)*allocated); - } - ~Hash() { - destroy_pairs(); - delete refs; + refs=new(UseGC) Pair*[allocated]; + + // clone & rehash + Pair **old_ref=source.refs; + for(int index=0; indexlink; + + Pair **new_ref=&refs[index]; + *new_ref=new Pair(pair->code, pair->key, pair->value, *new_ref); + + pair=next; + } } /// put a [value] under the [key] @returns existed or not bool put(K key, V value) { + if(!value) { + remove(key); + return false; + } if(is_full()) expand(); @@ -105,11 +128,15 @@ public: if(pair->code==code && pair->key==key) return pair->value; - return 0; + return V(0); } /// put a [value] under the [key] if that [key] existed @returns existed or not bool put_replace(K key, V value) { + if(!value) { + remove(key); + return false; + } uint code=hash_code(key); uint index=code%allocated; for(Pair *pair=refs[index]; pair; pair=pair->link) @@ -125,6 +152,10 @@ public: /// put a [value] under the [key] if that [key] NOT existed @returns existed or not bool put_dont_replace(K key, V value) { + if(!value) { + remove(key); + return false; + } if(is_full()) expand(); @@ -145,12 +176,13 @@ public: return false; } - /// put all 'src' values if NO with same key existed + /** put all 'src' values if NO with same key existed + @todo optimize this.allocated==src.allocated case + */ void merge_dont_replace(const Hash& src) { for(int i=0; ilink) put_dont_replace(pair->key, pair->value); - // MAY:optimize this.allocated==src.allocated case } /// number of elements in hash @@ -164,20 +196,28 @@ public: callback(pair->key, pair->value, info); } + /// iterate over all pairs + template void for_each_ref(void callback(K, V&, I), I info) const { + Pair **ref=refs; + for(int index=0; indexlink) + callback(pair->key, pair->value, info); + } + /// iterate over all pairs until condition becomes true, return that element template V first_that(bool callback(K, V, I), I info) const { Pair **ref=refs; for(int index=0; indexlink) if(callback(pair->key, pair->value, info)) - return &pair->value; + return pair->value; - return 0;//V(0) + return V(0); } /// remove all elements void clear() { - destroy_pairs(); memset(refs, 0, sizeof(*refs)*allocated); + memset(refs, 0, sizeof(*refs)*allocated); fpairs_count=fused_refs=0; } @@ -188,14 +228,9 @@ private: THRESHOLD_PERCENT=75 }; - /// the index of [allocated] in [allocates] + /// the index of [allocated] in [Hash_allocates] int allocates_index; - /// possible [allocates]. prime numbers - static uint allocates[]; - - static int allocates_count; - /// number of allocated pairs int allocated; @@ -231,11 +266,11 @@ private: int old_allocated=allocated; Pair **old_refs=refs; + allocates_index=allocates_index+1(pa_calloc(sizeof(Pair *)*allocated)); + refs=new(UseGC) Pair*[allocated]; // rehash Pair **old_ref=old_refs; @@ -251,19 +286,7 @@ private: pair=next; } - delete old_refs; - } - - void destroy_pairs() { - Pair **ref=refs; - for(int index=0; indexlink; - delete pair; - pair=next; - } - } + delete[] old_refs; } private: //disabled @@ -271,36 +294,48 @@ private: //disabled Hash& operator = (const Hash&) { return *this; } }; -/* Zend comment: Generated on an Octa-ALPHA 300MHz CPU & 2.5GB RAM monster */ -template -uint Hash::allocates[]={ - 5, 11, 19, 53, 107, 223, 463, 983, 1979, 3907, 7963, - 16229, 32531, 65407, 130987, 262237, 524521, 1048793, - 2097397, 4194103, 8388857, 16777447, 33554201, 67108961, - 134217487, 268435697, 536870683, 1073741621, 2147483399}; - -template -int Hash::allocates_count=sizeof(allocates)/sizeof(uint); +/// useful generic hash function +inline void generic_hash_code(uint& result, char c) { + result=(result<<4)+c; + if(uint g=(result&0xF0000000)) { + result=result^(g>>24); + result=result^g; + } +} +/// useful generic hash function +inline void generic_hash_code(uint& result, const char* s) { + while(char c=*s++) { + result=(result<<4)+c; + if(uint g=(result&0xF0000000)) { + result=result^(g>>24); + result=result^g; + } + } +} /// useful generic hash function -inline uint generic_hash_code(uint aresult, const char *start, uint allocated) { - uint result=aresult, g; - const char *end=start+allocated; - - while (start>24); result=result^g; } } +} + +/// simple hash code of int. used by EXIF mapping +inline uint hash_code(int self) { + uint result=0; + generic_hash_code(result, (const char*)&self, sizeof(self)); return result; } /// Auto-object used to temporarily substituting/removing hash values template class Temp_hash_value { - Hash& fhash; + Hash& fhash; K fname; V saved_value; public: