X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=blobdiff_plain;f=hv.c;h=6fd6f2f3b03b572663b318556e62c30883be6f61;hb=e91177edb0beae74fd07fb1ec08a528ab1fb63c2;hp=6dfa9b1bb36d1378f27af80d43ac2396fc9350de;hpb=effa1e2ddfeaa0d3577f49b2ffc9a13dbf31279f;p=p5sagit%2Fp5-mst-13.2.git diff --git a/hv.c b/hv.c index 6dfa9b1..6fd6f2f 100644 --- a/hv.c +++ b/hv.c @@ -1,6 +1,6 @@ /* hv.c * - * Copyright (c) 1991-1994, Larry Wall + * Copyright (c) 1991-1997, Larry Wall * * You may distribute under the terms of either the GNU General Public * License or the Artistic License, as specified in the README file. @@ -14,13 +14,15 @@ #include "EXTERN.h" #include "perl.h" +static void hv_magic_check _((HV *hv, bool *needs_copy, bool *needs_store)); +#ifndef PERL_OBJECT static void hsplit _((HV *hv)); static void hfreeentries _((HV *hv)); +static HE* more_he _((void)); +#endif -static HE* more_he(); - -static HE* -new_he() +STATIC HE* +new_he(void) { HE* he; if (he_root) { @@ -31,20 +33,19 @@ new_he() return more_he(); } -static void -del_he(p) -HE* p; +STATIC void +del_he(HE *p) { HeNEXT(p) = (HE*)he_root; he_root = p; } -static HE* -more_he() +STATIC HE* +more_he(void) { register HE* he; register HE* heend; - he_root = (HE*)safemalloc(1008); + New(54, he_root, 1008/sizeof(HE), HE); he = he_root; heend = &he[1008 / sizeof(HE) - 1]; while (he < heend) { @@ -55,15 +56,32 @@ more_he() return new_he(); } +STATIC HEK * +save_hek(char *str, I32 len, U32 hash) +{ + char *k; + register HEK *hek; + + New(54, k, HEK_BASESIZE + len + 1, char); + hek = (HEK*)k; + Copy(str, HEK_KEY(hek), len, char); + *(HEK_KEY(hek) + len) = '\0'; + HEK_LEN(hek) = len; + HEK_HASH(hek) = hash; + return hek; +} + +void +unshare_hek(HEK *hek) +{ + unsharepvn(HEK_KEY(hek),HEK_LEN(hek),HEK_HASH(hek)); +} + /* (klen == HEf_SVKEY) is special for MAGICAL hv entries, meaning key slot * contains an SV* */ SV** -hv_fetch(hv,key,klen,lval) -HV *hv; -char *key; -U32 klen; -I32 lval; +hv_fetch(HV *hv, char *key, U32 klen, I32 lval) { register XPVHV* xhv; register U32 hash; @@ -75,11 +93,25 @@ I32 lval; if (SvRMAGICAL(hv)) { if (mg_find((SV*)hv,'P')) { + dTHR; sv = sv_newmortal(); mg_copy((SV*)hv, sv, key, klen); - Sv = sv; - return &Sv; + hv_fetch_sv = sv; + return &hv_fetch_sv; + } +#ifdef ENV_IS_CASELESS + else if (mg_find((SV*)hv,'E')) { + U32 i; + for (i = 0; i < klen; ++i) + if (isLOWER(key[i])) { + char *nkey = strupr(SvPVX(sv_2mortal(newSVpv(key,klen)))); + SV **ret = hv_fetch(hv, nkey, klen, 0); + if (!ret && lval) + ret = hv_store(hv, key, klen, NEWSV(61,0), 0); + return ret; + } } +#endif } xhv = (XPVHV*)SvANY(hv); @@ -102,7 +134,7 @@ I32 lval; continue; if (HeKLEN(entry) != klen) continue; - if (memcmp(HeKEY(entry),key,klen)) /* is this it? */ + if (memNE(HeKEY(entry),key,klen)) /* is this it? */ continue; return &HeVAL(entry); } @@ -110,9 +142,9 @@ I32 lval; if (HvNAME(hv) && strEQ(HvNAME(hv),ENV_HV_NAME)) { char *gotenv; - gotenv = my_getenv(key); - if (gotenv != NULL) { + if ((gotenv = PerlEnv_getenv(key)) != Nullch) { sv = newSVpv(gotenv,strlen(gotenv)); + SvTAINTED_on(sv); return hv_store(hv,key,klen,sv,hash); } } @@ -127,11 +159,7 @@ I32 lval; /* returns a HE * structure with the all fields set */ /* note that hent_val will be a mortal sv for MAGICAL hashes */ HE * -hv_fetch_ent(hv,keysv,lval,hash) -HV *hv; -SV *keysv; -I32 lval; -register U32 hash; +hv_fetch_ent(HV *hv, SV *keysv, I32 lval, register U32 hash) { register XPVHV* xhv; register char *key; @@ -142,15 +170,36 @@ register U32 hash; if (!hv) return 0; - if (SvRMAGICAL(hv) && mg_find((SV*)hv,'P')) { - sv = sv_newmortal(); - keysv = sv_2mortal(newSVsv(keysv)); - mg_copy((SV*)hv, sv, (char*)keysv, HEf_SVKEY); - entry = &He; - HeVAL(entry) = sv; - HeKEY(entry) = (char*)keysv; - HeKLEN(entry) = HEf_SVKEY; /* hent_key is holding an SV* */ - return entry; + if (SvRMAGICAL(hv)) { + if (mg_find((SV*)hv,'P')) { + dTHR; + sv = sv_newmortal(); + keysv = sv_2mortal(newSVsv(keysv)); + mg_copy((SV*)hv, sv, (char*)keysv, HEf_SVKEY); + if (!HeKEY_hek(&hv_fetch_ent_mh)) { + char *k; + New(54, k, HEK_BASESIZE + sizeof(SV*), char); + HeKEY_hek(&hv_fetch_ent_mh) = (HEK*)k; + } + HeSVKEY_set(&hv_fetch_ent_mh, keysv); + HeVAL(&hv_fetch_ent_mh) = sv; + return &hv_fetch_ent_mh; + } +#ifdef ENV_IS_CASELESS + else if (mg_find((SV*)hv,'E')) { + U32 i; + key = SvPV(keysv, klen); + for (i = 0; i < klen; ++i) + if (isLOWER(key[i])) { + SV *nkeysv = sv_2mortal(newSVpv(key,klen)); + (void)strupr(SvPVX(nkeysv)); + entry = hv_fetch_ent(hv, nkeysv, 0, 0); + if (!entry && lval) + entry = hv_store_ent(hv, keysv, NEWSV(61,0), hash); + return entry; + } + } +#endif } xhv = (XPVHV*)SvANY(hv); @@ -176,7 +225,7 @@ register U32 hash; continue; if (HeKLEN(entry) != klen) continue; - if (memcmp(HeKEY(entry),key,klen)) /* is this it? */ + if (memNE(HeKEY(entry),key,klen)) /* is this it? */ continue; return entry; } @@ -184,9 +233,9 @@ register U32 hash; if (HvNAME(hv) && strEQ(HvNAME(hv),ENV_HV_NAME)) { char *gotenv; - gotenv = my_getenv(key); - if (gotenv != NULL) { + if ((gotenv = PerlEnv_getenv(key)) != Nullch) { sv = newSVpv(gotenv,strlen(gotenv)); + SvTAINTED_on(sv); return hv_store_ent(hv,keysv,sv,hash); } } @@ -198,13 +247,27 @@ register U32 hash; return 0; } +static void +hv_magic_check (HV *hv, bool *needs_copy, bool *needs_store) +{ + MAGIC *mg = SvMAGIC(hv); + *needs_copy = FALSE; + *needs_store = TRUE; + while (mg) { + if (isUPPER(mg->mg_type)) { + *needs_copy = TRUE; + switch (mg->mg_type) { + case 'P': + case 'S': + *needs_store = FALSE; + } + } + mg = mg->mg_moremagic; + } +} + SV** -hv_store(hv,key,klen,val,hash) -HV *hv; -char *key; -U32 klen; -SV *val; -register U32 hash; +hv_store(HV *hv, char *key, U32 klen, SV *val, register U32 hash) { register XPVHV* xhv; register I32 i; @@ -216,15 +279,21 @@ register U32 hash; xhv = (XPVHV*)SvANY(hv); if (SvMAGICAL(hv)) { - mg_copy((SV*)hv, val, key, klen); -#ifndef OVERLOAD - if (!xhv->xhv_array) - return 0; -#else - if (!xhv->xhv_array && (SvMAGIC(hv)->mg_type != 'A' - || SvMAGIC(hv)->mg_moremagic)) - return 0; -#endif /* OVERLOAD */ + bool needs_copy; + bool needs_store; + hv_magic_check (hv, &needs_copy, &needs_store); + if (needs_copy) { + mg_copy((SV*)hv, val, key, klen); + if (!xhv->xhv_array && !needs_store) + return 0; +#ifdef ENV_IS_CASELESS + else if (mg_find((SV*)hv,'E')) { + SV *sv = sv_2mortal(newSVpv(key,klen)); + key = strupr(SvPVX(sv)); + hash = 0; + } +#endif + } } if (!hash) PERL_HASH(hash, key, klen); @@ -240,7 +309,7 @@ register U32 hash; continue; if (HeKLEN(entry) != klen) continue; - if (memcmp(HeKEY(entry),key,klen)) /* is this it? */ + if (memNE(HeKEY(entry),key,klen)) /* is this it? */ continue; SvREFCNT_dec(HeVAL(entry)); HeVAL(entry) = val; @@ -248,13 +317,11 @@ register U32 hash; } entry = new_he(); - HeKLEN(entry) = klen; if (HvSHAREKEYS(hv)) - HeKEY(entry) = sharepvn(key, klen, hash); + HeKEY_hek(entry) = share_hek(key, klen, hash); else /* gotta do the real thing */ - HeKEY(entry) = savepvn(key,klen); + HeKEY_hek(entry) = save_hek(key, klen, hash); HeVAL(entry) = val; - HeHASH(entry) = hash; HeNEXT(entry) = *oentry; *oentry = entry; @@ -269,11 +336,7 @@ register U32 hash; } HE * -hv_store_ent(hv,keysv,val,hash) -HV *hv; -SV *keysv; -SV *val; -register U32 hash; +hv_store_ent(HV *hv, SV *keysv, SV *val, register U32 hash) { register XPVHV* xhv; register char *key; @@ -287,20 +350,32 @@ register U32 hash; xhv = (XPVHV*)SvANY(hv); if (SvMAGICAL(hv)) { - keysv = sv_2mortal(newSVsv(keysv)); - mg_copy((SV*)hv, val, (char*)keysv, HEf_SVKEY); -#ifndef OVERLOAD - if (!xhv->xhv_array) - return Nullhe; -#else - if (!xhv->xhv_array && (SvMAGIC(hv)->mg_type != 'A' - || SvMAGIC(hv)->mg_moremagic)) - return Nullhe; -#endif /* OVERLOAD */ + dTHR; + bool needs_copy; + bool needs_store; + hv_magic_check (hv, &needs_copy, &needs_store); + if (needs_copy) { + bool save_taint = tainted; + if (tainting) + tainted = SvTAINTED(keysv); + keysv = sv_2mortal(newSVsv(keysv)); + mg_copy((SV*)hv, val, (char*)keysv, HEf_SVKEY); + TAINT_IF(save_taint); + if (!xhv->xhv_array && !needs_store) + return Nullhe; +#ifdef ENV_IS_CASELESS + else if (mg_find((SV*)hv,'E')) { + key = SvPV(keysv, klen); + keysv = sv_2mortal(newSVpv(key,klen)); + (void)strupr(SvPVX(keysv)); + hash = 0; + } +#endif + } } key = SvPV(keysv, klen); - + if (!hash) PERL_HASH(hash, key, klen); @@ -315,7 +390,7 @@ register U32 hash; continue; if (HeKLEN(entry) != klen) continue; - if (memcmp(HeKEY(entry),key,klen)) /* is this it? */ + if (memNE(HeKEY(entry),key,klen)) /* is this it? */ continue; SvREFCNT_dec(HeVAL(entry)); HeVAL(entry) = val; @@ -323,13 +398,11 @@ register U32 hash; } entry = new_he(); - HeKLEN(entry) = klen; if (HvSHAREKEYS(hv)) - HeKEY(entry) = sharepvn(key, klen, hash); + HeKEY_hek(entry) = share_hek(key, klen, hash); else /* gotta do the real thing */ - HeKEY(entry) = savepvn(key,klen); + HeKEY_hek(entry) = save_hek(key, klen, hash); HeVAL(entry) = val; - HeHASH(entry) = hash; HeNEXT(entry) = *oentry; *oentry = entry; @@ -344,31 +417,40 @@ register U32 hash; } SV * -hv_delete(hv,key,klen,flags) -HV *hv; -char *key; -U32 klen; -I32 flags; +hv_delete(HV *hv, char *key, U32 klen, I32 flags) { register XPVHV* xhv; register I32 i; register U32 hash; register HE *entry; register HE **oentry; + SV **svp; SV *sv; if (!hv) return Nullsv; if (SvRMAGICAL(hv)) { - sv = *hv_fetch(hv, key, klen, TRUE); - mg_clear(sv); - if (mg_find(sv, 's')) { - return Nullsv; /* %SIG elements cannot be deleted */ - } - if (mg_find(sv, 'p')) { - sv_unmagic(sv, 'p'); /* No longer an element */ - return sv; - } + bool needs_copy; + bool needs_store; + hv_magic_check (hv, &needs_copy, &needs_store); + + if (needs_copy && (svp = hv_fetch(hv, key, klen, TRUE))) { + sv = *svp; + mg_clear(sv); + if (!needs_store) { + if (mg_find(sv, 'p')) { + sv_unmagic(sv, 'p'); /* No longer an element */ + return sv; + } + return Nullsv; /* element cannot be deleted */ + } +#ifdef ENV_IS_CASELESS + else if (mg_find((SV*)hv,'E')) { + sv = sv_2mortal(newSVpv(key,klen)); + key = strupr(SvPVX(sv)); + } +#endif + } } xhv = (XPVHV*)SvANY(hv); if (!xhv->xhv_array) @@ -384,7 +466,7 @@ I32 flags; continue; if (HeKLEN(entry) != klen) continue; - if (memcmp(HeKEY(entry),key,klen)) /* is this it? */ + if (memNE(HeKEY(entry),key,klen)) /* is this it? */ continue; *oentry = HeNEXT(entry); if (i && !*oentry) @@ -394,9 +476,9 @@ I32 flags; else sv = sv_mortalcopy(HeVAL(entry)); if (entry == xhv->xhv_eiter) - HeKLEN(entry) = HEf_LAZYDEL; + HvLAZYDEL_on(hv); else - he_free(entry, HvSHAREKEYS(hv)); + hv_free_ent(hv, entry); --xhv->xhv_keys; return sv; } @@ -404,11 +486,7 @@ I32 flags; } SV * -hv_delete_ent(hv,keysv,flags,hash) -HV *hv; -SV *keysv; -I32 flags; -U32 hash; +hv_delete_ent(HV *hv, SV *keysv, I32 flags, U32 hash) { register XPVHV* xhv; register I32 i; @@ -421,12 +499,28 @@ U32 hash; if (!hv) return Nullsv; if (SvRMAGICAL(hv)) { - entry = hv_fetch_ent(hv, keysv, TRUE, hash); - sv = HeVAL(entry); - mg_clear(sv); - if (mg_find(sv, 'p')) { - sv_unmagic(sv, 'p'); /* No longer an element */ - return sv; + bool needs_copy; + bool needs_store; + hv_magic_check (hv, &needs_copy, &needs_store); + + if (needs_copy && (entry = hv_fetch_ent(hv, keysv, TRUE, hash))) { + sv = HeVAL(entry); + mg_clear(sv); + if (!needs_store) { + if (mg_find(sv, 'p')) { + sv_unmagic(sv, 'p'); /* No longer an element */ + return sv; + } + return Nullsv; /* element cannot be deleted */ + } +#ifdef ENV_IS_CASELESS + else if (mg_find((SV*)hv,'E')) { + key = SvPV(keysv, klen); + keysv = sv_2mortal(newSVpv(key,klen)); + (void)strupr(SvPVX(keysv)); + hash = 0; + } +#endif } } xhv = (XPVHV*)SvANY(hv); @@ -446,7 +540,7 @@ U32 hash; continue; if (HeKLEN(entry) != klen) continue; - if (memcmp(HeKEY(entry),key,klen)) /* is this it? */ + if (memNE(HeKEY(entry),key,klen)) /* is this it? */ continue; *oentry = HeNEXT(entry); if (i && !*oentry) @@ -456,9 +550,9 @@ U32 hash; else sv = sv_mortalcopy(HeVAL(entry)); if (entry == xhv->xhv_eiter) - HeKLEN(entry) = HEf_LAZYDEL; + HvLAZYDEL_on(hv); else - he_free(entry, HvSHAREKEYS(hv)); + hv_free_ent(hv, entry); --xhv->xhv_keys; return sv; } @@ -466,10 +560,7 @@ U32 hash; } bool -hv_exists(hv,key,klen) -HV *hv; -char *key; -U32 klen; +hv_exists(HV *hv, char *key, U32 klen) { register XPVHV* xhv; register U32 hash; @@ -481,11 +572,18 @@ U32 klen; if (SvRMAGICAL(hv)) { if (mg_find((SV*)hv,'P')) { + dTHR; sv = sv_newmortal(); mg_copy((SV*)hv, sv, key, klen); magic_existspack(sv, mg_find(sv, 'p')); return SvTRUE(sv); } +#ifdef ENV_IS_CASELESS + else if (mg_find((SV*)hv,'E')) { + sv = sv_2mortal(newSVpv(key,klen)); + key = strupr(SvPVX(sv)); + } +#endif } xhv = (XPVHV*)SvANY(hv); @@ -500,7 +598,7 @@ U32 klen; continue; if (HeKLEN(entry) != klen) continue; - if (memcmp(HeKEY(entry),key,klen)) /* is this it? */ + if (memNE(HeKEY(entry),key,klen)) /* is this it? */ continue; return TRUE; } @@ -509,10 +607,7 @@ U32 klen; bool -hv_exists_ent(hv,keysv,hash) -HV *hv; -SV *keysv; -U32 hash; +hv_exists_ent(HV *hv, SV *keysv, U32 hash) { register XPVHV* xhv; register char *key; @@ -525,12 +620,21 @@ U32 hash; if (SvRMAGICAL(hv)) { if (mg_find((SV*)hv,'P')) { + dTHR; /* just for SvTRUE */ sv = sv_newmortal(); keysv = sv_2mortal(newSVsv(keysv)); mg_copy((SV*)hv, sv, (char*)keysv, HEf_SVKEY); magic_existspack(sv, mg_find(sv, 'p')); return SvTRUE(sv); } +#ifdef ENV_IS_CASELESS + else if (mg_find((SV*)hv,'E')) { + key = SvPV(keysv, klen); + keysv = sv_2mortal(newSVpv(key,klen)); + (void)strupr(SvPVX(keysv)); + hash = 0; + } +#endif } xhv = (XPVHV*)SvANY(hv); @@ -547,16 +651,15 @@ U32 hash; continue; if (HeKLEN(entry) != klen) continue; - if (memcmp(HeKEY(entry),key,klen)) /* is this it? */ + if (memNE(HeKEY(entry),key,klen)) /* is this it? */ continue; return TRUE; } return FALSE; } -static void -hsplit(hv) -HV *hv; +STATIC void +hsplit(HV *hv) { register XPVHV* xhv = (XPVHV*)SvANY(hv); I32 oldsize = (I32) xhv->xhv_max + 1; /* sic(k) */ @@ -574,6 +677,10 @@ HV *hv; nomemok = TRUE; #ifdef STRANGE_MALLOC Renew(a, newsize, HE*); + if (!a) { + nomemok = FALSE; + return; + } #else i = newsize * sizeof(HE*); #define MALLOC_OVERHEAD 16 @@ -584,10 +691,14 @@ HV *hv; tmp /= sizeof(HE*); assert(tmp >= newsize); New(2,a, tmp, HE*); + if (!a) { + nomemok = FALSE; + return; + } Copy(xhv->xhv_array, a, oldsize, HE*); - if (oldsize >= 64 && !nice_chunk) { - nice_chunk = (char*)xhv->xhv_array; - nice_chunk_size = oldsize * sizeof(HE*) * 2 - MALLOC_OVERHEAD; + if (oldsize >= 64) { + offer_nice_chunk(xhv->xhv_array, + oldsize * sizeof(HE*) * 2 - MALLOC_OVERHEAD); } else Safefree(xhv->xhv_array); @@ -619,8 +730,92 @@ HV *hv; } } +void +hv_ksplit(HV *hv, IV newmax) +{ + register XPVHV* xhv = (XPVHV*)SvANY(hv); + I32 oldsize = (I32) xhv->xhv_max + 1; /* sic(k) */ + register I32 newsize; + register I32 i; + register I32 j; + register HE **a; + register HE *entry; + register HE **oentry; + + newsize = (I32) newmax; /* possible truncation here */ + if (newsize != newmax || newmax <= oldsize) + return; + while ((newsize & (1 + ~newsize)) != newsize) { + newsize &= ~(newsize & (1 + ~newsize)); /* get proper power of 2 */ + } + if (newsize < newmax) + newsize *= 2; + if (newsize < newmax) + return; /* overflow detection */ + + a = (HE**)xhv->xhv_array; + if (a) { + nomemok = TRUE; +#ifdef STRANGE_MALLOC + Renew(a, newsize, HE*); + if (!a) { + nomemok = FALSE; + return; + } +#else + i = newsize * sizeof(HE*); + j = MALLOC_OVERHEAD; + while (j - MALLOC_OVERHEAD < i) + j += j; + j -= MALLOC_OVERHEAD; + j /= sizeof(HE*); + assert(j >= newsize); + New(2, a, j, HE*); + if (!a) { + nomemok = FALSE; + return; + } + Copy(xhv->xhv_array, a, oldsize, HE*); + if (oldsize >= 64) { + offer_nice_chunk(xhv->xhv_array, + oldsize * sizeof(HE*) * 2 - MALLOC_OVERHEAD); + } + else + Safefree(xhv->xhv_array); +#endif + nomemok = FALSE; + Zero(&a[oldsize], newsize-oldsize, HE*); /* zero 2nd half*/ + } + else { + Newz(0, a, newsize, HE*); + } + xhv->xhv_max = --newsize; + xhv->xhv_array = (char*)a; + if (!xhv->xhv_fill) /* skip rest if no entries */ + return; + + for (i=0; ixhv_fill++; + a[j] = entry; + continue; + } + else + oentry = &HeNEXT(entry); + } + if (!*a) /* everything moved */ + xhv->xhv_fill--; + } +} + HV * -newHV() +newHV(void) { register HV *hv; register XPVHV* xhv; @@ -641,42 +836,48 @@ newHV() } void -he_free(hent, shared) -register HE *hent; -I32 shared; +hv_free_ent(HV *hv, register HE *entry) { - if (!hent) + SV *val; + + if (!entry) return; - SvREFCNT_dec(HeVAL(hent)); - if (HeKLEN(hent) == HEf_SVKEY) - SvREFCNT_dec((SV*)HeKEY(hent)); - else if (shared) - unsharepvn(HeKEY(hent), HeKLEN(hent), HeHASH(hent)); + val = HeVAL(entry); + if (val && isGV(val) && GvCVu(val) && HvNAME(hv)) + sub_generation++; /* may be deletion of method from stash */ + SvREFCNT_dec(val); + if (HeKLEN(entry) == HEf_SVKEY) { + SvREFCNT_dec(HeKEY_sv(entry)); + Safefree(HeKEY_hek(entry)); + } + else if (HvSHAREKEYS(hv)) + unshare_hek(HeKEY_hek(entry)); else - Safefree(HeKEY(hent)); - del_he(hent); + Safefree(HeKEY_hek(entry)); + del_he(entry); } void -he_delayfree(hent, shared) -register HE *hent; -I32 shared; +hv_delayfree_ent(HV *hv, register HE *entry) { - if (!hent) + if (!entry) return; - sv_2mortal(HeVAL(hent)); /* free between statements */ - if (HeKLEN(hent) == HEf_SVKEY) - sv_2mortal((SV*)HeKEY(hent)); - else if (shared) - unsharepvn(HeKEY(hent), HeKLEN(hent), HeHASH(hent)); + if (isGV(HeVAL(entry)) && GvCVu(HeVAL(entry)) && HvNAME(hv)) + sub_generation++; /* may be deletion of method from stash */ + sv_2mortal(HeVAL(entry)); /* free between statements */ + if (HeKLEN(entry) == HEf_SVKEY) { + sv_2mortal(HeKEY_sv(entry)); + Safefree(HeKEY_hek(entry)); + } + else if (HvSHAREKEYS(hv)) + unshare_hek(HeKEY_hek(entry)); else - Safefree(HeKEY(hent)); - del_he(hent); + Safefree(HeKEY_hek(entry)); + del_he(entry); } void -hv_clear(hv) -HV *hv; +hv_clear(HV *hv) { register XPVHV* xhv; if (!hv) @@ -692,16 +893,14 @@ HV *hv; mg_clear((SV*)hv); } -static void -hfreeentries(hv) -HV *hv; +STATIC void +hfreeentries(HV *hv) { register HE **array; - register HE *hent; - register HE *ohent = Null(HE*); + register HE *entry; + register HE *oentry = Null(HE*); I32 riter; I32 max; - I32 shared; if (!hv) return; @@ -711,26 +910,24 @@ HV *hv; riter = 0; max = HvMAX(hv); array = HvARRAY(hv); - hent = array[0]; - shared = HvSHAREKEYS(hv); + entry = array[0]; for (;;) { - if (hent) { - ohent = hent; - hent = HeNEXT(hent); - he_free(ohent, shared); + if (entry) { + oentry = entry; + entry = HeNEXT(entry); + hv_free_ent(hv, oentry); } - if (!hent) { + if (!entry) { if (++riter > max) break; - hent = array[riter]; + entry = array[riter]; } } (void)hv_iterinit(hv); } void -hv_undef(hv) -HV *hv; +hv_undef(HV *hv) { register XPVHV* xhv; if (!hv) @@ -743,7 +940,7 @@ HV *hv; HvNAME(hv) = 0; } xhv->xhv_array = 0; - xhv->xhv_max = 7; /* it's a normal associative array */ + xhv->xhv_max = 7; /* it's a normal hash */ xhv->xhv_fill = 0; xhv->xhv_keys = 0; @@ -752,24 +949,30 @@ HV *hv; } I32 -hv_iterinit(hv) -HV *hv; +hv_iterinit(HV *hv) { - register XPVHV* xhv = (XPVHV*)SvANY(hv); - HE *entry = xhv->xhv_eiter; + register XPVHV* xhv; + HE *entry; + + if (!hv) + croak("Bad hash"); + xhv = (XPVHV*)SvANY(hv); + entry = xhv->xhv_eiter; #ifdef DYNAMIC_ENV_FETCH /* set up %ENV for iteration */ - if (HvNAME(hv) && strEQ(HvNAME(hv),ENV_HV_NAME)) prime_env_iter(); + if (HvNAME(hv) && strEQ(HvNAME(hv), ENV_HV_NAME)) + prime_env_iter(); #endif - if (entry && HeKLEN(entry) == HEf_LAZYDEL) /* was deleted earlier? */ - he_free(entry, HvSHAREKEYS(hv)); + if (entry && HvLAZYDEL(hv)) { /* was deleted earlier? */ + HvLAZYDEL_off(hv); + hv_free_ent(hv, entry); + } xhv->xhv_riter = -1; xhv->xhv_eiter = Null(HE*); - return xhv->xhv_fill; + return xhv->xhv_keys; /* used to be xhv->xhv_fill before 5.004_65 */ } HE * -hv_iternext(hv) -HV *hv; +hv_iternext(HV *hv) { register XPVHV* xhv; register HE *entry; @@ -777,7 +980,7 @@ HV *hv; MAGIC* mg; if (!hv) - croak("Bad associative array"); + croak("Bad hash"); xhv = (XPVHV*)SvANY(hv); oldentry = entry = xhv->xhv_eiter; @@ -788,18 +991,25 @@ HV *hv; SvREFCNT_dec(HeSVKEY(entry)); /* get rid of previous key */ } else { - xhv->xhv_eiter = entry = new_he(); /* only one HE per MAGICAL hash */ + char *k; + HEK *hek; + + xhv->xhv_eiter = entry = new_he(); /* one HE per MAGICAL hash */ Zero(entry, 1, HE); + Newz(54, k, HEK_BASESIZE + sizeof(SV*), char); + hek = (HEK*)k; + HeKEY_hek(entry) = hek; HeKLEN(entry) = HEf_SVKEY; } magic_nextpack((SV*) hv,mg,key); if (SvOK(key)) { /* force key to stay around until next time */ - HeKEY(entry) = (char*)SvREFCNT_inc(key); - return entry; /* beware, hent_val is not set */ + HeSVKEY_set(entry, SvREFCNT_inc(key)); + return entry; /* beware, hent_val is not set */ } if (HeVAL(entry)) SvREFCNT_dec(HeVAL(entry)); + Safefree(HeKEY_hek(entry)); del_he(entry); xhv->xhv_eiter = Null(HE*); return Null(HE*); @@ -818,20 +1028,23 @@ HV *hv; entry = ((HE**)xhv->xhv_array)[xhv->xhv_riter]; } - if (oldentry && HeKLEN(oldentry) == HEf_LAZYDEL) /* was deleted earlier? */ - he_free(oldentry, HvSHAREKEYS(hv)); + if (oldentry && HvLAZYDEL(hv)) { /* was deleted earlier? */ + HvLAZYDEL_off(hv); + hv_free_ent(hv, oldentry); + } xhv->xhv_eiter = entry; return entry; } char * -hv_iterkey(entry,retlen) -register HE *entry; -I32 *retlen; +hv_iterkey(register HE *entry, I32 *retlen) { if (HeKLEN(entry) == HEf_SVKEY) { - return SvPV((SV*)HeKEY(entry), *(STRLEN*)retlen); + STRLEN len; + char *p = SvPV(HeKEY_sv(entry), len); + *retlen = len; + return p; } else { *retlen = HeKLEN(entry); @@ -841,25 +1054,24 @@ I32 *retlen; /* unlike hv_iterval(), this always returns a mortal copy of the key */ SV * -hv_iterkeysv(entry) -register HE *entry; +hv_iterkeysv(register HE *entry) { if (HeKLEN(entry) == HEf_SVKEY) - return sv_mortalcopy((SV*)HeKEY(entry)); + return sv_mortalcopy(HeKEY_sv(entry)); else return sv_2mortal(newSVpv((HeKLEN(entry) ? HeKEY(entry) : ""), HeKLEN(entry))); } SV * -hv_iterval(hv,entry) -HV *hv; -register HE *entry; +hv_iterval(HV *hv, register HE *entry) { if (SvRMAGICAL(hv)) { if (mg_find((SV*)hv,'P')) { SV* sv = sv_newmortal(); - mg_copy((SV*)hv, sv, HeKEY(entry), HeKLEN(entry)); + if (HeKLEN(entry) == HEf_SVKEY) + mg_copy((SV*)hv, sv, (char*)HeKEY_sv(entry), HEf_SVKEY); + else mg_copy((SV*)hv, sv, HeKEY(entry), HeKLEN(entry)); return sv; } } @@ -867,10 +1079,7 @@ register HE *entry; } SV * -hv_iternextsv(hv, key, retlen) - HV *hv; - char **key; - I32 *retlen; +hv_iternextsv(HV *hv, char **key, I32 *retlen) { HE *he; if ( (he = hv_iternext(hv)) == NULL) @@ -880,23 +1089,66 @@ hv_iternextsv(hv, key, retlen) } void -hv_magic(hv, gv, how) -HV* hv; -GV* gv; -int how; +hv_magic(HV *hv, GV *gv, int how) { sv_magic((SV*)hv, (SV*)gv, how, Nullch, 0); } +char* +sharepvn(char *sv, I32 len, U32 hash) +{ + return HEK_KEY(share_hek(sv, len, hash)); +} + +/* possibly free a shared string if no one has access to it + * len and hash must both be valid for str. + */ +void +unsharepvn(char *str, I32 len, U32 hash) +{ + register XPVHV* xhv; + register HE *entry; + register HE **oentry; + register I32 i = 1; + I32 found = 0; + + /* what follows is the moral equivalent of: + if ((Svp = hv_fetch(strtab, tmpsv, FALSE, hash))) { + if (--*Svp == Nullsv) + hv_delete(strtab, str, len, G_DISCARD, hash); + } */ + xhv = (XPVHV*)SvANY(strtab); + /* assert(xhv_array != 0) */ + oentry = &((HE**)xhv->xhv_array)[hash & (I32) xhv->xhv_max]; + for (entry = *oentry; entry; i=0, oentry = &HeNEXT(entry), entry = *oentry) { + if (HeHASH(entry) != hash) /* strings can't be equal */ + continue; + if (HeKLEN(entry) != len) + continue; + if (memNE(HeKEY(entry),str,len)) /* is this it? */ + continue; + found = 1; + if (--HeVAL(entry) == Nullsv) { + *oentry = HeNEXT(entry); + if (i && !*oentry) + xhv->xhv_fill--; + Safefree(HeKEY_hek(entry)); + del_he(entry); + --xhv->xhv_keys; + } + break; + } + + if (!found) + warn("Attempt to free non-existent shared string"); +} + /* get a (constant) string ptr from the global string table * string will get added if it is not already there. * len and hash must both be valid for str. */ -char * -sharepvn(str, len, hash) -char *str; -I32 len; -register U32 hash; +HEK * +share_hek(char *str, I32 len, register U32 hash) { register XPVHV* xhv; register HE *entry; @@ -917,17 +1169,15 @@ register U32 hash; continue; if (HeKLEN(entry) != len) continue; - if (memcmp(HeKEY(entry),str,len)) /* is this it? */ + if (memNE(HeKEY(entry),str,len)) /* is this it? */ continue; found = 1; break; } if (!found) { entry = new_he(); - HeKLEN(entry) = len; - HeKEY(entry) = savepvn(str,len); + HeKEY_hek(entry) = save_hek(str, len, hash); HeVAL(entry) = Nullsv; - HeHASH(entry) = hash; HeNEXT(entry) = *oentry; *oentry = entry; xhv->xhv_keys++; @@ -939,52 +1189,8 @@ register U32 hash; } ++HeVAL(entry); /* use value slot as REFCNT */ - return HeKEY(entry); + return HeKEY_hek(entry); } -/* possibly free a shared string if no one has access to it - * len and hash must both be valid for str. - */ -void -unsharepvn(str, len, hash) -char *str; -I32 len; -register U32 hash; -{ - register XPVHV* xhv; - register HE *entry; - register HE **oentry; - register I32 i = 1; - I32 found = 0; - - /* what follows is the moral equivalent of: - if ((Svp = hv_fetch(strtab, tmpsv, FALSE, hash))) { - if (--*Svp == Nullsv) - hv_delete(strtab, str, len, G_DISCARD, hash); - } */ - xhv = (XPVHV*)SvANY(strtab); - /* assert(xhv_array != 0) */ - oentry = &((HE**)xhv->xhv_array)[hash & (I32) xhv->xhv_max]; - for (entry = *oentry; entry; i=0, oentry = &HeNEXT(entry), entry = *oentry) { - if (HeHASH(entry) != hash) /* strings can't be equal */ - continue; - if (HeKLEN(entry) != len) - continue; - if (memcmp(HeKEY(entry),str,len)) /* is this it? */ - continue; - found = 1; - if (--HeVAL(entry) == Nullsv) { - *oentry = HeNEXT(entry); - if (i && !*oentry) - xhv->xhv_fill--; - Safefree(HeKEY(entry)); - del_he(entry); - --xhv->xhv_keys; - } - break; - } - - if (!found) - warn("Attempt to free non-existent shared string"); -} +