mirror of
https://github.com/ruby/ruby.git
synced 2022-11-09 12:17:21 -05:00
9b383bd6cf
string (e.g. ?x). * lib/tempfile.rb (Tempfile::make_tmpname): put dot between basename and pid. [ruby-talk:196272] * parse.y (do_block): remove -> style block. * parse.y (parser_yylex): remove tLAMBDA_ARG. * eval.c (rb_call0): binding for the return event hook should have consistent scope. [ruby-core:07928] * eval.c (proc_invoke): return behavior should depend whether it is surrounded by a lambda or a mere block. * eval.c (formal_assign): handles post splat arguments. * eval.c (rb_call0): ditto. * st.c (strhash): use FNV-1a hash. * parse.y (parser_yylex): removed experimental ';;' terminator. * eval.c (rb_node_arity): should be aware of post splat arguments. * eval.c (rb_proc_arity): ditto. * parse.y (f_args): syntax rule enhanced to support arguments after the splat. * parse.y (block_param): ditto for block parameters. * parse.y (f_post_arg): mandatory formal arguments after the splat argument. * parse.y (new_args_gen): generate nodes for mandatory formal arguments after the splat argument. * eval.c (rb_eval): dispatch mandatory formal arguments after the splat argument. * parse.y (args): allow more than one splat in the argument list. * parse.y (method_call): allow aref [] to accept all kind of method argument, including assocs, splat, and block argument. * eval.c (SETUP_ARGS0): prepare block argument as well. * lib/mathn.rb (Integer): remove Integer#gcd2. [ruby-core:07931] * eval.c (error_line): print receivers true/false/nil specially. * eval.c (rb_proc_yield): handles parameters in yield semantics. * eval.c (nil_yield): gives LocalJumpError to denote no block error. * io.c (rb_io_getc): now takes one-character string. * string.c (rb_str_hash): use FNV-1a hash from Fowler/Noll/Vo hashing algorithm. * string.c (rb_str_aref): str[0] now returns 1 character string, instead of a fixnum. [Ruby2] * parse.y (parser_yylex): ?c now returns 1 character string, instead of a fixnum. [Ruby2] * string.c (rb_str_aset): no longer support fixnum insertion. * eval.c (umethod_bind): should not update original class. [ruby-dev:28636] * eval.c (ev_const_get): should support constant access from within instance_eval(). [ruby-dev:28327] * time.c (time_timeval): should round for usec floating number. [ruby-core:07896] * time.c (time_add): ditto. * dir.c (sys_warning): should not call a vararg function rb_sys_warning() indirectly. [ruby-core:07886] * numeric.c (flo_divmod): the first element of Float#divmod should be an integer. [ruby-dev:28589] * test/ruby/test_float.rb: add tests for divmod, div, modulo and remainder. * re.c (rb_reg_initialize): should not allow modifying literal regexps. frozen check moved from rb_reg_initialize_m as well. * re.c (rb_reg_initialize): should not modify untainted objects in safe levels higher than 3. * re.c (rb_memcmp): type change from char* to const void*. * dir.c (dir_close): should not close untainted dir stream. * dir.c (GetDIR): add tainted/frozen check for each dir operation. * lib/rdoc/parsers/parse_rb.rb (RDoc::RubyParser::parse_symbol_arg): typo fixed. a patch from Florian Gross <florg at florg.net>. * eval.c (EXEC_EVENT_HOOK): trace_func may remove itself from event_hooks. no guarantee for arbitrary hook deletion. [ruby-dev:28632] * util.c (ruby_strtod): differ addition to minimize error. [ruby-dev:28619] * util.c (ruby_strtod): should not raise ERANGE when the input string does not have any digits. [ruby-dev:28629] * eval.c (proc_invoke): should restore old ruby_frame->block. thanks to ts <decoux at moulon.inra.fr>. [ruby-core:07833] also fix [ruby-dev:28614] as well. * signal.c (trap): sig should be less then NSIG. Coverity found this bug. a patch from Kevin Tew <tewk at tewk.com>. [ruby-core:07823] * math.c (math_log2): add new method inspired by [ruby-talk:191237]. * math.c (math_log): add optional base argument to Math::log(). [ruby-talk:191308] * ext/syck/emitter.c (syck_scan_scalar): avoid accessing uninitialized array element. a patch from Pat Eyler <rubypate at gmail.com>. [ruby-core:07809] * array.c (rb_ary_fill): initialize local variables first. a patch from Pat Eyler <rubypate at gmail.com>. [ruby-core:07810] * ext/syck/yaml2byte.c (syck_yaml2byte_handler): need to free type_tag. a patch from Pat Eyler <rubypate at gmail.com>. [ruby-core:07808] * ext/socket/socket.c (make_hostent_internal): accept ai_family check from Sam Roberts <sroberts at uniserve.com>. [ruby-core:07691] * util.c (ruby_strtod): should not cut off 18 digits for no reason. [ruby-core:07796] * array.c (rb_ary_fill): internalize local variable "beg" to pacify Coverity. [ruby-core:07770] * pack.c (pack_unpack): now supports CRLF newlines. a patch from <tommy at tmtm.org>. [ruby-dev:28601] * applied code clean-up patch from Stefan Huehner <stefan at huehner.org>. [ruby-core:07764] * lib/jcode.rb (String::tr_s): should have translated non squeezing character sequence (i.e. a character) as well. thanks to Hiroshi Ichikawa <gimite at gimite.ddo.jp> [ruby-list:42090] * ext/socket/socket.c: document update patch from Sam Roberts <sroberts at uniserve.com>. [ruby-core:07701] * lib/mathn.rb (Integer): need not to remove gcd2. a patch from NARUSE, Yui <naruse at airemix.com>. [ruby-dev:28570] * parse.y (arg): too much NEW_LIST() * eval.c (SETUP_ARGS0): remove unnecessary access to nd_alen. * eval.c (rb_eval): use ARGSCAT for NODE_OP_ASGN1. [ruby-dev:28585] * parse.y (arg): use NODE_ARGSCAT for placeholder. * lib/getoptlong.rb (GetoptLong::get): RDoc update patch from mathew <meta at pobox.com>. [ruby-core:07738] * variable.c (rb_const_set): raise error when no target klass is supplied. [ruby-dev:28582] * prec.c (prec_prec_f): documentation patch from <gerardo.santana at gmail.com>. [ruby-core:07689] * bignum.c (rb_big_pow): second operand may be too big even if it's a Fixnum. [ruby-talk:187984] * README.EXT: update symbol description. [ruby-talk:188104] * COPYING: explicitly note GPLv2. [ruby-talk:187922] * parse.y: remove some obsolete syntax rules (unparenthesized method calls in argument list). * eval.c (rb_call0): insecure calling should be checked for non NODE_SCOPE method invocations too. * eval.c (rb_alias): should preserve the current safe level as well as method definition. * process.c (rb_f_sleep): remove RDoc description about SIGALRM which is not valid on the current implementation. [ruby-dev:28464] Thu Mar 23 21:40:47 2006 K.Kosako <sndgk393 AT ybb.ne.jp> * eval.c (method_missing): should support argument splat in super. a bug in combination of super, splat and method_missing. [ruby-talk:185438] * configure.in: Solaris SunPro compiler -rapth patch from <kuwa at labs.fujitsu.com>. [ruby-dev:28443] * configure.in: remove enable_rpath=no for Solaris. [ruby-dev:28440] * ext/win32ole/win32ole.c (ole_val2olevariantdata): change behavior of converting OLE Variant object with VT_ARRAY|VT_UI1 and Ruby String object. * ruby.1: a clarification patch from David Lutterkort <dlutter at redhat.com>. [ruby-core:7508] * lib/rdoc/ri/ri_paths.rb (RI::Paths): adding paths from rubygems directories. a patch from Eric Hodel <drbrain at segment7.net>. [ruby-core:07423] * eval.c (rb_clear_cache_by_class): clearing wrong cache. * ext/extmk.rb: use :remove_destination to install extension libraries to avoid SEGV. [ruby-dev:28417] * eval.c (rb_thread_fd_writable): should not re-schedule output from KILLED thread (must be error printing). * array.c (rb_ary_flatten_bang): allow specifying recursion level. [ruby-talk:182170] * array.c (rb_ary_flatten): ditto. * gc.c (add_heap): a heap_slots may overflow. a patch from Stefan Weil <weil at mail.berlios.de>. * eval.c (rb_call): use separate cache for fcall/vcall invocation. * eval.c (rb_eval): NODE_FCALL, NODE_VCALL can call local functions. * eval.c (rb_mod_local): a new method to specify newly added visibility "local". * eval.c (search_method): search for local methods which are visible only from the current class. * class.c (rb_class_local_methods): a method to list local methods. * object.c (Init_Object): add BasicObject class as a top level BlankSlate class. * ruby.h (SYM2ID): should not cast to signed long. [ruby-core:07414] * class.c (rb_include_module): allow module duplication. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@10235 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
596 lines
12 KiB
C
596 lines
12 KiB
C
/* This is a public domain general purpose hash table package written by Peter Moore @ UCB. */
|
|
|
|
/* static char sccsid[] = "@(#) st.c 5.1 89/12/14 Crucible"; */
|
|
|
|
#include "config.h"
|
|
#include <stdio.h>
|
|
#ifdef HAVE_STDLIB_H
|
|
#include <stdlib.h>
|
|
#endif
|
|
#include <string.h>
|
|
|
|
#ifdef NOT_RUBY
|
|
#include "regint.h"
|
|
#endif
|
|
|
|
#include "st.h"
|
|
|
|
typedef struct st_table_entry st_table_entry;
|
|
|
|
struct st_table_entry {
|
|
unsigned int hash;
|
|
st_data_t key;
|
|
st_data_t record;
|
|
st_table_entry *next;
|
|
};
|
|
|
|
#define ST_DEFAULT_MAX_DENSITY 5
|
|
#define ST_DEFAULT_INIT_TABLE_SIZE 11
|
|
|
|
/*
|
|
* DEFAULT_MAX_DENSITY is the default for the largest we allow the
|
|
* average number of items per bin before increasing the number of
|
|
* bins
|
|
*
|
|
* DEFAULT_INIT_TABLE_SIZE is the default for the number of bins
|
|
* allocated initially
|
|
*
|
|
*/
|
|
|
|
static int numcmp(long, long);
|
|
static int numhash(long);
|
|
static struct st_hash_type type_numhash = {
|
|
numcmp,
|
|
numhash,
|
|
};
|
|
|
|
/* extern int strcmp(const char *, const char *); */
|
|
static int strhash(const char *);
|
|
static struct st_hash_type type_strhash = {
|
|
strcmp,
|
|
strhash,
|
|
};
|
|
|
|
static void rehash(st_table *);
|
|
|
|
#define alloc(type) (type*)malloc((size_t)sizeof(type))
|
|
#define Calloc(n,s) (char*)calloc((n),(s))
|
|
|
|
#define EQUAL(table,x,y) ((x)==(y) || (*table->type->compare)((x),(y)) == 0)
|
|
|
|
#define do_hash(key,table) (unsigned int)(*(table)->type->hash)((key))
|
|
#define do_hash_bin(key,table) (do_hash(key, table)%(table)->num_bins)
|
|
|
|
/*
|
|
* MINSIZE is the minimum size of a dictionary.
|
|
*/
|
|
|
|
#define MINSIZE 8
|
|
|
|
/*
|
|
Table of prime numbers 2^n+a, 2<=n<=30.
|
|
*/
|
|
static long primes[] = {
|
|
8 + 3,
|
|
16 + 3,
|
|
32 + 5,
|
|
64 + 3,
|
|
128 + 3,
|
|
256 + 27,
|
|
512 + 9,
|
|
1024 + 9,
|
|
2048 + 5,
|
|
4096 + 3,
|
|
8192 + 27,
|
|
16384 + 43,
|
|
32768 + 3,
|
|
65536 + 45,
|
|
131072 + 29,
|
|
262144 + 3,
|
|
524288 + 21,
|
|
1048576 + 7,
|
|
2097152 + 17,
|
|
4194304 + 15,
|
|
8388608 + 9,
|
|
16777216 + 43,
|
|
33554432 + 35,
|
|
67108864 + 15,
|
|
134217728 + 29,
|
|
268435456 + 3,
|
|
536870912 + 11,
|
|
1073741824 + 85,
|
|
0
|
|
};
|
|
|
|
static int
|
|
new_size(int size)
|
|
{
|
|
int i;
|
|
|
|
#if 0
|
|
for (i=3; i<31; i++) {
|
|
if ((1<<i) > size) return 1<<i;
|
|
}
|
|
return -1;
|
|
#else
|
|
int newsize;
|
|
|
|
for (i = 0, newsize = MINSIZE;
|
|
i < (int )(sizeof(primes)/sizeof(primes[0]));
|
|
i++, newsize <<= 1)
|
|
{
|
|
if (newsize > size) return primes[i];
|
|
}
|
|
/* Ran out of polynomials */
|
|
return -1; /* should raise exception */
|
|
#endif
|
|
}
|
|
|
|
#ifdef HASH_LOG
|
|
static int collision = 0;
|
|
static int init_st = 0;
|
|
|
|
static void
|
|
stat_col()
|
|
{
|
|
FILE *f = fopen("/tmp/col", "w");
|
|
fprintf(f, "collision: %d\n", collision);
|
|
fclose(f);
|
|
}
|
|
#endif
|
|
|
|
st_table*
|
|
st_init_table_with_size(struct st_hash_type *type, int size)
|
|
{
|
|
st_table *tbl;
|
|
|
|
#ifdef HASH_LOG
|
|
if (init_st == 0) {
|
|
init_st = 1;
|
|
atexit(stat_col);
|
|
}
|
|
#endif
|
|
|
|
size = new_size(size); /* round up to prime number */
|
|
|
|
tbl = alloc(st_table);
|
|
tbl->type = type;
|
|
tbl->num_entries = 0;
|
|
tbl->num_bins = size;
|
|
tbl->bins = (st_table_entry **)Calloc(size, sizeof(st_table_entry*));
|
|
|
|
return tbl;
|
|
}
|
|
|
|
st_table*
|
|
st_init_table(struct st_hash_type *type)
|
|
{
|
|
return st_init_table_with_size(type, 0);
|
|
}
|
|
|
|
st_table*
|
|
st_init_numtable(void)
|
|
{
|
|
return st_init_table(&type_numhash);
|
|
}
|
|
|
|
st_table*
|
|
st_init_numtable_with_size(int size)
|
|
{
|
|
return st_init_table_with_size(&type_numhash, size);
|
|
}
|
|
|
|
st_table*
|
|
st_init_strtable(void)
|
|
{
|
|
return st_init_table(&type_strhash);
|
|
}
|
|
|
|
st_table*
|
|
st_init_strtable_with_size(int size)
|
|
{
|
|
return st_init_table_with_size(&type_strhash, size);
|
|
}
|
|
|
|
void
|
|
st_free_table(st_table *table)
|
|
{
|
|
register st_table_entry *ptr, *next;
|
|
int i;
|
|
|
|
for(i = 0; i < table->num_bins; i++) {
|
|
ptr = table->bins[i];
|
|
while (ptr != 0) {
|
|
next = ptr->next;
|
|
free(ptr);
|
|
ptr = next;
|
|
}
|
|
}
|
|
free(table->bins);
|
|
free(table);
|
|
}
|
|
|
|
#define PTR_NOT_EQUAL(table, ptr, hash_val, key) \
|
|
((ptr) != 0 && (ptr->hash != (hash_val) || !EQUAL((table), (key), (ptr)->key)))
|
|
|
|
#ifdef HASH_LOG
|
|
#define COLLISION collision++
|
|
#else
|
|
#define COLLISION
|
|
#endif
|
|
|
|
#define FIND_ENTRY(table, ptr, hash_val, bin_pos) do {\
|
|
bin_pos = hash_val%(table)->num_bins;\
|
|
ptr = (table)->bins[bin_pos];\
|
|
if (PTR_NOT_EQUAL(table, ptr, hash_val, key)) {\
|
|
COLLISION;\
|
|
while (PTR_NOT_EQUAL(table, ptr->next, hash_val, key)) {\
|
|
ptr = ptr->next;\
|
|
}\
|
|
ptr = ptr->next;\
|
|
}\
|
|
} while (0)
|
|
|
|
int
|
|
st_lookup(st_table *table, register st_data_t key, st_data_t *value)
|
|
{
|
|
unsigned int hash_val, bin_pos;
|
|
register st_table_entry *ptr;
|
|
|
|
hash_val = do_hash(key, table);
|
|
FIND_ENTRY(table, ptr, hash_val, bin_pos);
|
|
|
|
if (ptr == 0) {
|
|
return 0;
|
|
}
|
|
else {
|
|
if (value != 0) *value = ptr->record;
|
|
return 1;
|
|
}
|
|
}
|
|
|
|
#define ADD_DIRECT(table, key, value, hash_val, bin_pos)\
|
|
do {\
|
|
st_table_entry *entry;\
|
|
if (table->num_entries/(table->num_bins) > ST_DEFAULT_MAX_DENSITY) {\
|
|
rehash(table);\
|
|
bin_pos = hash_val % table->num_bins;\
|
|
}\
|
|
\
|
|
entry = alloc(st_table_entry);\
|
|
\
|
|
entry->hash = hash_val;\
|
|
entry->key = key;\
|
|
entry->record = value;\
|
|
entry->next = table->bins[bin_pos];\
|
|
table->bins[bin_pos] = entry;\
|
|
table->num_entries++;\
|
|
} while (0)
|
|
|
|
int
|
|
st_insert(register st_table *table, register st_data_t key, st_data_t value)
|
|
{
|
|
unsigned int hash_val, bin_pos;
|
|
register st_table_entry *ptr;
|
|
|
|
hash_val = do_hash(key, table);
|
|
FIND_ENTRY(table, ptr, hash_val, bin_pos);
|
|
|
|
if (ptr == 0) {
|
|
ADD_DIRECT(table, key, value, hash_val, bin_pos);
|
|
return 0;
|
|
}
|
|
else {
|
|
ptr->record = value;
|
|
return 1;
|
|
}
|
|
}
|
|
|
|
void
|
|
st_add_direct(st_table *table, st_data_t key, st_data_t value)
|
|
{
|
|
unsigned int hash_val, bin_pos;
|
|
|
|
hash_val = do_hash(key, table);
|
|
bin_pos = hash_val % table->num_bins;
|
|
ADD_DIRECT(table, key, value, hash_val, bin_pos);
|
|
}
|
|
|
|
static void
|
|
rehash(register st_table *table)
|
|
{
|
|
register st_table_entry *ptr, *next, **new_bins;
|
|
int i, old_num_bins = table->num_bins, new_num_bins;
|
|
unsigned int hash_val;
|
|
|
|
new_num_bins = new_size(old_num_bins+1);
|
|
new_bins = (st_table_entry**)Calloc(new_num_bins, sizeof(st_table_entry*));
|
|
|
|
for(i = 0; i < old_num_bins; i++) {
|
|
ptr = table->bins[i];
|
|
while (ptr != 0) {
|
|
next = ptr->next;
|
|
hash_val = ptr->hash % new_num_bins;
|
|
ptr->next = new_bins[hash_val];
|
|
new_bins[hash_val] = ptr;
|
|
ptr = next;
|
|
}
|
|
}
|
|
free(table->bins);
|
|
table->num_bins = new_num_bins;
|
|
table->bins = new_bins;
|
|
}
|
|
|
|
st_table*
|
|
st_copy(st_table *old_table)
|
|
{
|
|
st_table *new_table;
|
|
st_table_entry *ptr, *entry;
|
|
int i, num_bins = old_table->num_bins;
|
|
|
|
new_table = alloc(st_table);
|
|
if (new_table == 0) {
|
|
return 0;
|
|
}
|
|
|
|
*new_table = *old_table;
|
|
new_table->bins = (st_table_entry**)
|
|
Calloc((unsigned)num_bins, sizeof(st_table_entry*));
|
|
|
|
if (new_table->bins == 0) {
|
|
free(new_table);
|
|
return 0;
|
|
}
|
|
|
|
for(i = 0; i < num_bins; i++) {
|
|
new_table->bins[i] = 0;
|
|
ptr = old_table->bins[i];
|
|
while (ptr != 0) {
|
|
entry = alloc(st_table_entry);
|
|
if (entry == 0) {
|
|
free(new_table->bins);
|
|
free(new_table);
|
|
return 0;
|
|
}
|
|
*entry = *ptr;
|
|
entry->next = new_table->bins[i];
|
|
new_table->bins[i] = entry;
|
|
ptr = ptr->next;
|
|
}
|
|
}
|
|
return new_table;
|
|
}
|
|
|
|
int
|
|
st_delete(register st_table *table, register st_data_t *key, st_data_t *value)
|
|
{
|
|
unsigned int hash_val;
|
|
st_table_entry *tmp;
|
|
register st_table_entry *ptr;
|
|
|
|
hash_val = do_hash_bin(*key, table);
|
|
ptr = table->bins[hash_val];
|
|
|
|
if (ptr == 0) {
|
|
if (value != 0) *value = 0;
|
|
return 0;
|
|
}
|
|
|
|
if (EQUAL(table, *key, ptr->key)) {
|
|
table->bins[hash_val] = ptr->next;
|
|
table->num_entries--;
|
|
if (value != 0) *value = ptr->record;
|
|
*key = ptr->key;
|
|
free(ptr);
|
|
return 1;
|
|
}
|
|
|
|
for(; ptr->next != 0; ptr = ptr->next) {
|
|
if (EQUAL(table, ptr->next->key, *key)) {
|
|
tmp = ptr->next;
|
|
ptr->next = ptr->next->next;
|
|
table->num_entries--;
|
|
if (value != 0) *value = tmp->record;
|
|
*key = tmp->key;
|
|
free(tmp);
|
|
return 1;
|
|
}
|
|
}
|
|
|
|
return 0;
|
|
}
|
|
|
|
int
|
|
st_delete_safe(register st_table *table, register st_data_t *key, st_data_t *value, st_data_t never)
|
|
{
|
|
unsigned int hash_val;
|
|
register st_table_entry *ptr;
|
|
|
|
hash_val = do_hash_bin(*key, table);
|
|
ptr = table->bins[hash_val];
|
|
|
|
if (ptr == 0) {
|
|
if (value != 0) *value = 0;
|
|
return 0;
|
|
}
|
|
|
|
for(; ptr != 0; ptr = ptr->next) {
|
|
if ((ptr->key != never) && EQUAL(table, ptr->key, *key)) {
|
|
table->num_entries--;
|
|
*key = ptr->key;
|
|
if (value != 0) *value = ptr->record;
|
|
ptr->key = ptr->record = never;
|
|
return 1;
|
|
}
|
|
}
|
|
|
|
return 0;
|
|
}
|
|
|
|
static int
|
|
delete_never(st_data_t key, st_data_t value, st_data_t never)
|
|
{
|
|
if (value == never) return ST_DELETE;
|
|
return ST_CONTINUE;
|
|
}
|
|
|
|
void
|
|
st_cleanup_safe(st_table *table, st_data_t never)
|
|
{
|
|
int num_entries = table->num_entries;
|
|
|
|
st_foreach(table, delete_never, never);
|
|
table->num_entries = num_entries;
|
|
}
|
|
|
|
int
|
|
st_foreach(st_table *table, int (*func)(ANYARGS), st_data_t arg)
|
|
{
|
|
st_table_entry *ptr, *last, *tmp;
|
|
enum st_retval retval;
|
|
int i;
|
|
|
|
for(i = 0; i < table->num_bins; i++) {
|
|
last = 0;
|
|
for(ptr = table->bins[i]; ptr != 0;) {
|
|
retval = (*func)(ptr->key, ptr->record, arg);
|
|
switch (retval) {
|
|
case ST_CHECK: /* check if hash is modified during iteration */
|
|
tmp = 0;
|
|
if (i < table->num_bins) {
|
|
for (tmp = table->bins[i]; tmp; tmp=tmp->next) {
|
|
if (tmp == ptr) break;
|
|
}
|
|
}
|
|
if (!tmp) {
|
|
/* call func with error notice */
|
|
return 1;
|
|
}
|
|
/* fall through */
|
|
case ST_CONTINUE:
|
|
last = ptr;
|
|
ptr = ptr->next;
|
|
break;
|
|
case ST_STOP:
|
|
return 0;
|
|
case ST_DELETE:
|
|
tmp = ptr;
|
|
if (last == 0) {
|
|
table->bins[i] = ptr->next;
|
|
}
|
|
else {
|
|
last->next = ptr->next;
|
|
}
|
|
ptr = ptr->next;
|
|
free(tmp);
|
|
table->num_entries--;
|
|
}
|
|
}
|
|
}
|
|
return 0;
|
|
}
|
|
|
|
/*
|
|
* hash_32 - 32 bit Fowler/Noll/Vo FNV-1a hash code
|
|
*
|
|
* @(#) $Revision$
|
|
* @(#) $Id$
|
|
* @(#) $Source$
|
|
*
|
|
***
|
|
*
|
|
* Fowler/Noll/Vo hash
|
|
*
|
|
* The basis of this hash algorithm was taken from an idea sent
|
|
* as reviewer comments to the IEEE POSIX P1003.2 committee by:
|
|
*
|
|
* Phong Vo (http://www.research.att.com/info/kpv/)
|
|
* Glenn Fowler (http://www.research.att.com/~gsf/)
|
|
*
|
|
* In a subsequent ballot round:
|
|
*
|
|
* Landon Curt Noll (http://www.isthe.com/chongo/)
|
|
*
|
|
* improved on their algorithm. Some people tried this hash
|
|
* and found that it worked rather well. In an EMail message
|
|
* to Landon, they named it the ``Fowler/Noll/Vo'' or FNV hash.
|
|
*
|
|
* FNV hashes are designed to be fast while maintaining a low
|
|
* collision rate. The FNV speed allows one to quickly hash lots
|
|
* of data while maintaining a reasonable collision rate. See:
|
|
*
|
|
* http://www.isthe.com/chongo/tech/comp/fnv/index.html
|
|
*
|
|
* for more details as well as other forms of the FNV hash.
|
|
***
|
|
*
|
|
* To use the recommended 32 bit FNV-1a hash, pass FNV1_32A_INIT as the
|
|
* Fnv32_t hashval argument to fnv_32a_buf() or fnv_32a_str().
|
|
*
|
|
***
|
|
*
|
|
* Please do not copyright this code. This code is in the public domain.
|
|
*
|
|
* LANDON CURT NOLL DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE,
|
|
* INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS. IN NO
|
|
* EVENT SHALL LANDON CURT NOLL BE LIABLE FOR ANY SPECIAL, INDIRECT OR
|
|
* CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF
|
|
* USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR
|
|
* OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
|
|
* PERFORMANCE OF THIS SOFTWARE.
|
|
*
|
|
* By:
|
|
* chongo <Landon Curt Noll> /\oo/\
|
|
* http://www.isthe.com/chongo/
|
|
*
|
|
* Share and Enjoy! :-)
|
|
*/
|
|
|
|
/*
|
|
* 32 bit FNV-1 and FNV-1a non-zero initial basis
|
|
*
|
|
* The FNV-1 initial basis is the FNV-0 hash of the following 32 octets:
|
|
*
|
|
* chongo <Landon Curt Noll> /\../\
|
|
*
|
|
* NOTE: The \'s above are not back-slashing escape characters.
|
|
* They are literal ASCII backslash 0x5c characters.
|
|
*
|
|
* NOTE: The FNV-1a initial basis is the same value as FNV-1 by definition.
|
|
*/
|
|
#define FNV1_32A_INIT 0x811c9dc5
|
|
|
|
/*
|
|
* 32 bit magic FNV-1a prime
|
|
*/
|
|
#define FNV_32_PRIME 0x01000193
|
|
|
|
static int
|
|
strhash(register const char *string)
|
|
{
|
|
register int hval = FNV1_32A_INIT;
|
|
|
|
/*
|
|
* FNV-1a hash each octet in the buffer
|
|
*/
|
|
while (*string) {
|
|
/* xor the bottom with the current octet */
|
|
hval ^= (int)*string++;
|
|
|
|
/* multiply by the 32 bit FNV magic prime mod 2^32 */
|
|
hval *= FNV_32_PRIME;
|
|
}
|
|
return hval;
|
|
}
|
|
|
|
static int
|
|
numcmp(long x, long y)
|
|
{
|
|
return x != y;
|
|
}
|
|
|
|
static int
|
|
numhash(long n)
|
|
{
|
|
return n;
|
|
}
|