Change 27405 by [EMAIL PROTECTED] on 2006/03/07 19:27:28
Remove the #define - ARENASETS are always on now.
Affected files ...
... //depot/perl/perl.h#674 edit
... //depot/perl/sv.c#1183 edit
Differences ...
==== //depot/perl/perl.h#674 (text) ====
Index: perl/perl.h
--- perl/perl.h#673~27378~ 2006-03-05 04:12:56.000000000 -0800
+++ perl/perl.h 2006-03-07 11:27:28.000000000 -0800
@@ -813,11 +813,6 @@
#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.
==== //depot/perl/sv.c#1183 (text) ====
Index: perl/sv.c
--- perl/sv.c#1182~27382~ 2006-03-05 11:07:12.000000000 -0800
+++ perl/sv.c 2006-03-07 11:27:28.000000000 -0800
@@ -587,18 +587,6 @@
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 @@
Safefree(sva);
}
-#if ARENASETS
{
struct arena_set *next, *aroot = (struct arena_set*) PL_body_arenas;
@@ -641,9 +628,6 @@
Safefree(aroot);
}
}
-#else
- S_free_arena(aTHX_ (void**) PL_body_arenas);
-#endif
PL_body_arenas = 0;
for (i=0; i<PERL_ARENA_ROOTS_SIZE; i++)
@@ -691,24 +675,12 @@
contexts below (line ~10k)
*/
-/* get_arena(size): when ARENASETS is enabled, this creates
- custom-sized arenas, otherwize it uses PERL_ARENA_SIZE, as
- previously done.
+/* get_arena(size): this creates custom-sized arenas
TBD: export properly for hv.c: S_more_he().
*/
void*
Perl_get_arena(pTHX_ int arena_size)
{
-#if !ARENASETS
- union arena* arp;
-
- /* allocate and attach arena */
- Newx(arp, arena_size, char);
- arp->next = 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 @@
curr, adesc->arena, arena_size));
return adesc->arena;
-#endif
}
@@ -1094,17 +1065,11 @@
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;
End of Patch.
