From 0a8483324f34cd58f59c599320471525e95a2de3 Mon Sep 17 00:00:00 2001 From: Nicholas Clark Date: Fri, 19 Jan 2007 17:36:10 +0000 Subject: [PATCH] Add a parameter to Perl_get_arena() to pass in the SV type, and record this in the arena description. Change all sizes to unsigned values. Make Perl_sv_free_arenas() loop downwards to free memory, simplifying the logic. Remove my erroneous comment added in change 29881. p4raw-id: //depot/perl@29882 --- embed.fnc | 2 +- hv.c | 2 +- proto.h | 2 +- sv.c | 39 ++++++++++++++++++--------------------- 4 files changed, 21 insertions(+), 24 deletions(-) diff --git a/embed.fnc b/embed.fnc index f544e5b..d649584 100644 --- a/embed.fnc +++ b/embed.fnc @@ -1106,7 +1106,7 @@ s |HV* |require_tie_mod|NN GV *gv|NN const char *varpv|NN SV* namesv \ #endif : #if defined(PERL_IN_HV_C) || defined(PERL_IN_SV_C) || defined(PERL_DECL_PROT) -paRxo |void* |get_arena |size_t svtype +paRxo |void* |get_arena |size_t svtype|U32 misc : #endif #if defined(PERL_IN_HV_C) || defined(PERL_DECL_PROT) diff --git a/hv.c b/hv.c index bc1e305..b7f53a9 100644 --- a/hv.c +++ b/hv.c @@ -43,7 +43,7 @@ S_more_he(pTHX) HE* he; HE* heend; - he = (HE*) Perl_get_arena(aTHX_ PERL_ARENA_SIZE); + he = (HE*) Perl_get_arena(aTHX_ PERL_ARENA_SIZE, HE_SVSLOT); heend = &he[PERL_ARENA_SIZE / sizeof(HE) - 1]; PL_body_roots[HE_SVSLOT] = he; diff --git a/proto.h b/proto.h index e0d2fc4..a6f3132 100644 --- a/proto.h +++ b/proto.h @@ -2958,7 +2958,7 @@ STATIC HV* S_require_tie_mod(pTHX_ GV *gv, const char *varpv, SV* namesv, const #endif -PERL_CALLCONV void* Perl_get_arena(pTHX_ size_t svtype) +PERL_CALLCONV void* Perl_get_arena(pTHX_ size_t svtype, U32 misc) __attribute__malloc__ __attribute__warn_unused_result__; diff --git a/sv.c b/sv.c index 3f9da66..cf89c0b 100644 --- a/sv.c +++ b/sv.c @@ -555,9 +555,6 @@ Perl_sv_clean_all(pTHX) the meta-info from the arena, we recover the 1st slot, formerly borrowed for list management. The arena_set is about the size of an arena, avoiding the needless malloc overhead of a naive linked-list. - The arena_sets are themselves stored in an arena, but as arenas - themselves are never freed at run time, there is no need to chain the - arena_sets onto an arena_set root. The cost is 1 arena-set malloc per ~320 arena-mallocs, + the unused memory in the last arena-set (1/2 on average). In trade, we get @@ -568,10 +565,7 @@ Perl_sv_clean_all(pTHX) struct arena_desc { char *arena; /* the raw storage, allocated aligned */ size_t size; /* its size ~4k typ */ - int unit_type; /* useful for arena audits */ - /* info for sv-heads (eventually) - int count, flags; - */ + U32 misc; /* type, and in future other things. */ }; struct arena_set; @@ -585,8 +579,8 @@ struct arena_set; struct arena_set { struct arena_set* next; - int set_size; /* ie ARENAS_PER_SET */ - int curr; /* index of next available arena-desc */ + unsigned int set_size; /* ie ARENAS_PER_SET */ + unsigned int curr; /* index of next available arena-desc */ struct arena_desc set[ARENAS_PER_SET]; }; @@ -604,7 +598,7 @@ Perl_sv_free_arenas(pTHX) dVAR; SV* sva; SV* svanext; - int i; + unsigned int i; /* Free arenas here, but be careful about fake ones. (We assume contiguity of the fake ones with the corresponding real ones.) */ @@ -619,21 +613,23 @@ Perl_sv_free_arenas(pTHX) } { - struct arena_set *next, *aroot = (struct arena_set*) PL_body_arenas; - - for (; aroot; aroot = next) { - const int max = aroot->curr; - for (i=0; icurr; + while (i--) { assert(aroot->set[i].arena); Safefree(aroot->set[i].arena); } - next = aroot->next; - Safefree(aroot); + aroot = aroot->next; + Safefree(current); } } PL_body_arenas = 0; - for (i=0; iarena, arena_size, char); adesc->size = arena_size; + adesc->misc = misc; DEBUG_m(PerlIO_printf(Perl_debug_log, "arena %d added: %p size %d\n", curr, (void*)adesc->arena, arena_size)); @@ -1067,7 +1064,7 @@ S_more_bodies (pTHX_ svtype sv_type) assert(bdp->arena_size); - start = (char*) Perl_get_arena(aTHX_ bdp->arena_size); + start = (char*) Perl_get_arena(aTHX_ bdp->arena_size, sv_type); end = start + bdp->arena_size - body_size; -- 1.8.3.1