X-Git-Url: https://perl5.git.perl.org/perl5.git/blobdiff_plain/20439bc77dfeec46d94a15cf108446039e26c995..09ddd873b3e78c57ed3305c160e5206545a5f1bc:/hv.c diff --git a/hv.c b/hv.c index c040e25..aa1783e 100644 --- a/hv.c +++ b/hv.c @@ -604,21 +604,18 @@ Perl_hv_common(pTHX_ HV *hv, SV *keysv, const char *key, STRLEN klen, } } - if (HvREHASH(hv)) { - PERL_HASH_INTERNAL(hash, key, klen); - /* We don't have a pointer to the hv, so we have to replicate the - flag into every HEK, so that hv_iterkeysv can see it. */ - /* And yes, you do need this even though you are not "storing" because - you can flip the flags below if doing an lval lookup. (And that - was put in to give the semantics Andreas was expecting.) */ + if (HvREHASH(hv) || (!hash && !(keysv && (SvIsCOW_shared_hash(keysv))))) + PERL_HASH_INTERNAL_(hash, key, klen, HvREHASH(hv)); + else if (!hash) + hash = SvSHARED_HASH(keysv); + + /* We don't have a pointer to the hv, so we have to replicate the + flag into every HEK, so that hv_iterkeysv can see it. + And yes, you do need this even though you are not "storing" because + you can flip the flags below if doing an lval lookup. (And that + was put in to give the semantics Andreas was expecting.) */ + if (HvREHASH(hv)) flags |= HVhek_REHASH; - } else if (!hash) { - if (keysv && (SvIsCOW_shared_hash(keysv))) { - hash = SvSHARED_HASH(keysv); - } else { - PERL_HASH(hash, key, klen); - } - } masked_flags = (flags & HVhek_MASK); @@ -682,7 +679,7 @@ Perl_hv_common(pTHX_ HV *hv, SV *keysv, const char *key, STRLEN klen, much back at this point (in hv_store's code). */ break; } - /* LVAL fetch which actaully needs a store. */ + /* LVAL fetch which actually needs a store. */ val = newSV(0); HvPLACEHOLDERS(hv)--; } else { @@ -692,6 +689,7 @@ Perl_hv_common(pTHX_ HV *hv, SV *keysv, const char *key, STRLEN klen, } HeVAL(entry) = val; } else if (action & HV_FETCH_ISSTORE) { + SvREFCNT_dec(HeVAL(entry)); HeVAL(entry) = val; } } else if (HeVAL(entry) == &PL_sv_placeholder) { @@ -734,7 +732,7 @@ Perl_hv_common(pTHX_ HV *hv, SV *keysv, const char *key, STRLEN klen, return NULL; } if (action & HV_FETCH_LVALUE) { - val = newSV(0); + val = action & HV_FETCH_EMPTY_HE ? NULL : newSV(0); if (SvMAGICAL(hv)) { /* At this point the old hv_fetch code would call to hv_store, which in turn might do some tied magic. So we need to make that @@ -799,6 +797,12 @@ Perl_hv_common(pTHX_ HV *hv, SV *keysv, const char *key, STRLEN klen, xhv->xhv_keys++; /* HvTOTALKEYS(hv)++ */ if (!counter) { /* initial entry? */ } else if (xhv->xhv_keys > xhv->xhv_max) { + /* Use only the old HvUSEDKEYS(hv) > HvMAX(hv) condition to limit + bucket splits on a rehashed hash, as we're not going to + split it again, and if someone is lucky (evil) enough to + get all the keys in one list they could exhaust our memory + as we repeatedly double the number of buckets on every + entry. Linear search feels a less worse thing to do. */ hsplit(hv); } else if(!HvREHASH(hv)) { U32 n_links = 1; @@ -807,12 +811,6 @@ Perl_hv_common(pTHX_ HV *hv, SV *keysv, const char *key, STRLEN klen, n_links++; if (n_links > HV_MAX_LENGTH_BEFORE_SPLIT) { - /* Use only the old HvKEYS(hv) > HvMAX(hv) condition to limit - bucket splits on a rehashed hash, as we're not going to - split it again, and if someone is lucky (evil) enough to - get all the keys in one list they could exhaust our memory - as we repeatedly double the number of buckets on every - entry. Linear search feels a less worse thing to do. */ hsplit(hv); } } @@ -903,7 +901,6 @@ S_hv_delete_common(pTHX_ HV *hv, SV *keysv, const char *key, STRLEN klen, register XPVHV* xhv; register HE *entry; register HE **oentry; - HE *const *first_entry; bool is_utf8 = (k_flags & HVhek_UTF8) ? TRUE : FALSE; int masked_flags; @@ -970,22 +967,21 @@ S_hv_delete_common(pTHX_ HV *hv, SV *keysv, const char *key, STRLEN klen, HvHASKFLAGS_on(MUTABLE_SV(hv)); } - if (HvREHASH(hv)) { - PERL_HASH_INTERNAL(hash, key, klen); - } else if (!hash) { - if (keysv && (SvIsCOW_shared_hash(keysv))) { - hash = SvSHARED_HASH(keysv); - } else { - PERL_HASH(hash, key, klen); - } - } + if (HvREHASH(hv) || (!hash && !(keysv && (SvIsCOW_shared_hash(keysv))))) + PERL_HASH_INTERNAL_(hash, key, klen, HvREHASH(hv)); + else if (!hash) + hash = SvSHARED_HASH(keysv); masked_flags = (k_flags & HVhek_MASK); - first_entry = oentry = &(HvARRAY(hv))[hash & (I32) HvMAX(hv)]; + oentry = &(HvARRAY(hv))[hash & (I32) HvMAX(hv)]; entry = *oentry; for (; entry; oentry = &HeNEXT(entry), entry = *oentry) { SV *sv; + U8 mro_changes = 0; /* 1 = isa; 2 = package moved */ + GV *gv = NULL; + HV *stash = NULL; + if (HeHASH(entry) != hash) /* strings can't be equal */ continue; if (HeKLEN(entry) != (I32)klen) @@ -1015,48 +1011,77 @@ S_hv_delete_common(pTHX_ HV *hv, SV *keysv, const char *key, STRLEN klen, if (k_flags & HVhek_FREEKEY) Safefree(key); - if (d_flags & G_DISCARD) - sv = NULL; - else { - sv = sv_2mortal(HeVAL(entry)); - HeVAL(entry) = &PL_sv_placeholder; + /* If this is a stash and the key ends with ::, then someone is + * deleting a package. + */ + if (HeVAL(entry) && HvENAME_get(hv)) { + gv = (GV *)HeVAL(entry); + if (keysv) key = SvPV(keysv, klen); + if (( + (klen > 1 && key[klen-2] == ':' && key[klen-1] == ':') + || + (klen == 1 && key[0] == ':') + ) + && (klen != 6 || hv!=PL_defstash || memNE(key,"main::",6)) + && SvTYPE(gv) == SVt_PVGV && (stash = GvHV((GV *)gv)) + && HvENAME_get(stash)) { + /* A previous version of this code checked that the + * GV was still in the symbol table by fetching the + * GV with its name. That is not necessary (and + * sometimes incorrect), as HvENAME cannot be set + * on hv if it is not in the symtab. */ + mro_changes = 2; + /* Hang on to it for a bit. */ + SvREFCNT_inc_simple_void_NN( + sv_2mortal((SV *)gv) + ); + } + else if (klen == 3 && strnEQ(key, "ISA", 3)) + mro_changes = 1; } + if (d_flags & G_DISCARD) { + sv = HeVAL(entry); + if (sv) { + /* deletion of method from stash */ + if (isGV(sv) && isGV_with_GP(sv) && GvCVu(sv) + && HvENAME_get(hv)) + mro_method_changed_in(hv); + SvREFCNT_dec(sv); + sv = NULL; + } + } else sv = sv_2mortal(HeVAL(entry)); + HeVAL(entry) = &PL_sv_placeholder; + /* * If a restricted hash, rather than really deleting the entry, put * a placeholder there. This marks the key as being "approved", so * we can still access via not-really-existing key without raising * an error. */ - if (SvREADONLY(hv)) { - SvREFCNT_dec(HeVAL(entry)); - HeVAL(entry) = &PL_sv_placeholder; + if (SvREADONLY(hv)) /* We'll be saving this slot, so the number of allocated keys * doesn't go down, but the number placeholders goes up */ HvPLACEHOLDERS(hv)++; - } else { + else { *oentry = HeNEXT(entry); - - /* If this is a stash and the key ends with ::, then someone is - deleting a package. */ - if (sv && HvNAME(hv)) { - if (keysv) key = SvPV(keysv, klen); - if (klen > 1 && key[klen-2] == ':' && key[klen-1] == ':' - && SvTYPE(sv) == SVt_PVGV) { - const HV * const stash = GvHV((GV *)sv); - if (stash && HvNAME(stash)) - mro_package_moved(NULL, stash, NULL, NULL, 0); - } - } - if (SvOOK(hv) && entry == HvAUX(hv)->xhv_eiter /* HvEITER(hv) */) HvLAZYDEL_on(hv); - else + else { + if (SvOOK(hv) && HvLAZYDEL(hv) && + entry == HeNEXT(HvAUX(hv)->xhv_eiter)) + HeNEXT(HvAUX(hv)->xhv_eiter) = HeNEXT(entry); hv_free_ent(hv, entry); + } xhv->xhv_keys--; /* HvTOTALKEYS(hv)-- */ if (xhv->xhv_keys == 0) HvHASKFLAGS_off(hv); } + + if (mro_changes == 1) mro_isa_changed_in(hv); + else if (mro_changes == 2) + mro_package_moved(NULL, stash, gv, 1); + return sv; } if (SvREADONLY(hv)) { @@ -1440,20 +1465,20 @@ Perl_hv_copy_hints_hv(pTHX_ HV *const ohv) return hv; } -void -Perl_hv_free_ent(pTHX_ HV *hv, register HE *entry) +/* like hv_free_ent, but returns the SV rather than freeing it */ +STATIC SV* +S_hv_free_ent_ret(pTHX_ HV *hv, register HE *entry) { dVAR; SV *val; - PERL_ARGS_ASSERT_HV_FREE_ENT; + PERL_ARGS_ASSERT_HV_FREE_ENT_RET; if (!entry) - return; + return NULL; val = HeVAL(entry); - if (val && isGV(val) && isGV_with_GP(val) && GvCVu(val) && HvNAME_get(hv)) + if (val && isGV(val) && isGV_with_GP(val) && GvCVu(val) && HvENAME(hv)) mro_method_changed_in(hv); /* deletion of method from stash */ - SvREFCNT_dec(val); if (HeKLEN(entry) == HEf_SVKEY) { SvREFCNT_dec(HeKEY_sv(entry)); Safefree(HeKEY_hek(entry)); @@ -1463,6 +1488,22 @@ Perl_hv_free_ent(pTHX_ HV *hv, register HE *entry) else Safefree(HeKEY_hek(entry)); del_HE(entry); + return val; +} + + +void +Perl_hv_free_ent(pTHX_ HV *hv, register HE *entry) +{ + dVAR; + SV *val; + + PERL_ARGS_ASSERT_HV_FREE_ENT; + + if (!entry) + return; + val = hv_free_ent_ret(hv, entry); + SvREFCNT_dec(val); } @@ -1486,7 +1527,8 @@ Perl_hv_delayfree_ent(pTHX_ HV *hv, register HE *entry) /* =for apidoc hv_clear -Clears a hash, making it empty. +Frees the all the elements of a hash, leaving it empty. +The XS equivalent of %hash = (). See also L. =cut */ @@ -1523,22 +1565,19 @@ Perl_hv_clear(pTHX_ HV *hv) } } } - goto reset; } + else { + hfreeentries(hv); + HvPLACEHOLDERS_set(hv, 0); - hfreeentries(hv); - HvPLACEHOLDERS_set(hv, 0); - if (HvARRAY(hv)) - Zero(HvARRAY(hv), xhv->xhv_max+1 /* HvMAX(hv)+1 */, HE*); - - if (SvRMAGICAL(hv)) - mg_clear(MUTABLE_SV(hv)); + if (SvRMAGICAL(hv)) + mg_clear(MUTABLE_SV(hv)); - HvHASKFLAGS_off(hv); - HvREHASH_off(hv); - reset: + HvHASKFLAGS_off(hv); + HvREHASH_off(hv); + } if (SvOOK(hv)) { - if(HvNAME_get(hv)) + if(HvENAME_get(hv)) mro_isa_changed_in(hv); HvEITER_set(hv, NULL); } @@ -1584,7 +1623,6 @@ S_clear_placeholders(pTHX_ HV *hv, U32 items) i = HvMAX(hv); do { /* Loop down the linked list heads */ - bool first = TRUE; HE **oentry = &(HvARRAY(hv))[i]; HE *entry; @@ -1593,20 +1631,23 @@ S_clear_placeholders(pTHX_ HV *hv, U32 items) *oentry = HeNEXT(entry); if (entry == HvEITER_get(hv)) HvLAZYDEL_on(hv); - else + else { + if (SvOOK(hv) && HvLAZYDEL(hv) && + entry == HeNEXT(HvAUX(hv)->xhv_eiter)) + HeNEXT(HvAUX(hv)->xhv_eiter) = HeNEXT(entry); hv_free_ent(hv, entry); + } if (--items == 0) { /* Finished. */ HvTOTALKEYS(hv) -= (IV)HvPLACEHOLDERS_get(hv); - if (HvKEYS(hv) == 0) + if (HvUSEDKEYS(hv) == 0) HvHASKFLAGS_off(hv); HvPLACEHOLDERS_set(hv, 0); return; } } else { oentry = &HeNEXT(entry); - first = FALSE; } } } while (--i >= 0); @@ -1618,187 +1659,96 @@ S_clear_placeholders(pTHX_ HV *hv, U32 items) STATIC void S_hfreeentries(pTHX_ HV *hv) { - /* This is the array that we're going to restore */ - HE **const orig_array = HvARRAY(hv); - HEK *name; - int attempts = 100; + STRLEN index = 0; + SV* sv; PERL_ARGS_ASSERT_HFREEENTRIES; - if (!orig_array) - return; - - if (SvOOK(hv)) { - /* If the hash is actually a symbol table with a name, look after the - name. */ - struct xpvhv_aux *iter = HvAUX(hv); - - name = iter->xhv_name; - iter->xhv_name = NULL; - } else { - name = NULL; + while ( ((sv = Perl_hfree_next_entry(aTHX_ hv, &index))) ) { + SvREFCNT_dec(sv); } +} - /* orig_array remains unchanged throughout the loop. If after freeing all - the entries it turns out that one of the little blighters has triggered - an action that has caused HvARRAY to be re-allocated, then we set - array to the new HvARRAY, and try again. */ - - while (1) { - /* This is the one we're going to try to empty. First time round - it's the original array. (Hopefully there will only be 1 time - round) */ - HE ** const array = HvARRAY(hv); - I32 i = HvMAX(hv); - - /* Because we have taken xhv_name out, the only allocated pointer - in the aux structure that might exist is the backreference array. - */ - - if (SvOOK(hv)) { - HE *entry; - struct mro_meta *meta; - struct xpvhv_aux *iter = HvAUX(hv); - /* weak references: if called from sv_clear(), the backrefs - * should already have been killed; if there are any left, its - * because we're doing hv_clear() or hv_undef(), and the HV - * will continue to live. - * Because while freeing the entries we fake up a NULL HvARRAY - * (and hence HvAUX), we need to store the backref array - * somewhere else; but it still needs to be visible in case - * any the things we free happen to call sv_del_backref(). - * We do this by storing it in magic instead. - * If, during the entry freeing, a destructor happens to add - * a new weak backref, then sv_add_backref will look in both - * places (magic in HvAUX) for the AV, but will create a new - * AV in HvAUX if it can't find one (if it finds it in magic, - * it moves it back into HvAUX. So at the end of the iteration - * we have to allow for this. */ - - - if (iter->xhv_backreferences) { - if (SvTYPE(iter->xhv_backreferences) == SVt_PVAV) { - /* The sv_magic will increase the reference count of the AV, - so we need to drop it first. */ - SvREFCNT_dec(iter->xhv_backreferences); - if (AvFILLp(iter->xhv_backreferences) == -1) { - /* Turns out that the array is empty. Just free it. */ - SvREFCNT_dec(iter->xhv_backreferences); - - } else { - sv_magic(MUTABLE_SV(hv), - MUTABLE_SV(iter->xhv_backreferences), - PERL_MAGIC_backref, NULL, 0); - } - } - else { - MAGIC *mg; - sv_magic(MUTABLE_SV(hv), NULL, PERL_MAGIC_backref, NULL, 0); - mg = mg_find(MUTABLE_SV(hv), PERL_MAGIC_backref); - mg->mg_obj = (SV*)iter->xhv_backreferences; - } - iter->xhv_backreferences = NULL; - } - - entry = iter->xhv_eiter; /* HvEITER(hv) */ - if (entry && HvLAZYDEL(hv)) { /* was deleted earlier? */ - HvLAZYDEL_off(hv); - hv_free_ent(hv, entry); - } - iter->xhv_riter = -1; /* HvRITER(hv) = -1 */ - iter->xhv_eiter = NULL; /* HvEITER(hv) = NULL */ - - if((meta = iter->xhv_mro_meta)) { - if (meta->mro_linear_all) { - SvREFCNT_dec(MUTABLE_SV(meta->mro_linear_all)); - meta->mro_linear_all = NULL; - /* This is just acting as a shortcut pointer. */ - meta->mro_linear_current = NULL; - } else if (meta->mro_linear_current) { - /* Only the current MRO is stored, so this owns the data. - */ - SvREFCNT_dec(meta->mro_linear_current); - meta->mro_linear_current = NULL; - } - if(meta->mro_nextmethod) SvREFCNT_dec(meta->mro_nextmethod); - SvREFCNT_dec(meta->isa); - Safefree(meta); - iter->xhv_mro_meta = NULL; - } - - /* There are now no allocated pointers in the aux structure. */ - - SvFLAGS(hv) &= ~SVf_OOK; /* Goodbye, aux structure. */ - /* What aux structure? */ - } - - /* make everyone else think the array is empty, so that the destructors - * called for freed entries can't recursively mess with us */ - HvARRAY(hv) = NULL; - ((XPVHV*) SvANY(hv))->xhv_keys = 0; +/* hfree_next_entry() + * For use only by S_hfreeentries() and sv_clear(). + * Delete the next available HE from hv and return the associated SV. + * Returns null on empty hash. + * indexp is a pointer to the current index into HvARRAY. The index should + * initially be set to 0. hfree_next_entry() may update it. */ - do { - /* Loop down the linked list heads */ - HE *entry = array[i]; +SV* +Perl_hfree_next_entry(pTHX_ HV *hv, STRLEN *indexp) +{ + struct xpvhv_aux *iter; + HE *entry; + HE ** array; +#ifdef DEBUGGING + STRLEN orig_index = *indexp; +#endif - while (entry) { - register HE * const oentry = entry; - entry = HeNEXT(entry); - hv_free_ent(hv, oentry); - } - } while (--i >= 0); + PERL_ARGS_ASSERT_HFREE_NEXT_ENTRY; - /* As there are no allocated pointers in the aux structure, it's now - safe to free the array we just cleaned up, if it's not the one we're - going to put back. */ - if (array != orig_array) { - Safefree(array); - } - - if (!HvARRAY(hv)) { - /* Good. No-one added anything this time round. */ - break; + if (SvOOK(hv) && ((iter = HvAUX(hv))) + && ((entry = iter->xhv_eiter)) ) + { + /* the iterator may get resurrected after each + * destructor call, so check each time */ + if (entry && HvLAZYDEL(hv)) { /* was deleted earlier? */ + HvLAZYDEL_off(hv); + hv_free_ent(hv, entry); + /* warning: at this point HvARRAY may have been + * re-allocated, HvMAX changed etc */ } + iter->xhv_riter = -1; /* HvRITER(hv) = -1 */ + iter->xhv_eiter = NULL; /* HvEITER(hv) = NULL */ + } - if (SvOOK(hv)) { - /* Someone attempted to iterate or set the hash name while we had - the array set to 0. We'll catch backferences on the next time - round the while loop. */ - assert(HvARRAY(hv)); - - if (HvAUX(hv)->xhv_name) { - unshare_hek_or_pvn(HvAUX(hv)->xhv_name, 0, 0, 0); - } - } + if (!((XPVHV*)SvANY(hv))->xhv_keys) + return NULL; - if (--attempts == 0) { - Perl_die(aTHX_ "panic: hfreeentries failed to free hash - something is repeatedly re-creating entries"); + array = HvARRAY(hv); + assert(array); + while ( ! ((entry = array[*indexp])) ) { + if ((*indexp)++ >= HvMAX(hv)) + *indexp = 0; + assert(*indexp != orig_index); + } + array[*indexp] = HeNEXT(entry); + ((XPVHV*) SvANY(hv))->xhv_keys--; + + if ( PL_phase != PERL_PHASE_DESTRUCT && HvENAME(hv) + && HeVAL(entry) && isGV(HeVAL(entry)) + && GvHV(HeVAL(entry)) && HvENAME(GvHV(HeVAL(entry))) + ) { + STRLEN klen; + const char * const key = HePV(entry,klen); + if ((klen > 1 && key[klen-1]==':' && key[klen-2]==':') + || (klen == 1 && key[0] == ':')) { + mro_package_moved( + NULL, GvHV(HeVAL(entry)), + (GV *)HeVAL(entry), 0 + ); } } - - HvARRAY(hv) = orig_array; - - /* If the hash was actually a symbol table, put the name back. */ - if (name) { - /* We have restored the original array. If name is non-NULL, then - the original array had an aux structure at the end. So this is - valid: */ - SvFLAGS(hv) |= SVf_OOK; - HvAUX(hv)->xhv_name = name; - } + return hv_free_ent_ret(hv, entry); } + /* =for apidoc hv_undef -Undefines the hash. +Undefines the hash. The XS equivalent of undef(%hash). + +As well as freeing all the elements of the hash (like hv_clear()), this +also frees any auxiliary data and storage associated with the hash. +See also L. =cut */ void -Perl_hv_undef(pTHX_ HV *hv) +Perl_hv_undef_flags(pTHX_ HV *hv, U32 flags) { dVAR; register XPVHV* xhv; @@ -1809,19 +1759,68 @@ Perl_hv_undef(pTHX_ HV *hv) DEBUG_A(Perl_hv_assert(aTHX_ hv)); xhv = (XPVHV*)SvANY(hv); - if ((name = HvNAME_get(hv)) && !PL_dirty) - mro_isa_changed_in(hv); - - hfreeentries(hv); - if (name) { + /* The name must be deleted before the call to hfreeeeentries so that + CVs are anonymised properly. But the effective name must be pre- + served until after that call (and only deleted afterwards if the + call originated from sv_clear). For stashes with one name that is + both the canonical name and the effective name, hv_name_set has to + allocate an array for storing the effective name. We can skip that + during global destruction, as it does not matter where the CVs point + if they will be freed anyway. */ + /* note that the code following prior to hfreeentries is duplicated + * in sv_clear(), and changes here should be done there too */ + if (PL_phase != PERL_PHASE_DESTRUCT && (name = HvNAME(hv))) { if (PL_stashcache) (void)hv_delete(PL_stashcache, name, HvNAMELEN_get(hv), G_DISCARD); hv_name_set(hv, NULL, 0, 0); } - SvFLAGS(hv) &= ~SVf_OOK; - Safefree(HvARRAY(hv)); - xhv->xhv_max = 7; /* HvMAX(hv) = 7 (it's a normal hash) */ - HvARRAY(hv) = 0; + hfreeentries(hv); + if (SvOOK(hv)) { + struct xpvhv_aux * const aux = HvAUX(hv); + struct mro_meta *meta; + + if ((name = HvENAME_get(hv))) { + if (PL_phase != PERL_PHASE_DESTRUCT) + mro_isa_changed_in(hv); + if (PL_stashcache) + (void)hv_delete( + PL_stashcache, name, HvENAMELEN_get(hv), G_DISCARD + ); + } + + /* If this call originated from sv_clear, then we must check for + * effective names that need freeing, as well as the usual name. */ + name = HvNAME(hv); + if (flags & HV_NAME_SETALL ? !!aux->xhv_name_u.xhvnameu_name : !!name) { + if (name && PL_stashcache) + (void)hv_delete(PL_stashcache, name, HvNAMELEN_get(hv), G_DISCARD); + hv_name_set(hv, NULL, 0, flags); + } + if((meta = aux->xhv_mro_meta)) { + if (meta->mro_linear_all) { + SvREFCNT_dec(MUTABLE_SV(meta->mro_linear_all)); + meta->mro_linear_all = NULL; + /* This is just acting as a shortcut pointer. */ + meta->mro_linear_current = NULL; + } else if (meta->mro_linear_current) { + /* Only the current MRO is stored, so this owns the data. + */ + SvREFCNT_dec(meta->mro_linear_current); + meta->mro_linear_current = NULL; + } + if(meta->mro_nextmethod) SvREFCNT_dec(meta->mro_nextmethod); + SvREFCNT_dec(meta->isa); + Safefree(meta); + aux->xhv_mro_meta = NULL; + } + if (!aux->xhv_name_u.xhvnameu_name && ! aux->xhv_backreferences) + SvFLAGS(hv) &= ~SVf_OOK; + } + if (!SvOOK(hv)) { + Safefree(HvARRAY(hv)); + xhv->xhv_max = 7; /* HvMAX(hv) = 7 (it's a normal hash) */ + HvARRAY(hv) = 0; + } HvPLACEHOLDERS_set(hv, 0); if (SvRMAGICAL(hv)) @@ -1882,7 +1881,8 @@ S_hv_auxinit(HV *hv) { iter->xhv_riter = -1; /* HvRITER(hv) = -1 */ iter->xhv_eiter = NULL; /* HvEITER(hv) = NULL */ - iter->xhv_name = 0; + iter->xhv_name_u.xhvnameu_name = 0; + iter->xhv_name_count = 0; iter->xhv_backreferences = 0; iter->xhv_mro_meta = NULL; return iter; @@ -1892,7 +1892,7 @@ S_hv_auxinit(HV *hv) { =for apidoc hv_iterinit Prepares a starting point to traverse a hash table. Returns the number of -keys in the hash (i.e. the same as C). The return value is +keys in the hash (i.e. the same as C). The return value is currently only meaningful for hashes without tie magic. NOTE: Before version 5.004_65, C used to return the number of @@ -2004,6 +2004,7 @@ Perl_hv_name_set(pTHX_ HV *hv, const char *name, U32 len, U32 flags) dVAR; struct xpvhv_aux *iter; U32 hash; + HEK **spot; PERL_ARGS_ASSERT_HV_NAME_SET; PERL_UNUSED_ARG(flags); @@ -2013,17 +2014,192 @@ Perl_hv_name_set(pTHX_ HV *hv, const char *name, U32 len, U32 flags) if (SvOOK(hv)) { iter = HvAUX(hv); - if (iter->xhv_name) { - unshare_hek_or_pvn(iter->xhv_name, 0, 0, 0); + if (iter->xhv_name_u.xhvnameu_name) { + if(iter->xhv_name_count) { + if(flags & HV_NAME_SETALL) { + HEK ** const name = HvAUX(hv)->xhv_name_u.xhvnameu_names; + HEK **hekp = name + ( + iter->xhv_name_count < 0 + ? -iter->xhv_name_count + : iter->xhv_name_count + ); + while(hekp-- > name+1) + unshare_hek_or_pvn(*hekp, 0, 0, 0); + /* The first elem may be null. */ + if(*name) unshare_hek_or_pvn(*name, 0, 0, 0); + Safefree(name); + spot = &iter->xhv_name_u.xhvnameu_name; + iter->xhv_name_count = 0; + } + else { + if(iter->xhv_name_count > 0) { + /* shift some things over */ + Renew( + iter->xhv_name_u.xhvnameu_names, iter->xhv_name_count + 1, HEK * + ); + spot = iter->xhv_name_u.xhvnameu_names; + spot[iter->xhv_name_count] = spot[1]; + spot[1] = spot[0]; + iter->xhv_name_count = -(iter->xhv_name_count + 1); + } + else if(*(spot = iter->xhv_name_u.xhvnameu_names)) { + unshare_hek_or_pvn(*spot, 0, 0, 0); + } + } + } + else if (flags & HV_NAME_SETALL) { + unshare_hek_or_pvn(iter->xhv_name_u.xhvnameu_name, 0, 0, 0); + spot = &iter->xhv_name_u.xhvnameu_name; + } + else { + HEK * const existing_name = iter->xhv_name_u.xhvnameu_name; + Newx(iter->xhv_name_u.xhvnameu_names, 2, HEK *); + iter->xhv_name_count = -2; + spot = iter->xhv_name_u.xhvnameu_names; + spot[1] = existing_name; + } } + else { spot = &iter->xhv_name_u.xhvnameu_name; iter->xhv_name_count = 0; } } else { if (name == 0) return; iter = hv_auxinit(hv); + spot = &iter->xhv_name_u.xhvnameu_name; } PERL_HASH(hash, name, len); - iter->xhv_name = name ? share_hek(name, len, hash) : NULL; + *spot = name ? share_hek(name, len, hash) : NULL; +} + +/* +=for apidoc hv_ename_add + +Adds a name to a stash's internal list of effective names. See +C. + +This is called when a stash is assigned to a new location in the symbol +table. + +=cut +*/ + +void +Perl_hv_ename_add(pTHX_ HV *hv, const char *name, U32 len, U32 flags) +{ + dVAR; + struct xpvhv_aux *aux = SvOOK(hv) ? HvAUX(hv) : hv_auxinit(hv); + U32 hash; + + PERL_ARGS_ASSERT_HV_ENAME_ADD; + PERL_UNUSED_ARG(flags); + + if (len > I32_MAX) + Perl_croak(aTHX_ "panic: hv name too long (%"UVuf")", (UV) len); + + PERL_HASH(hash, name, len); + + if (aux->xhv_name_count) { + HEK ** const xhv_name = aux->xhv_name_u.xhvnameu_names; + I32 count = aux->xhv_name_count; + HEK **hekp = xhv_name + (count < 0 ? -count : count); + while (hekp-- > xhv_name) + if ( + HEK_LEN(*hekp) == (I32)len && memEQ(HEK_KEY(*hekp), name, len) + ) { + if (hekp == xhv_name && count < 0) + aux->xhv_name_count = -count; + return; + } + if (count < 0) aux->xhv_name_count--, count = -count; + else aux->xhv_name_count++; + Renew(aux->xhv_name_u.xhvnameu_names, count + 1, HEK *); + (aux->xhv_name_u.xhvnameu_names)[count] = share_hek(name, len, hash); + } + else { + HEK *existing_name = aux->xhv_name_u.xhvnameu_name; + if ( + existing_name && HEK_LEN(existing_name) == (I32)len + && memEQ(HEK_KEY(existing_name), name, len) + ) return; + Newx(aux->xhv_name_u.xhvnameu_names, 2, HEK *); + aux->xhv_name_count = existing_name ? 2 : -2; + *aux->xhv_name_u.xhvnameu_names = existing_name; + (aux->xhv_name_u.xhvnameu_names)[1] = share_hek(name, len, hash); + } +} + +/* +=for apidoc hv_ename_delete + +Removes a name from a stash's internal list of effective names. If this is +the name returned by C, then another name in the list will take +its place (C will use it). + +This is called when a stash is deleted from the symbol table. + +=cut +*/ + +void +Perl_hv_ename_delete(pTHX_ HV *hv, const char *name, U32 len, U32 flags) +{ + dVAR; + struct xpvhv_aux *aux; + + PERL_ARGS_ASSERT_HV_ENAME_DELETE; + PERL_UNUSED_ARG(flags); + + if (len > I32_MAX) + Perl_croak(aTHX_ "panic: hv name too long (%"UVuf")", (UV) len); + + if (!SvOOK(hv)) return; + + aux = HvAUX(hv); + if (!aux->xhv_name_u.xhvnameu_name) return; + + if (aux->xhv_name_count) { + HEK ** const namep = aux->xhv_name_u.xhvnameu_names; + I32 const count = aux->xhv_name_count; + HEK **victim = namep + (count < 0 ? -count : count); + while (victim-- > namep + 1) + if ( + HEK_LEN(*victim) == (I32)len + && memEQ(HEK_KEY(*victim), name, len) + ) { + unshare_hek_or_pvn(*victim, 0, 0, 0); + if (count < 0) ++aux->xhv_name_count; + else --aux->xhv_name_count; + if ( + (aux->xhv_name_count == 1 || aux->xhv_name_count == -1) + && !*namep + ) { /* if there are none left */ + Safefree(namep); + aux->xhv_name_u.xhvnameu_names = NULL; + aux->xhv_name_count = 0; + } + else { + /* Move the last one back to fill the empty slot. It + does not matter what order they are in. */ + *victim = *(namep + (count < 0 ? -count : count) - 1); + } + return; + } + if ( + count > 0 && HEK_LEN(*namep) == (I32)len + && memEQ(HEK_KEY(*namep),name,len) + ) { + aux->xhv_name_count = -count; + } + } + else if( + HEK_LEN(aux->xhv_name_u.xhvnameu_name) == (I32)len + && memEQ(HEK_KEY(aux->xhv_name_u.xhvnameu_name), name, len) + ) { + HEK * const namehek = aux->xhv_name_u.xhvnameu_name; + Newx(aux->xhv_name_u.xhvnameu_names, 1, HEK *); + *aux->xhv_name_u.xhvnameu_names = namehek; + aux->xhv_name_count = -1; + } } AV ** @@ -2346,7 +2522,6 @@ S_unshare_hek_or_pvn(pTHX_ const HEK *hek, const char *str, I32 len, U32 hash) register XPVHV* xhv; HE *entry; register HE **oentry; - HE **first; bool is_utf8 = FALSE; int k_flags = 0; const char * const save = str; @@ -2387,7 +2562,7 @@ S_unshare_hek_or_pvn(pTHX_ const HEK *hek, const char *str, I32 len, U32 hash) } */ xhv = (XPVHV*)SvANY(PL_strtab); /* assert(xhv_array != 0) */ - first = oentry = &(HvARRAY(PL_strtab))[hash & (I32) HvMAX(PL_strtab)]; + oentry = &(HvARRAY(PL_strtab))[hash & (I32) HvMAX(PL_strtab)]; if (he) { const HE *const he_he = &(he->shared_he_he); for (entry = *oentry; entry; oentry = &HeNEXT(entry), entry = *oentry) { @@ -2531,7 +2706,7 @@ S_share_hek_flags(pTHX_ const char *str, I32 len, register U32 hash, int flags) xhv->xhv_keys++; /* HvTOTALKEYS(hv)++ */ if (!next) { /* initial entry? */ - } else if (xhv->xhv_keys > xhv->xhv_max /* HvKEYS(hv) > HvMAX(hv) */) { + } else if (xhv->xhv_keys > xhv->xhv_max /* HvUSEDKEYS(hv) > HvMAX(hv) */) { hsplit(PL_strtab); } } @@ -2967,12 +3142,16 @@ Perl_refcounted_he_new_pvn(pTHX_ struct refcounted_he *parent, if (!hash) PERL_HASH(hash, keypv, keylen); +#ifdef USE_ITHREADS he = (struct refcounted_he*) PerlMemShared_malloc(sizeof(struct refcounted_he) - 1 -#ifdef USE_ITHREADS + keylen -#endif + key_offset); +#else + he = (struct refcounted_he*) + PerlMemShared_malloc(sizeof(struct refcounted_he) - 1 + + key_offset); +#endif he->refcounted_he_next = parent; @@ -3094,6 +3273,7 @@ to this function: no action occurs and a null pointer is returned. struct refcounted_he * Perl_refcounted_he_inc(pTHX_ struct refcounted_he *he) { + dVAR; if (he) { HINTS_REFCNT_LOCK; he->refcounted_he_refcnt++; @@ -3148,7 +3328,7 @@ Perl_store_cop_label(pTHX_ COP *const cop, const char *label, STRLEN len, if (flags & ~(SVf_UTF8)) Perl_croak(aTHX_ "panic: store_cop_label illegal flag bits 0x%" UVxf, (UV)flags); - labelsv = sv_2mortal(newSVpvn(label, len)); + labelsv = newSVpvn_flags(label, len, SVs_TEMP); if (flags & SVf_UTF8) SvUTF8_on(labelsv); cop->cop_hints_hash