mirror of
https://github.com/ruby/ruby.git
synced 2022-11-09 12:17:21 -05:00
fd06a2a7fb
* ext/dbm/extconf.rb: allow specifying dbm-type explicitly. * ext/dbm/extconf.rb: avoid gdbm if possible, because it leaks memory, whereas gdbm.so doesn't. potential incompatibility. * string.c (rb_str_insert): new method. * parse.y (yylex): lex_state after RESCUE_MOD should be EXPR_BEG. * array.c (rb_ary_insert): new method. * array.c (rb_ary_update): new utility function. * io.c (set_outfile): should check if closed before assignment. * eval.c (rb_eval): should preserve value of ruby_errinfo. * eval.c (rb_thread_schedule): infinite sleep should not cause dead lock. * array.c (rb_ary_flatten_bang): proper recursive detection. * eval.c (yield_under): need not to prohibit at safe level 4. * pack.c (pack_pack): p/P packs nil into NULL. * pack.c (pack_unpack): p/P unpacks NULL into nil. * pack.c (pack_pack): size check for P template. * ruby.c (set_arg0): wrong predicate when new $0 value is bigger than original space. * gc.c (id2ref): should use NUM2ULONG() * object.c (rb_mod_const_get): check whether name is a class variable name. * object.c (rb_mod_const_set): ditto. * object.c (rb_mod_const_defined): ditto. * marshal.c (w_float): precision changed to "%.16g" * eval.c (rb_call0): wrong retry behavior. * numeric.c (fix_aref): a bug on long>int architecture. * eval.c (rb_eval_string_wrap): should restore ruby_wrapper. * regex.c (re_compile_pattern): char class at either edge of range should be invalid. * eval.c (handle_rescue): use === to compare exception match. * error.c (syserr_eqq): comparison between SytemCallErrors should based on their error numbers. * eval.c (safe_getter): should use INT2NUM(). * bignum.c (rb_big2long): 2**31 cannot fit in 31 bit long. * regex.c (calculate_must_string): wrong length calculation. * eval.c (rb_thread_start_0): fixed memory leak. * parse.y (none): should clear cmdarg_stack too. * io.c (rb_fopen): use setvbuf() to avoid recursive malloc() on some platforms. * file.c (rb_stat_dev): device functions should honor stat field types (except long long such as dev_t). * eval.c (rb_mod_nesting): should not push nil for nesting array. * eval.c (rb_mod_s_constants): should not search array by rb_mod_const_at() for nil (happens for singleton class). * class.c (rb_singleton_class_attached): should modify iv_tbl by itself, no longer use rb_iv_set() to avoid freeze check error. * variable.c (rb_const_get): error message "uninitialized constant Foo at Bar::Baz" instead of "uninitialized constantBar::Baz::Foo". * eval.c (rb_mod_included): new hook called from rb_mod_include(). * io.c (opt_i_set): should strdup() inplace_edit string. * eval.c (exec_under): need to push cref too. * eval.c (rb_f_missing): raise NameError for "undefined local variable or method". * error.c (Init_Exception): new exception NoMethodError. NameError moved under ScriptError again. * eval.c (rb_f_missing): use NoMethodError instead of NameError. * file.c (Init_File): should redifine "new" class method. * eval.c (PUSH_CREF): sharing cref node was problematic. maintain runtime cref list instead. * eval.c (rb_eval): copy defn node before registering. * eval.c (rb_load): clear ruby_cref before loading. * variable.c (rb_const_get): no recursion to show full class path for modules. * eval.c (rb_set_safe_level): should set safe level in curr_thread as well. * eval.c (safe_setter): ditto. * object.c (rb_obj_is_instance_of): nil belongs to false, not true. * time.c (make_time_t): proper (I hope) daylight saving time handling for both US and Europe. I HATE DST! * eval.c (rb_thread_wait_for): non blocked signal interrupt should stop the interval. * eval.c (proc_eq): class check aded. * eval.c (proc_eq): typo fixed ("return" was ommitted). * error.c (Init_Exception): move NameError under StandardError. * class.c (rb_mod_clone): should copy method bodies too. * bignum.c (bigdivrem): should trim trailing zero bdigits of remainder, even if dd == 0. * file.c (check3rdbyte): safe string check moved here. * time.c (make_time_t): remove HAVE_TM_ZONE code since it sometimes reports wrong time. * time.c (make_time_t): remove unnecessary range check for platforms where negative time_t is available. * process.c (proc_waitall): should push Process::Status instead of Finuxm status. * process.c (waitall_each): should add all entries in pid_tbl. these changes are inspired by Koji Arai. Thanks. * process.c (proc_wait): should not iterate if pid_tbl is 0. * process.c (proc_waitall): ditto. * numeric.c (flodivmod): a bug in no fmod case. * process.c (pst_wifsignaled): should apply WIFSIGNALED for status (int), not st (VALUE). * io.c (Init_IO): value of $/ and $\ are no longer restricted to strings. type checks are done on demand. * class.c (rb_include_module): module inclusion should be check taints. * ruby.h (STR2CSTR): replace to StringType() and StringTypePtr(). * ruby.h (rb_str2cstr): ditto. * eval.c (rb_load): should not copy topleve local variables. It cause variable/method ambiguity. Thanks to L. Peter Deutsch. * class.c (rb_include_module): freeze check at first. * eval.c (rb_attr): sprintf() and rb_intern() moved into conditional body. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@1356 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
562 lines
10 KiB
C
562 lines
10 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>
|
|
#include "st.h"
|
|
|
|
#ifdef NT
|
|
#include <malloc.h>
|
|
#endif
|
|
|
|
typedef struct st_table_entry st_table_entry;
|
|
|
|
struct st_table_entry {
|
|
unsigned int hash;
|
|
char *key;
|
|
char *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();
|
|
static int numhash();
|
|
static struct st_hash_type type_numhash = {
|
|
numcmp,
|
|
numhash,
|
|
};
|
|
|
|
extern int strcmp();
|
|
static int strhash();
|
|
static struct st_hash_type type_strhash = {
|
|
strcmp,
|
|
strhash,
|
|
};
|
|
|
|
#ifdef RUBY_PLATFORM
|
|
#define xmalloc ruby_xmalloc
|
|
#define xcalloc ruby_xcalloc
|
|
#define xrealloc ruby_xrealloc
|
|
#define xfree ruby_xfree
|
|
|
|
void *xmalloc();
|
|
void *xcalloc();
|
|
void *xrealloc();
|
|
void xfree();
|
|
#endif
|
|
|
|
static void rehash();
|
|
|
|
#define alloc(type) (type*)xmalloc((unsigned)sizeof(type))
|
|
#define Calloc(n,s) (char*)xcalloc((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 + 83,
|
|
8192 + 27,
|
|
16384 + 43,
|
|
32768 + 3,
|
|
65536 + 45,
|
|
131072 + 9,
|
|
262144 + 39,
|
|
524288 + 39,
|
|
1048576 + 9,
|
|
2097152 + 5,
|
|
4194304 + 3,
|
|
8388608 + 33,
|
|
16777216 + 27,
|
|
33554432 + 9,
|
|
67108864 + 71,
|
|
134217728 + 39,
|
|
268435456 + 9,
|
|
536870912 + 5,
|
|
1073741824 + 83,
|
|
0
|
|
};
|
|
|
|
static int
|
|
new_size(size)
|
|
int size;
|
|
{
|
|
int i, newsize;
|
|
|
|
#if 1
|
|
for (i=3; i<31; i++) {
|
|
if ((1<<i) > size) return 1<<i;
|
|
}
|
|
return -1;
|
|
#else
|
|
for (i = 0, newsize = MINSIZE;
|
|
i < 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(type, 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-1;
|
|
tbl->bins = (st_table_entry **)Calloc(size, sizeof(st_table_entry*));
|
|
|
|
return tbl;
|
|
}
|
|
|
|
st_table*
|
|
st_init_table(type)
|
|
struct st_hash_type *type;
|
|
{
|
|
return st_init_table_with_size(type, 0);
|
|
}
|
|
|
|
st_table*
|
|
st_init_numtable()
|
|
{
|
|
return st_init_table(&type_numhash);
|
|
}
|
|
|
|
st_table*
|
|
st_init_numtable_with_size(size)
|
|
int size;
|
|
{
|
|
return st_init_table_with_size(&type_numhash, size);
|
|
}
|
|
|
|
st_table*
|
|
st_init_strtable()
|
|
{
|
|
return st_init_table(&type_strhash);
|
|
}
|
|
|
|
st_table*
|
|
st_init_strtable_with_size(size)
|
|
int size;
|
|
{
|
|
return st_init_table_with_size(&type_strhash, size);
|
|
}
|
|
|
|
void
|
|
st_free_table(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) \
|
|
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;\
|
|
}
|
|
|
|
int
|
|
st_lookup(table, key, value)
|
|
st_table *table;
|
|
register char *key;
|
|
char **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)\
|
|
{\
|
|
st_table_entry *entry;\
|
|
if (table->num_entries/(table->num_bins+1) > 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++;\
|
|
}
|
|
|
|
int
|
|
st_insert(table, key, value)
|
|
register st_table *table;
|
|
register char *key;
|
|
char *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(table, key, value)
|
|
st_table *table;
|
|
char *key;
|
|
char *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(table)
|
|
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*));
|
|
|
|
new_num_bins--;
|
|
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(old_table)
|
|
st_table *old_table;
|
|
{
|
|
st_table *new_table;
|
|
st_table_entry *ptr, *entry;
|
|
int i, num_bins = old_table->num_bins+1;
|
|
|
|
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(table, key, value)
|
|
register st_table *table;
|
|
register char **key;
|
|
char **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(table, key, value, never)
|
|
register st_table *table;
|
|
register char **key;
|
|
char **value;
|
|
char *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(key, value, never)
|
|
char *key, *value, *never;
|
|
{
|
|
if (value == never) return ST_DELETE;
|
|
return ST_CONTINUE;
|
|
}
|
|
|
|
void
|
|
st_cleanup_safe(table, never)
|
|
st_table *table;
|
|
char *never;
|
|
{
|
|
int num_entries = table->num_entries;
|
|
|
|
st_foreach(table, delete_never, never);
|
|
table->num_entries = num_entries;
|
|
}
|
|
|
|
void
|
|
st_foreach(table, func, arg)
|
|
st_table *table;
|
|
enum st_retval (*func)();
|
|
char *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_CONTINUE:
|
|
last = ptr;
|
|
ptr = ptr->next;
|
|
break;
|
|
case ST_STOP:
|
|
return;
|
|
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--;
|
|
}
|
|
}
|
|
}
|
|
}
|
|
|
|
static int
|
|
strhash(string)
|
|
register char *string;
|
|
{
|
|
register int c;
|
|
|
|
#ifdef HASH_ELFHASH
|
|
register unsigned int h = 0, g;
|
|
|
|
while ((c = *string++) != '\0') {
|
|
h = ( h << 4 ) + c;
|
|
if ( g = h & 0xF0000000 )
|
|
h ^= g >> 24;
|
|
h &= ~g;
|
|
}
|
|
return h;
|
|
#elif HASH_PERL
|
|
register int val = 0;
|
|
|
|
while ((c = *string++) != '\0') {
|
|
val = val*33 + c;
|
|
}
|
|
|
|
return val + (val>>5);
|
|
#else
|
|
register int val = 0;
|
|
|
|
while ((c = *string++) != '\0') {
|
|
val = val*997 + c;
|
|
}
|
|
|
|
return val + (val>>5);
|
|
#endif
|
|
}
|
|
|
|
static int
|
|
numcmp(x, y)
|
|
long x, y;
|
|
{
|
|
return x != y;
|
|
}
|
|
|
|
static int
|
|
numhash(n)
|
|
long n;
|
|
{
|
|
return n;
|
|
}
|