pike.git/ src/ stralloc.c

2014-10-20

2014-10-20 14:25:48 by Martin Nilsson <nilsson@opera.com>

• ddad7a36b2a6492530465eb204c02d2a5d456386 (9 lines) (+4/-5) ^{[ Show | Annotate ]}
  Branch: 8.1

No need for hashprimes in stralloc.

24:   #include <ctype.h>   #include <math.h>    - #define SET_HSIZE(X) htable_mask=(htable_size=(1<<(X)))-1 + #define SET_HSIZE(X) htable_mask=(htable_size=(X))-1   #define HMODULO(X) ((X) & (htable_mask))      static unsigned INT32 htable_mask;
48:   static size_t hashkey = 0;      static unsigned INT32 htable_size=0; - static unsigned int hashprimes_entry=0; +    static struct pike_string **base_table=0;   static unsigned INT32 num_strings=0;   PMOD_EXPORT struct pike_string *empty_pike_string = 0;
608:    old=htable_size;    old_base=base_table;    -  SET_HSIZE( ++hashprimes_entry ); +  SET_HSIZE(htable_size<<1);       base_table=xcalloc(sizeof(struct pike_string *), htable_size);   
2134:   /*** init/exit memory ***/   void init_shared_string_table(void)   { -  for(hashprimes_entry=0;hashprimes[hashprimes_entry]<BEGIN_HASH_SIZE;hashprimes_entry++); -  SET_HSIZE(hashprimes_entry); +  SET_HSIZE(BEGIN_HASH_SIZE);    base_table=xcalloc(sizeof(struct pike_string *), htable_size);       empty_pike_string = make_shared_string("");