summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog4
-rw-r--r--common.mk3
-rw-r--r--random.c23
-rw-r--r--siphash.c480
-rw-r--r--siphash.h44
-rw-r--r--string.c6
6 files changed, 553 insertions, 7 deletions
@@ -1,3 +1,7 @@
Fri Nov 9 16:08:46 2012 Sokolov Yura funny-falcon <[email protected]>
* array.c: speedup Array#unshift by using space in shared array.
@@ -695,7 +695,8 @@ process.$(OBJEXT): {$(VPATH)}process.c $(RUBY_H_INCLUDES) \
{$(VPATH)}util.h {$(VPATH)}io.h $(ENCODING_H_INCLUDES) {$(VPATH)}dln.h \
$(VM_CORE_H_INCLUDES) {$(VPATH)}debug.h {$(VPATH)}internal.h \
{$(VPATH)}thread.h
-random.$(OBJEXT): {$(VPATH)}random.c $(RUBY_H_INCLUDES)
range.$(OBJEXT): {$(VPATH)}range.c $(RUBY_H_INCLUDES) \
$(ENCODING_H_INCLUDES) {$(VPATH)}internal.h
rational.$(OBJEXT): {$(VPATH)}rational.c $(RUBY_H_INCLUDES) {$(VPATH)}internal.h
@@ -1326,7 +1326,15 @@ random_s_rand(int argc, VALUE *argv, VALUE obj)
return rand_random(argc, argv, rand_start(&default_rand));
}
static st_index_t hashseed;
static VALUE
init_randomseed(struct MT *mt, unsigned int initial[DEFAULT_SEED_CNT])
@@ -1346,6 +1354,7 @@ Init_RandomSeed(void)
unsigned int initial[DEFAULT_SEED_CNT];
struct MT *mt = &r->mt;
VALUE seed = init_randomseed(mt, initial);
hashseed = genrand_int32(mt);
#if SIZEOF_ST_INDEX_T*CHAR_BIT > 4*8
@@ -1361,6 +1370,9 @@ Init_RandomSeed(void)
hashseed |= genrand_int32(mt);
#endif
rb_global_variable(&r->seed);
r->seed = seed;
}
@@ -1371,6 +1383,17 @@ rb_hash_start(st_index_t h)
return st_hash_start(hashseed + h);
}
static void
Init_RandomSeed2(void)
{
@@ -0,0 +1,480 @@
@@ -0,0 +1,44 @@
@@ -2197,12 +2197,6 @@ rb_str_prepend(VALUE str, VALUE str2)
}
st_index_t
-rb_memhash(const void *ptr, long len)
-{
- return st_hash(ptr, len, rb_hash_start((st_index_t)len));
-}
-
-st_index_t
rb_str_hash(VALUE str)
{
int e = ENCODING_GET(str);