X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=blobdiff_plain;f=hv.c;h=463cf301a3cfe364056e4d7a0133371ecf9ee628;hb=ba3eb2af450c2577c20a691fb686a5e02955c48b;hp=4eaae0f08ce5ff401be03369472aa66ed98e1d0f;hpb=fb73857aa0bfa8ed43d4d2f972c564c70a57e0c4;p=p5sagit%2Fp5-mst-13.2.git diff --git a/hv.c b/hv.c index 4eaae0f..463cf30 100644 --- a/hv.c +++ b/hv.c @@ -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,11 +56,8 @@ more_he() return new_he(); } -static HEK * -save_hek(str, len, hash) -char *str; -I32 len; -U32 hash; +STATIC HEK * +save_hek(char *str, I32 len, U32 hash) { char *k; register HEK *hek; @@ -74,8 +72,7 @@ U32 hash; } void -unshare_hek(hek) -HEK *hek; +unshare_hek(HEK *hek) { unsharepvn(HEK_KEY(hek),HEK_LEN(hek),HEK_HASH(hek)); } @@ -84,11 +81,7 @@ HEK *hek; * 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; @@ -100,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); @@ -135,7 +142,7 @@ I32 lval; if (HvNAME(hv) && strEQ(HvNAME(hv),ENV_HV_NAME)) { char *gotenv; - if ((gotenv = ENV_getenv(key)) != Nullch) { + if ((gotenv = PerlEnv_getenv(key)) != Nullch) { sv = newSVpv(gotenv,strlen(gotenv)); SvTAINTED_on(sv); return hv_store(hv,key,klen,sv,hash); @@ -152,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; @@ -167,20 +170,36 @@ register U32 hash; if (!hv) return 0; - if (SvRMAGICAL(hv) && mg_find((SV*)hv,'P')) { - static HE mh; - - sv = sv_newmortal(); - keysv = sv_2mortal(newSVsv(keysv)); - mg_copy((SV*)hv, sv, (char*)keysv, HEf_SVKEY); - if (!HeKEY_hek(&mh)) { - char *k; - New(54, k, HEK_BASESIZE + sizeof(SV*), char); - HeKEY_hek(&mh) = (HEK*)k; + 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; + } } - HeSVKEY_set(&mh, keysv); - HeVAL(&mh) = sv; - return &mh; +#endif } xhv = (XPVHV*)SvANY(hv); @@ -214,7 +233,7 @@ register U32 hash; if (HvNAME(hv) && strEQ(HvNAME(hv),ENV_HV_NAME)) { char *gotenv; - if ((gotenv = ENV_getenv(key)) != Nullch) { + if ((gotenv = PerlEnv_getenv(key)) != Nullch) { sv = newSVpv(gotenv,strlen(gotenv)); SvTAINTED_on(sv); return hv_store_ent(hv,keysv,sv,hash); @@ -228,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; @@ -246,15 +279,21 @@ register U32 hash; xhv = (XPVHV*)SvANY(hv); if (SvMAGICAL(hv)) { - mg_copy((SV*)hv, val, key, klen); - if (!xhv->xhv_array - && (SvMAGIC(hv)->mg_moremagic - || (SvMAGIC(hv)->mg_type != 'E' -#ifdef OVERLOAD - && SvMAGIC(hv)->mg_type != 'A' -#endif /* OVERLOAD */ - ))) - return 0; + 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); @@ -297,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; @@ -315,24 +350,32 @@ register U32 hash; xhv = (XPVHV*)SvANY(hv); if (SvMAGICAL(hv)) { - 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 - && (SvMAGIC(hv)->mg_moremagic - || (SvMAGIC(hv)->mg_type != 'E' -#ifdef OVERLOAD - && SvMAGIC(hv)->mg_type != 'A' -#endif /* OVERLOAD */ - ))) - return Nullhe; + 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); @@ -374,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) @@ -434,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; @@ -451,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); @@ -496,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; @@ -511,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); @@ -539,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; @@ -555,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); @@ -584,9 +658,8 @@ U32 hash; 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) */ @@ -604,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 @@ -614,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); @@ -650,9 +731,7 @@ HV *hv; } void -hv_ksplit(hv, newmax) -HV *hv; -IV newmax; +hv_ksplit(HV *hv, IV newmax) { register XPVHV* xhv = (XPVHV*)SvANY(hv); I32 oldsize = (I32) xhv->xhv_max + 1; /* sic(k) */ @@ -679,6 +758,10 @@ IV newmax; nomemok = TRUE; #ifdef STRANGE_MALLOC Renew(a, newsize, HE*); + if (!a) { + nomemok = FALSE; + return; + } #else i = newsize * sizeof(HE*); j = MALLOC_OVERHEAD; @@ -688,10 +771,14 @@ IV newmax; 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 && !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); @@ -728,7 +815,7 @@ IV newmax; } HV * -newHV() +newHV(void) { register HV *hv; register XPVHV* xhv; @@ -749,15 +836,16 @@ newHV() } void -hv_free_ent(hv, entry) -HV *hv; -register HE *entry; +hv_free_ent(HV *hv, register HE *entry) { + SV *val; + if (!entry) return; - if (isGV(HeVAL(entry)) && GvCVu(HeVAL(entry)) && HvNAME(hv)) + val = HeVAL(entry); + if (val && isGV(val) && GvCVu(val) && HvNAME(hv)) sub_generation++; /* may be deletion of method from stash */ - SvREFCNT_dec(HeVAL(entry)); + SvREFCNT_dec(val); if (HeKLEN(entry) == HEf_SVKEY) { SvREFCNT_dec(HeKEY_sv(entry)); Safefree(HeKEY_hek(entry)); @@ -770,9 +858,7 @@ register HE *entry; } void -hv_delayfree_ent(hv, entry) -HV *hv; -register HE *entry; +hv_delayfree_ent(HV *hv, register HE *entry) { if (!entry) return; @@ -791,8 +877,7 @@ register HE *entry; } void -hv_clear(hv) -HV *hv; +hv_clear(HV *hv) { register XPVHV* xhv; if (!hv) @@ -808,9 +893,8 @@ HV *hv; mg_clear((SV*)hv); } -static void -hfreeentries(hv) -HV *hv; +STATIC void +hfreeentries(HV *hv) { register HE **array; register HE *entry; @@ -843,8 +927,7 @@ HV *hv; } void -hv_undef(hv) -HV *hv; +hv_undef(HV *hv) { register XPVHV* xhv; if (!hv) @@ -866,8 +949,7 @@ HV *hv; } I32 -hv_iterinit(hv) -HV *hv; +hv_iterinit(HV *hv) { register XPVHV* xhv; HE *entry; @@ -890,8 +972,7 @@ HV *hv; } HE * -hv_iternext(hv) -HV *hv; +hv_iternext(HV *hv) { register XPVHV* xhv; register HE *entry; @@ -957,9 +1038,7 @@ HV *hv; } char * -hv_iterkey(entry,retlen) -register HE *entry; -I32 *retlen; +hv_iterkey(register HE *entry, I32 *retlen) { if (HeKLEN(entry) == HEf_SVKEY) { STRLEN len; @@ -975,8 +1054,7 @@ 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(HeKEY_sv(entry)); @@ -986,9 +1064,7 @@ register HE *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')) { @@ -1003,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) @@ -1016,19 +1089,13 @@ 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(sv, len, hash) -char* sv; -I32 len; -U32 hash; +sharepvn(char *sv, I32 len, U32 hash) { return HEK_KEY(share_hek(sv, len, hash)); } @@ -1037,10 +1104,7 @@ U32 hash; * len and hash must both be valid for str. */ void -unsharepvn(str, len, hash) -char* str; -I32 len; -U32 hash; +unsharepvn(char *str, I32 len, U32 hash) { register XPVHV* xhv; register HE *entry; @@ -1084,10 +1148,7 @@ U32 hash; * len and hash must both be valid for str. */ HEK * -share_hek(str, len, hash) -char *str; -I32 len; -register U32 hash; +share_hek(char *str, I32 len, register U32 hash) { register XPVHV* xhv; register HE *entry; @@ -1132,3 +1193,4 @@ register U32 hash; } +