From: Nicholas Clark Date: Tue, 7 Mar 2006 19:27:28 +0000 (+0000) Subject: Remove the #define - ARENASETS are always on now. X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=commitdiff_plain;h=bd26d9a31a9b2badde92cc6a993ed9f4769651bd;p=p5sagit%2Fp5-mst-13.2.git Remove the #define - ARENASETS are always on now. p4raw-id: //depot/perl@27405 --- diff --git a/perl.h b/perl.h index c7807b4..565ad63 100644 --- a/perl.h +++ b/perl.h @@ -813,11 +813,6 @@ int usleep(unsigned int); #define PERL_ARENA_SIZE 4080 #endif -/* enable ARENA_SETS by default, but allow disabling */ -#ifndef ARENASETS -#define ARENASETS 1 -#endif - #endif /* PERL_CORE */ /* We no longer default to creating a new SV for GvSV. diff --git a/sv.c b/sv.c index a846af9..f174c9f 100644 --- a/sv.c +++ b/sv.c @@ -587,18 +587,6 @@ struct arena_set { struct arena_desc set[ARENAS_PER_SET]; }; -#if !ARENASETS - -static void -S_free_arena(pTHX_ void **root) { - while (root) { - void ** const next = *(void **)root; - Safefree(root); - root = next; - } -} -#endif - /* =for apidoc sv_free_arenas @@ -627,7 +615,6 @@ Perl_sv_free_arenas(pTHX) Safefree(sva); } -#if ARENASETS { struct arena_set *next, *aroot = (struct arena_set*) PL_body_arenas; @@ -641,9 +628,6 @@ Perl_sv_free_arenas(pTHX) Safefree(aroot); } } -#else - S_free_arena(aTHX_ (void**) PL_body_arenas); -#endif PL_body_arenas = 0; for (i=0; inext = PL_body_arenas; - PL_body_arenas = arp; - return arp; - -#else struct arena_desc* adesc; struct arena_set *newroot, **aroot = (struct arena_set**) &PL_body_arenas; int curr; @@ -737,7 +709,6 @@ Perl_get_arena(pTHX_ int arena_size) curr, adesc->arena, arena_size)); return adesc->arena; -#endif } @@ -1094,17 +1065,11 @@ S_more_bodies (pTHX_ svtype sv_type) end = start + bdp->arena_size - body_size; -#if !ARENASETS - /* The initial slot is used to link the arenas together, so it isn't to be - linked into the list of ready-to-use bodies. */ - start += body_size; -#else /* computed count doesnt reflect the 1st slot reservation */ DEBUG_m(PerlIO_printf(Perl_debug_log, "arena %p end %p arena-size %d type %d size %d ct %d\n", start, end, bdp->arena_size, sv_type, body_size, bdp->arena_size / body_size)); -#endif *root = (void *)start;