In perl.git, the branch smoke-me/yves-hv_h_split has been updated <http://perl5.git.perl.org/perl.git/commitdiff/eb42ee0f1884f3760bc0d02978c5142ebad8d58e?hp=446fd1ffe83e034df2379a9b0629051867268466>
- Log ----------------------------------------------------------------- commit eb42ee0f1884f3760bc0d02978c5142ebad8d58e Author: Yves Orton <[email protected]> Date: Mon Mar 18 14:20:09 2013 +0100 resolve test fails under threads ----------------------------------------------------------------------- Summary of changes: embed.fnc | 2 +- embed.h | 2 +- hv.c | 2 +- proto.h | 4 ++-- util.c | 4 ++-- 5 files changed, 7 insertions(+), 7 deletions(-) diff --git a/embed.fnc b/embed.fnc index 21caa48..ba20cf7 100644 --- a/embed.fnc +++ b/embed.fnc @@ -1779,7 +1779,7 @@ s |void |unshare_hek_or_pvn|NULLOK const HEK* hek|NULLOK const char* str|I32 len sR |HEK* |share_hek_flags|NN const char *str|I32 len|U32 hash|int flags rs |void |hv_notallowed |int flags|NN const char *key|I32 klen|NN const char *msg sn |U32|ptr_hash|PTRV u -sn |struct xpvhv_aux*|hv_auxinit|NN HV *hv +s |struct xpvhv_aux*|hv_auxinit|NN HV *hv sM |SV* |hv_delete_common|NULLOK HV *hv|NULLOK SV *keysv \ |NULLOK const char *key|STRLEN klen|int k_flags|I32 d_flags \ |U32 hash diff --git a/embed.h b/embed.h index 0ea6928..7f9be53 100644 --- a/embed.h +++ b/embed.h @@ -1376,7 +1376,7 @@ #define clear_placeholders(a,b) S_clear_placeholders(aTHX_ a,b) #define hfreeentries(a) S_hfreeentries(aTHX_ a) #define hsplit(a,b,c) S_hsplit(aTHX_ a,b,c) -#define hv_auxinit S_hv_auxinit +#define hv_auxinit(a) S_hv_auxinit(aTHX_ a) #define hv_delete_common(a,b,c,d,e,f,g) S_hv_delete_common(aTHX_ a,b,c,d,e,f,g) #define hv_free_ent_ret(a,b) S_hv_free_ent_ret(aTHX_ a,b) #define hv_magic_check S_hv_magic_check diff --git a/hv.c b/hv.c index a8b9eff..0821841 100644 --- a/hv.c +++ b/hv.c @@ -1830,7 +1830,7 @@ PERL_STATIC_INLINE U32 S_ptr_hash(PTRV u) { static struct xpvhv_aux* -S_hv_auxinit(HV *hv) { +S_hv_auxinit(pTHX_ HV *hv) { struct xpvhv_aux *iter; char *array; diff --git a/proto.h b/proto.h index af58308..3d546a0 100644 --- a/proto.h +++ b/proto.h @@ -5706,8 +5706,8 @@ STATIC void S_hsplit(pTHX_ HV *hv, STRLEN const oldsize, STRLEN newsize) #define PERL_ARGS_ASSERT_HSPLIT \ assert(hv) -STATIC struct xpvhv_aux* S_hv_auxinit(HV *hv) - __attribute__nonnull__(1); +STATIC struct xpvhv_aux* S_hv_auxinit(pTHX_ HV *hv) + __attribute__nonnull__(pTHX_1); #define PERL_ARGS_ASSERT_HV_AUXINIT \ assert(hv) diff --git a/util.c b/util.c index 6666815..5c695b8 100644 --- a/util.c +++ b/util.c @@ -5681,8 +5681,8 @@ Perl_get_hash_seed(pTHX_ unsigned char *seed_buffer) else #endif { - (void)seedDrand01((Rand_seed_t)seed()); unsigned char *ptr= seed_buffer; + (void)seedDrand01((Rand_seed_t)seed()); while (ptr < end) { *ptr++ = (unsigned char)(Drand01() * (U8_MAX+1)); @@ -5692,8 +5692,8 @@ Perl_get_hash_seed(pTHX_ unsigned char *seed_buffer) * This value is highly volatile, it is updated every * hash insert, and is used as part of hash bucket chain * randomization and hash iterator randomization. */ + unsigned long i; PL_hash_rand_bits= 0; - int i; for( i = 0; i < sizeof(UV) ; i++ ) { PL_hash_rand_bits = (PL_hash_rand_bits << 8) | seed_buffer[i % PERL_HASH_SEED_BYTES]; } -- Perl5 Master Repository
