X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=blobdiff_plain;f=av.c;h=67ffad9f422517a5b4273f6dd66bbf981afa4d78;hb=fd996479e27a404cbaed7b3ad029feb14440afb0;hp=4692e6b6af29eec50a2c807ad7fe06748082faf6;hpb=e2d306cb6f7ec064f0604b24211e7b2cd0705b39;p=p5sagit%2Fp5-mst-13.2.git diff --git a/av.c b/av.c index 4692e6b..67ffad9 100644 --- a/av.c +++ b/av.c @@ -1,7 +1,7 @@ /* av.c * * Copyright (C) 1991, 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, - * 2000, 2001, 2002, 2003, 2004, 2005, 2006, by Larry Wall and others + * 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, by Larry Wall and others * * You may distribute under the terms of either the GNU General Public * License or the Artistic License, as specified in the README file. @@ -27,7 +27,8 @@ Perl_av_reify(pTHX_ AV *av) dVAR; I32 key; - assert(av); + PERL_ARGS_ASSERT_AV_REIFY; + assert(SvTYPE(av) == SVt_PVAV); if (AvREAL(av)) return; @@ -66,7 +67,8 @@ Perl_av_extend(pTHX_ AV *av, I32 key) dVAR; MAGIC *mg; - assert(av); + PERL_ARGS_ASSERT_AV_EXTEND; + assert(SvTYPE(av) == SVt_PVAV); mg = SvTIED_mg((SV*)av, PERL_MAGIC_tied); if (mg) { @@ -77,7 +79,7 @@ Perl_av_extend(pTHX_ AV *av, I32 key) PUSHMARK(SP); EXTEND(SP,2); PUSHs(SvTIED_obj((SV*)av, mg)); - PUSHs(sv_2mortal(newSViv(key+1))); + mPUSHi(key + 1); PUTBACK; call_method("EXTEND", G_SCALAR|G_DISCARD); POPSTACK; @@ -95,7 +97,7 @@ Perl_av_extend(pTHX_ AV *av, I32 key) tmp = AvARRAY(av) - AvALLOC(av); Move(AvARRAY(av), AvALLOC(av), AvFILLp(av)+1, SV*); AvMAX(av) += tmp; - SvPV_set(av, (char*)AvALLOC(av)); + AvARRAY(av) = AvALLOC(av); if (AvREAL(av)) { while (tmp) ary[--tmp] = &PL_sv_undef; @@ -117,8 +119,22 @@ Perl_av_extend(pTHX_ AV *av, I32 key) IV itmp; #endif -#ifdef MYMALLOC - newmax = malloced_size((void*)AvALLOC(av))/sizeof(SV*) - 1; +#ifdef Perl_safesysmalloc_size + /* Whilst it would be quite possible to move this logic around + (as I did in the SV code), so as to set AvMAX(av) early, + based on calling Perl_safesysmalloc_size() immediately after + allocation, I'm not convinced that it is a great idea here. + In an array we have to loop round setting everything to + &PL_sv_undef, which means writing to memory, potentially lots + of it, whereas for the SV buffer case we don't touch the + "bonus" memory. So there there is no cost in telling the + world about it, whereas here we have to do work before we can + tell the world about it, and that work involves writing to + memory that might never be read. So, I feel, better to keep + the current lazy system of only writing to it if our caller + has a need for more space. NWC */ + newmax = Perl_safesysmalloc_size((void*)AvALLOC(av)) / + sizeof(SV*) - 1; if (key <= newmax) goto resized; @@ -147,7 +163,7 @@ Perl_av_extend(pTHX_ AV *av, I32 key) Safefree(AvALLOC(av)); AvALLOC(av) = ary; #endif -#ifdef MYMALLOC +#ifdef Perl_safesysmalloc_size resized: #endif ary = AvALLOC(av) + AvMAX(av) + 1; @@ -171,7 +187,7 @@ Perl_av_extend(pTHX_ AV *av, I32 key) ary[--tmp] = &PL_sv_undef; } - SvPV_set(av, (char*)AvALLOC(av)); + AvARRAY(av) = AvALLOC(av); AvMAX(av) = newmax; } } @@ -195,7 +211,8 @@ Perl_av_fetch(pTHX_ register AV *av, I32 key, I32 lval) { dVAR; - assert(av); + PERL_ARGS_ASSERT_AV_FETCH; + assert(SvTYPE(av) == SVt_PVAV); if (SvRMAGICAL(av)) { const MAGIC * const tied_magic = mg_find((SV*)av, PERL_MAGIC_tied); @@ -278,7 +295,8 @@ Perl_av_store(pTHX_ register AV *av, I32 key, SV *val) dVAR; SV** ary; - assert(av); + PERL_ARGS_ASSERT_AV_STORE; + assert(SvTYPE(av) == SVt_PVAV); /* S_regclass relies on being able to pass in a NULL sv (unicode_alternate may be NULL). @@ -342,37 +360,19 @@ Perl_av_store(pTHX_ register AV *av, I32 key, SV *val) SvREFCNT_dec(ary[key]); ary[key] = val; if (SvSMAGICAL(av)) { + const MAGIC* const mg = SvMAGIC(av); if (val != &PL_sv_undef) { - const MAGIC* const mg = SvMAGIC(av); sv_magic(val, (SV*)av, toLOWER(mg->mg_type), 0, key); } - mg_set((SV*)av); + if (PL_delaymagic && mg->mg_type == PERL_MAGIC_isa) + PL_delaymagic |= DM_ARRAY; + else + mg_set((SV*)av); } return &ary[key]; } /* -=for apidoc newAV - -Creates a new AV. The reference count is set to 1. - -=cut -*/ - -AV * -Perl_newAV(pTHX) -{ - register AV * const av = (AV*)newSV(0); - - sv_upgrade((SV *)av, SVt_PVAV); - /* sv_upgrade does AvREAL_only() */ - AvALLOC(av) = 0; - SvPV_set(av, NULL); - AvMAX(av) = AvFILLp(av) = -1; - return av; -} - -/* =for apidoc av_make Creates a new AV and populates it with a list of SVs. The SVs are copied @@ -385,18 +385,18 @@ will have a reference count of 1. AV * Perl_av_make(pTHX_ register I32 size, register SV **strp) { - register AV * const av = (AV*)newSV(0); - - sv_upgrade((SV *) av,SVt_PVAV); + register AV * const av = (AV*)newSV_type(SVt_PVAV); /* sv_upgrade does AvREAL_only() */ + PERL_ARGS_ASSERT_AV_MAKE; + assert(SvTYPE(av) == SVt_PVAV); + if (size) { /* "defined" was returning undef for size==0 anyway. */ register SV** ary; register I32 i; Newx(ary,size,SV*); AvALLOC(av) = ary; - SvPV_set(av, (char*)ary); - AvFILLp(av) = size - 1; - AvMAX(av) = size - 1; + AvARRAY(av) = ary; + AvFILLp(av) = AvMAX(av) = size - 1; for (i = 0; i < size; i++) { assert (*strp); ary[i] = newSV(0); @@ -422,7 +422,9 @@ Perl_av_clear(pTHX_ register AV *av) dVAR; I32 extra; - assert(av); + PERL_ARGS_ASSERT_AV_CLEAR; + assert(SvTYPE(av) == SVt_PVAV); + #ifdef DEBUGGING if (SvREFCNT(av) == 0 && ckWARN_d(WARN_DEBUGGING)) { Perl_warner(aTHX_ packWARN(WARN_DEBUGGING), "Attempt to clear deleted array"); @@ -433,8 +435,13 @@ Perl_av_clear(pTHX_ register AV *av) Perl_croak(aTHX_ PL_no_modify); /* Give any tie a chance to cleanup first */ - if (SvRMAGICAL(av)) - mg_clear((SV*)av); + if (SvRMAGICAL(av)) { + const MAGIC* const mg = SvMAGIC(av); + if (PL_delaymagic && mg && mg->mg_type == PERL_MAGIC_isa) + PL_delaymagic |= DM_ARRAY; + else + mg_clear((SV*)av); + } if (AvMAX(av) < 0) return; @@ -453,7 +460,7 @@ Perl_av_clear(pTHX_ register AV *av) extra = AvARRAY(av) - AvALLOC(av); if (extra) { AvMAX(av) += extra; - SvPV_set(av, (char*)AvALLOC(av)); + AvARRAY(av) = AvALLOC(av); } AvFILLp(av) = -1; @@ -470,21 +477,45 @@ Undefines the array. Frees the memory used by the array itself. void Perl_av_undef(pTHX_ register AV *av) { - assert(av); + PERL_ARGS_ASSERT_AV_UNDEF; + assert(SvTYPE(av) == SVt_PVAV); /* Give any tie a chance to cleanup first */ if (SvTIED_mg((SV*)av, PERL_MAGIC_tied)) - av_fill(av, -1); /* mg_clear() ? */ + av_fill(av, -1); if (AvREAL(av)) { register I32 key = AvFILLp(av) + 1; while (key) SvREFCNT_dec(AvARRAY(av)[--key]); } + Safefree(AvALLOC(av)); - AvALLOC(av) = 0; - SvPV_set(av, NULL); + AvALLOC(av) = NULL; + AvARRAY(av) = NULL; AvMAX(av) = AvFILLp(av) = -1; + + if(SvRMAGICAL(av)) mg_clear((SV*)av); +} + +/* + +=for apidoc av_create_and_push + +Push an SV onto the end of the array, creating the array if necessary. +A small internal helper function to remove a commonly duplicated idiom. + +=cut +*/ + +void +Perl_av_create_and_push(pTHX_ AV **const avp, SV *const val) +{ + PERL_ARGS_ASSERT_AV_CREATE_AND_PUSH; + + if (!*avp) + *avp = newAV(); + av_push(*avp, val); } /* @@ -501,7 +532,9 @@ Perl_av_push(pTHX_ register AV *av, SV *val) { dVAR; MAGIC *mg; - assert(av); + + PERL_ARGS_ASSERT_AV_PUSH; + assert(SvTYPE(av) == SVt_PVAV); if (SvREADONLY(av)) Perl_croak(aTHX_ PL_no_modify); @@ -539,7 +572,8 @@ Perl_av_pop(pTHX_ register AV *av) SV *retval; MAGIC* mg; - assert(av); + PERL_ARGS_ASSERT_AV_POP; + assert(SvTYPE(av) == SVt_PVAV); if (SvREADONLY(av)) Perl_croak(aTHX_ PL_no_modify); @@ -569,6 +603,28 @@ Perl_av_pop(pTHX_ register AV *av) } /* + +=for apidoc av_create_and_unshift_one + +Unshifts an SV onto the beginning of the array, creating the array if +necessary. +A small internal helper function to remove a commonly duplicated idiom. + +=cut +*/ + +SV ** +Perl_av_create_and_unshift_one(pTHX_ AV **const avp, SV *const val) +{ + PERL_ARGS_ASSERT_AV_CREATE_AND_UNSHIFT_ONE; + + if (!*avp) + *avp = newAV(); + av_unshift(*avp, 1); + return av_store(*avp, 0, val); +} + +/* =for apidoc av_unshift Unshift the given number of C values onto the beginning of the @@ -585,7 +641,8 @@ Perl_av_unshift(pTHX_ register AV *av, register I32 num) register I32 i; MAGIC* mg; - assert(av); + PERL_ARGS_ASSERT_AV_UNSHIFT; + assert(SvTYPE(av) == SVt_PVAV); if (SvREADONLY(av)) Perl_croak(aTHX_ PL_no_modify); @@ -619,14 +676,13 @@ Perl_av_unshift(pTHX_ register AV *av, register I32 num) AvMAX(av) += i; AvFILLp(av) += i; - SvPV_set(av, (char*)(AvARRAY(av) - i)); + AvARRAY(av) = AvARRAY(av) - i; } if (num) { register SV **ary; - I32 slide; - i = AvFILLp(av); + const I32 i = AvFILLp(av); /* Create extra elements */ - slide = i > 0 ? i : 0; + const I32 slide = i > 0 ? i : 0; num += slide; av_extend(av, i + num); AvFILLp(av) += num; @@ -638,7 +694,7 @@ Perl_av_unshift(pTHX_ register AV *av, register I32 num) /* Make extra elements into a buffer */ AvMAX(av) -= slide; AvFILLp(av) -= slide; - SvPV_set(av, (char*)(AvARRAY(av) + slide)); + AvARRAY(av) = AvARRAY(av) + slide; } } @@ -657,7 +713,8 @@ Perl_av_shift(pTHX_ register AV *av) SV *retval; MAGIC* mg; - assert(av); + PERL_ARGS_ASSERT_AV_SHIFT; + assert(SvTYPE(av) == SVt_PVAV); if (SvREADONLY(av)) Perl_croak(aTHX_ PL_no_modify); @@ -682,7 +739,7 @@ Perl_av_shift(pTHX_ register AV *av) retval = *AvARRAY(av); if (AvREAL(av)) *AvARRAY(av) = &PL_sv_undef; - SvPV_set(av, (char*)(AvARRAY(av) + 1)); + AvARRAY(av) = AvARRAY(av) + 1; AvMAX(av)--; AvFILLp(av)--; if (SvSMAGICAL(av)) @@ -693,8 +750,8 @@ Perl_av_shift(pTHX_ register AV *av) /* =for apidoc av_len -Returns the highest index in the array. Returns -1 if the array is -empty. +Returns the highest index in the array. The number of elements in the +array is C. Returns -1 if the array is empty. =cut */ @@ -702,16 +759,24 @@ empty. I32 Perl_av_len(pTHX_ register const AV *av) { - assert(av); + PERL_ARGS_ASSERT_AV_LEN; + assert(SvTYPE(av) == SVt_PVAV); + return AvFILL(av); } /* =for apidoc av_fill -Ensure than an array has a given number of elements, equivalent to +Set the highest index in the array to the given number, equivalent to Perl's C<$#array = $fill;>. +The number of elements in the an array will be C after +av_fill() returns. If the array was previously shorter then the +additional elements appended are set to C. If the array +was longer, then the excess elements are freed. C is +the same as C. + =cut */ void @@ -720,7 +785,8 @@ Perl_av_fill(pTHX_ register AV *av, I32 fill) dVAR; MAGIC *mg; - assert(av); + PERL_ARGS_ASSERT_AV_FILL; + assert(SvTYPE(av) == SVt_PVAV); if (fill < 0) fill = -1; @@ -732,7 +798,7 @@ Perl_av_fill(pTHX_ register AV *av, I32 fill) PUSHMARK(SP); EXTEND(SP,2); PUSHs(SvTIED_obj((SV*)av, mg)); - PUSHs(sv_2mortal(newSViv(fill+1))); + mPUSHi(fill + 1); PUTBACK; call_method("STORESIZE", G_SCALAR|G_DISCARD); POPSTACK; @@ -778,7 +844,8 @@ Perl_av_delete(pTHX_ AV *av, I32 key, I32 flags) dVAR; SV *sv; - assert(av); + PERL_ARGS_ASSERT_AV_DELETE; + assert(SvTYPE(av) == SVt_PVAV); if (SvREADONLY(av)) Perl_croak(aTHX_ PL_no_modify); @@ -864,7 +931,8 @@ bool Perl_av_exists(pTHX_ AV *av, I32 key) { dVAR; - assert(av); + PERL_ARGS_ASSERT_AV_EXISTS; + assert(SvTYPE(av) == SVt_PVAV); if (SvRMAGICAL(av)) { const MAGIC * const tied_magic = mg_find((SV*)av, PERL_MAGIC_tied); @@ -915,12 +983,13 @@ Perl_av_exists(pTHX_ AV *av, I32 key) return FALSE; } -SV ** -Perl_av_arylen_p(pTHX_ AV *av) { +MAGIC * +S_get_aux_mg(pTHX_ AV *av) { dVAR; MAGIC *mg; - assert(av); + PERL_ARGS_ASSERT_GET_AUX_MG; + assert(SvTYPE(av) == SVt_PVAV); mg = mg_find((SV*)av, PERL_MAGIC_arylen_p); @@ -931,9 +1000,39 @@ Perl_av_arylen_p(pTHX_ AV *av) { /* sv_magicext won't set this for us because we pass in a NULL obj */ mg->mg_flags |= MGf_REFCOUNTED; } + return mg; +} + +SV ** +Perl_av_arylen_p(pTHX_ AV *av) { + MAGIC *const mg = get_aux_mg(av); + + PERL_ARGS_ASSERT_AV_ARYLEN_P; + assert(SvTYPE(av) == SVt_PVAV); + return &(mg->mg_obj); } +IV * +Perl_av_iter_p(pTHX_ AV *av) { + MAGIC *const mg = get_aux_mg(av); + + PERL_ARGS_ASSERT_AV_ITER_P; + assert(SvTYPE(av) == SVt_PVAV); + +#if IVSIZE == I32SIZE + return (IV *)&(mg->mg_len); +#else + if (!mg->mg_ptr) { + IV *temp; + mg->mg_len = IVSIZE; + Newxz(temp, 1, IV); + mg->mg_ptr = (char *) temp; + } + return (IV *)mg->mg_ptr; +#endif +} + /* * Local variables: * c-indentation-style: bsd