[svn:parrot] r41090 - branches/gc-refactor/src/gc
jrtayloriv at svn.parrot.org
jrtayloriv at svn.parrot.org
Mon Sep 7 02:36:14 UTC 2009
Author: jrtayloriv
Date: Mon Sep 7 02:36:08 2009
New Revision: 41090
URL: https://trac.parrot.org/parrot/changeset/41090
Log:
Replaced Fixed_Size_Obj_Arena with Fixed_Size_Arena, and corrected some minor errors resulting from last sed replacement.
Modified:
branches/gc-refactor/src/gc/alloc_resources.c
branches/gc-refactor/src/gc/api.c
branches/gc-refactor/src/gc/gc_malloc.c
branches/gc-refactor/src/gc/gc_ms.c
branches/gc-refactor/src/gc/gc_private.h
branches/gc-refactor/src/gc/generational_ms.c
branches/gc-refactor/src/gc/incremental_ms.c
branches/gc-refactor/src/gc/mark_sweep.c
Modified: branches/gc-refactor/src/gc/alloc_resources.c
==============================================================================
--- branches/gc-refactor/src/gc/alloc_resources.c Mon Sep 7 01:29:16 2009 (r41089)
+++ branches/gc-refactor/src/gc/alloc_resources.c Mon Sep 7 02:36:08 2009 (r41090)
@@ -339,7 +339,7 @@
Memory_Block *new_block; /* A pointer to our working block */
char *cur_spot; /* Where we're currently copying to */
- Fixed_Size_Obj_Arena *cur_buffer_arena;
+ Fixed_Size_Arena *cur_buffer_arena;
Memory_Pools * const mem_pools = interp->mem_pools;
/* Bail if we're blocked */
@@ -803,7 +803,7 @@
ASSERT_ARGS(check_fixed_size_obj_pool)
size_t total_objects;
size_t last_free_list_count;
- Fixed_Size_Obj_Arena * arena_walker;
+ Fixed_Size_Arena * arena_walker;
size_t free_objects;
PObj * object;
size_t i;
Modified: branches/gc-refactor/src/gc/api.c
==============================================================================
--- branches/gc-refactor/src/gc/api.c Mon Sep 7 01:29:16 2009 (r41089)
+++ branches/gc-refactor/src/gc/api.c Mon Sep 7 02:36:08 2009 (r41090)
@@ -911,7 +911,7 @@
ARGMOD(Fixed_Size_Pool *dest), ARGMOD(Fixed_Size_Pool *source))
{
ASSERT_ARGS(Parrot_gc_merge_buffer_pools)
- Fixed_Size_Obj_Arena *cur_arena;
+ Fixed_Size_Arena *cur_arena;
GC_MS_PObj_Wrapper *free_list_end;
PARROT_ASSERT(dest->object_size == source->object_size);
@@ -938,7 +938,7 @@
while (cur_arena) {
size_t total_objects;
- Fixed_Size_Obj_Arena * const next_arena = cur_arena->prev;
+ Fixed_Size_Arena * const next_arena = cur_arena->prev;
cur_arena->next = cur_arena->prev = NULL;
@@ -975,7 +975,7 @@
fix_pmc_syncs(ARGMOD(Interp *dest_interp), ARGIN(Fixed_Size_Pool *pool))
{
ASSERT_ARGS(fix_pmc_syncs)
- Fixed_Size_Obj_Arena *cur_arena;
+ Fixed_Size_Arena *cur_arena;
const UINTVAL object_size = pool->object_size;
for (cur_arena = pool->last_Arena; cur_arena; cur_arena = cur_arena->prev) {
@@ -1118,10 +1118,10 @@
free_pool(ARGMOD(Fixed_Size_Pool *pool))
{
ASSERT_ARGS(free_pool)
- Fixed_Size_Obj_Arena *cur_arena;
+ Fixed_Size_Arena *cur_arena;
for (cur_arena = pool->last_Arena; cur_arena;) {
- Fixed_Size_Obj_Arena * const next = cur_arena->prev;
+ Fixed_Size_Arena * const next = cur_arena->prev;
mem_internal_free(cur_arena->start_objects);
mem_internal_free(cur_arena);
cur_arena = next;
@@ -1230,7 +1230,7 @@
{
ASSERT_ARGS(Parrot_gc_get_pmc_index)
UINTVAL id = 1; /* first PMC in first arena */
- Fixed_Size_Obj_Arena *arena;
+ Fixed_Size_Arena *arena;
Fixed_Size_Pool *pool;
if (interp->gc_sys->PObj_to_Arena){
@@ -1296,7 +1296,7 @@
cleanup_next_for_GC_pool(ARGIN(Fixed_Size_Pool *pool))
{
ASSERT_ARGS(cleanup_next_for_GC_pool)
- Fixed_Size_Obj_Arena *arena;
+ Fixed_Size_Arena *arena;
for (arena = pool->last_Arena; arena; arena = arena->prev) {
PMC *p = (PMC *)arena->start_objects;
Modified: branches/gc-refactor/src/gc/gc_malloc.c
==============================================================================
--- branches/gc-refactor/src/gc/gc_malloc.c Mon Sep 7 01:29:16 2009 (r41089)
+++ branches/gc-refactor/src/gc/gc_malloc.c Mon Sep 7 02:36:08 2009 (r41090)
@@ -105,7 +105,7 @@
clear_cow(PARROT_INTERP, ARGMOD(Fixed_Size_Pool *pool), int cleanup)
{
const UINTVAL object_size = pool->object_size;
- Fixed_Size_Obj_Arena *cur_arena;
+ Fixed_Size_Arena *cur_arena;
/* clear refcount for COWable objects. */
for (cur_arena = pool->last_Arena;
@@ -151,7 +151,7 @@
used_cow(PARROT_INTERP, ARGMOD(Fixed_Size_Pool *pool), int cleanup)
{
const UINTVAL object_size = pool->object_size;
- Fixed_Size_Obj_Arena *cur_arena;
+ Fixed_Size_Arena *cur_arena;
for (cur_arena = pool->last_Arena;
NULL != cur_arena; cur_arena = cur_arena->prev) {
Modified: branches/gc-refactor/src/gc/gc_ms.c
==============================================================================
--- branches/gc-refactor/src/gc/gc_ms.c Mon Sep 7 01:29:16 2009 (r41089)
+++ branches/gc-refactor/src/gc/gc_ms.c Mon Sep 7 02:36:08 2009 (r41090)
@@ -338,7 +338,7 @@
if (pool->skip)
pool->skip = 0;
else {
- Fixed_Size_Obj_Arena * const arena = pool->last_Arena;
+ Fixed_Size_Arena * const arena = pool->last_Arena;
if (arena
&& arena->used == arena->total_objects)
Parrot_gc_mark_and_sweep(interp, GC_trace_stack_FLAG);
@@ -411,7 +411,7 @@
}
if (!free_list) {
- Fixed_Size_Obj_Arena * const arena = pool->last_Arena;
+ Fixed_Size_Arena * const arena = pool->last_Arena;
ptr = (PObj *)pool->newfree;
pool->newfree = (void *)((char *)pool->newfree + pool->object_size);
arena->used++;
@@ -463,8 +463,8 @@
ASSERT_ARGS(gc_ms_alloc_objects)
/* Setup memory for the new objects */
- Fixed_Size_Obj_Arena * const new_arena =
- mem_internal_allocate_typed(Fixed_Size_Obj_Arena);
+ Fixed_Size_Arena * const new_arena =
+ mem_internal_allocate_typed(Fixed_Size_Arena);
const size_t size = pool->object_size * pool->objects_per_alloc;
size_t alloc_size;
Modified: branches/gc-refactor/src/gc/gc_private.h
==============================================================================
--- branches/gc-refactor/src/gc/gc_private.h Mon Sep 7 01:29:16 2009 (r41089)
+++ branches/gc-refactor/src/gc/gc_private.h Mon Sep 7 02:36:08 2009 (r41090)
@@ -139,13 +139,13 @@
FLOATVAL reclaim_factor; /* minimum percentage we will reclaim */
} Variable_Size_Pool;
-typedef struct Fixed_Size_Obj_Arena {
+typedef struct Fixed_Size_Arena {
size_t used;
size_t total_objects;
- struct Fixed_Size_Obj_Arena *prev;
- struct Fixed_Size_Obj_Arena *next;
+ struct Fixed_Size_Arena *prev;
+ struct Fixed_Size_Arena *next;
void *start_objects;
-} Fixed_Size_Obj_Arena;
+} Fixed_Size_Arena;
typedef struct PMC_Attribute_Free_List {
struct PMC_Attribute_Free_List * next;
@@ -180,7 +180,7 @@
size_t start_arena_memory;
size_t end_arena_memory;
- Fixed_Size_Obj_Arena *last_Arena;
+ Fixed_Size_Arena *last_Arena;
GC_MS_PObj_Wrapper * free_list;
size_t num_free_objects; /* number of resources in the free pool */
size_t total_objects;
@@ -393,7 +393,7 @@
void Parrot_add_to_free_list(PARROT_INTERP,
ARGMOD(Fixed_Size_Pool *pool),
- ARGMOD(Fixed_Size_Obj_Arena *arena))
+ ARGMOD(Fixed_Size_Arena *arena))
__attribute__nonnull__(1)
__attribute__nonnull__(2)
__attribute__nonnull__(3)
@@ -402,7 +402,7 @@
void Parrot_append_arena_in_pool(PARROT_INTERP,
ARGMOD(Fixed_Size_Pool *pool),
- ARGMOD(Fixed_Size_Obj_Arena *new_arena),
+ ARGMOD(Fixed_Size_Arena *new_arena),
size_t size)
__attribute__nonnull__(1)
__attribute__nonnull__(2)
Modified: branches/gc-refactor/src/gc/generational_ms.c
==============================================================================
--- branches/gc-refactor/src/gc/generational_ms.c Mon Sep 7 01:29:16 2009 (r41089)
+++ branches/gc-refactor/src/gc/generational_ms.c Mon Sep 7 02:36:08 2009 (r41090)
@@ -145,7 +145,7 @@
static void gc_gms_chain_objects(PARROT_INTERP,
ARGMOD(Fixed_Size_Pool *pool),
- ARGIN(Fixed_Size_Obj_Arena *new_arena),
+ ARGIN(Fixed_Size_Arena *new_arena),
size_t real_size)
__attribute__nonnull__(1)
__attribute__nonnull__(2)
@@ -604,7 +604,7 @@
/*
=item C<static void gc_gms_chain_objects(PARROT_INTERP, Fixed_Size_Pool *pool,
-Fixed_Size_Obj_Arena *new_arena, size_t real_size)>
+Fixed_Size_Arena *new_arena, size_t real_size)>
TODO: interfere custom_destroy and put these items into a
separate white area, so that a sweep has just to run through these
@@ -645,7 +645,7 @@
static void
gc_gms_chain_objects(PARROT_INTERP, ARGMOD(Fixed_Size_Pool *pool),
- ARGIN(Fixed_Size_Obj_Arena *new_arena), size_t real_size)
+ ARGIN(Fixed_Size_Arena *new_arena), size_t real_size)
{
ASSERT_ARGS(gc_gms_chain_objects)
Gc_gms_hdr *next, *prev;
@@ -708,7 +708,7 @@
{
ASSERT_ARGS(gc_gms_alloc_objects)
const size_t real_size = pool->object_size;
- Fixed_Size_Obj_Arena * const new_arena = mem_internal_allocate(sizeof (Fixed_Size_Obj_Arena));
+ Fixed_Size_Arena * const new_arena = mem_internal_allocate(sizeof (Fixed_Size_Arena));
const size_t size = real_size * pool->objects_per_alloc;
new_arena->start_objects = mem_internal_allocate(size);
Modified: branches/gc-refactor/src/gc/incremental_ms.c
==============================================================================
--- branches/gc-refactor/src/gc/incremental_ms.c Mon Sep 7 01:29:16 2009 (r41089)
+++ branches/gc-refactor/src/gc/incremental_ms.c Mon Sep 7 02:36:08 2009 (r41090)
@@ -697,13 +697,13 @@
gc_ims_alloc_objects(PARROT_INTERP, ARGMOD(Fixed_Size_Pool *pool))
{
ASSERT_ARGS(gc_ims_alloc_objects)
- Fixed_Size_Obj_Arena *new_arena;
+ Fixed_Size_Arena *new_arena;
size_t size;
pool->objects_per_alloc = ALLOCATION_BLOCK_SIZE / pool->object_size;
/* Setup memory for the new objects */
- new_arena = mem_allocate_typed(Fixed_Size_Obj_Arena);
+ new_arena = mem_allocate_typed(Fixed_Size_Arena);
size = ALLOCATION_BLOCK_SIZE;
new_arena->start_objects = mem_sys_allocate(size);
Modified: branches/gc-refactor/src/gc/mark_sweep.c
==============================================================================
--- branches/gc-refactor/src/gc/mark_sweep.c Mon Sep 7 01:29:16 2009 (r41089)
+++ branches/gc-refactor/src/gc/mark_sweep.c Mon Sep 7 02:36:08 2009 (r41090)
@@ -276,7 +276,7 @@
UINTVAL total_used = 0;
const UINTVAL object_size = pool->object_size;
- Fixed_Size_Obj_Arena *cur_arena;
+ Fixed_Size_Arena *cur_arena;
gc_object_fn_type gc_object = pool->gc_object;
#if GC_VERBOSE
@@ -366,7 +366,7 @@
contained_in_pool(PARROT_INTERP, ARGIN(const Fixed_Size_Pool *pool), ARGIN(const void *ptr))
{
ASSERT_ARGS(contained_in_pool)
- const Fixed_Size_Obj_Arena *arena;
+ const Fixed_Size_Arena *arena;
if (interp->gc_sys->PObj_to_Arena){
ptr = interp->gc_sys->PObj_to_Arena(ptr);
@@ -490,7 +490,7 @@
Parrot_gc_clear_live_bits(PARROT_INTERP, ARGIN(const Fixed_Size_Pool *pool))
{
ASSERT_ARGS(Parrot_gc_clear_live_bits)
- Fixed_Size_Obj_Arena *arena;
+ Fixed_Size_Arena *arena;
const UINTVAL object_size = pool->object_size;
for (arena = pool->last_Arena; arena; arena = arena->prev) {
@@ -585,7 +585,7 @@
/*
=item C<void Parrot_add_to_free_list(PARROT_INTERP, Fixed_Size_Pool *pool,
-Fixed_Size_Obj_Arena *arena)>
+Fixed_Size_Arena *arena)>
Adds the objects in the newly allocated C<arena> to the free list of the pool.
@@ -596,7 +596,7 @@
void
Parrot_add_to_free_list(PARROT_INTERP,
ARGMOD(Fixed_Size_Pool *pool),
- ARGMOD(Fixed_Size_Obj_Arena *arena))
+ ARGMOD(Fixed_Size_Arena *arena))
{
ASSERT_ARGS(Parrot_add_to_free_list)
UINTVAL i;
@@ -629,9 +629,9 @@
/*
=item C<void Parrot_append_arena_in_pool(PARROT_INTERP, Fixed_Size_Pool *pool,
-Fixed_Size_Obj_Arena *new_arena, size_t size)>
+Fixed_Size_Arena *new_arena, size_t size)>
-Insert the new arena into the pool's structure. Memory_Pools are stored in a
+Insert the new arena into the pool's structure. Arenas are stored in a
linked list, so add the new arena to the list. Set information in the
arenas structure, such as the number of objects allocated in it.
@@ -642,7 +642,7 @@
void
Parrot_append_arena_in_pool(PARROT_INTERP,
ARGMOD(Fixed_Size_Pool *pool),
- ARGMOD(Fixed_Size_Obj_Arena *new_arena), size_t size)
+ ARGMOD(Fixed_Size_Arena *new_arena), size_t size)
{
ASSERT_ARGS(Parrot_append_arena_in_pool)
@@ -1251,8 +1251,8 @@
{
ASSERT_ARGS(Parrot_gc_get_attribute_pool)
- Memory_Pools * const arenas = interp->mem_pools;
- PMC_Attribute_Pool **pools = arenas->attrib_pools;
+ Memory_Pools * const mem_pools = interp->mem_pools;
+ PMC_Attribute_Pool **pools = mem_pools->attrib_pools;
const size_t size = (attrib_size < sizeof (void *))
? sizeof (void *)
: attrib_size;
@@ -1265,19 +1265,19 @@
number of resizes. 8 is just an arbitrary number */
pools = (PMC_Attribute_Pool **)mem_internal_allocate(total_size);
memset(pools, 0, total_size);
- arenas->attrib_pools = pools;
- arenas->num_attribs = total_length;
+ mem_pools->attrib_pools = pools;
+ mem_pools->num_attribs = total_length;
}
- if (arenas->num_attribs <= idx) {
+ if (mem_pools->num_attribs <= idx) {
const size_t total_length = idx + GC_ATTRIB_POOLS_HEADROOM;
const size_t total_size = total_length * sizeof (void *);
- const size_t current_size = arenas->num_attribs;
+ const size_t current_size = mem_pools->num_attribs;
const size_t diff = total_length - current_size;
pools = (PMC_Attribute_Pool **)mem_internal_realloc(pools, total_size);
memset(pools + current_size, 0, diff * sizeof (void *));
- arenas->attrib_pools = pools;
- arenas->num_attribs = total_length;
+ mem_pools->attrib_pools = pools;
+ mem_pools->num_attribs = total_length;
}
if (pools[idx] == NULL)
pools[idx] = Parrot_gc_create_attrib_pool(interp, size);
More information about the parrot-commits
mailing list