[svn:parrot] r36541 - in trunk: include/parrot src src/gc
cotto at svn.parrot.org
cotto at svn.parrot.org
Tue Feb 10 16:02:49 UTC 2009
Author: cotto
Date: Tue Feb 10 16:02:47 2009
New Revision: 36541
URL: https://trac.parrot.org/parrot/changeset/36541
Log:
[gc] update various function and variable names from "dod" to "gc"
Modified:
trunk/include/parrot/gc_mark_sweep.h
trunk/include/parrot/resources.h
trunk/src/events.c
trunk/src/gc/api.c
trunk/src/gc/generational_ms.c
trunk/src/gc/incremental_ms.c
trunk/src/gc/mark_sweep.c
trunk/src/gc/pools.c
trunk/src/stacks.c
trunk/src/thread.c
Modified: trunk/include/parrot/gc_mark_sweep.h
==============================================================================
--- trunk/include/parrot/gc_mark_sweep.h Tue Feb 10 16:02:37 2009 (r36540)
+++ trunk/include/parrot/gc_mark_sweep.h Tue Feb 10 16:02:47 2009 (r36541)
@@ -27,7 +27,7 @@
typedef void (*add_free_object_fn_type)(PARROT_INTERP, struct Small_Object_Pool *, void *);
typedef void * (*get_free_object_fn_type)(PARROT_INTERP, struct Small_Object_Pool *);
typedef void (*alloc_objects_fn_type)(PARROT_INTERP, struct Small_Object_Pool *);
-typedef void (*dod_object_fn_type)(PARROT_INTERP, struct Small_Object_Pool *, PObj *);
+typedef void (*gc_object_fn_type)(PARROT_INTERP, struct Small_Object_Pool *, PObj *);
#if PARROT_GC_GMS
/*
@@ -103,7 +103,7 @@
get_free_object_fn_type get_free_object;
alloc_objects_fn_type alloc_objects;
alloc_objects_fn_type more_objects;
- dod_object_fn_type dod_object;
+ gc_object_fn_type gc_object;
/* gets and removes a free object from the pool's free list */
/* allocates more objects */
struct Memory_Pool *mem_pool;
Modified: trunk/include/parrot/resources.h
==============================================================================
--- trunk/include/parrot/resources.h Tue Feb 10 16:02:37 2009 (r36540)
+++ trunk/include/parrot/resources.h Tue Feb 10 16:02:47 2009 (r36541)
@@ -165,9 +165,9 @@
UINTVAL num_early_DOD_PMCs; /* how many PMCs want immediate destruction */
UINTVAL num_early_PMCs_seen;/* how many such PMCs has DOD seen */
UINTVAL num_extended_PMCs; /* active PMCs having pmc_ext */
- PMC* dod_mark_start; /* first PMC marked during a DOD run */
- PMC* dod_mark_ptr; /* last PMC marked during a DOD run */
- PMC* dod_trace_ptr; /* last PMC trace_children was called on */
+ PMC* gc_mark_start; /* first PMC marked during a DOD run */
+ PMC* gc_mark_ptr; /* last PMC marked during a DOD run */
+ PMC* gc_trace_ptr; /* last PMC trace_children was called on */
int lazy_dod; /* flag that indicates whether we should stop
when we've seen all impatient PMCs */
/*
Modified: trunk/src/events.c
==============================================================================
--- trunk/src/events.c Tue Feb 10 16:02:37 2009 (r36540)
+++ trunk/src/events.c Tue Feb 10 16:02:47 2009 (r36541)
@@ -1051,7 +1051,7 @@
event->type = EVENT_TYPE_IO;
event->interp = interp;
/*
- * TODO dod_register these PMCs as long as the event system
+ * TODO gc_register these PMCs as long as the event system
* owns these 3
* unregister, when event is passed to interp again
*/
Modified: trunk/src/gc/api.c
==============================================================================
--- trunk/src/gc/api.c Tue Feb 10 16:02:37 2009 (r36540)
+++ trunk/src/gc/api.c Tue Feb 10 16:02:47 2009 (r36541)
@@ -491,8 +491,8 @@
ASSERT_ARGS(Parrot_gc_ms_run_init)
Arenas * const arena_base = interp->arena_base;
- arena_base->dod_trace_ptr = NULL;
- arena_base->dod_mark_start = NULL;
+ arena_base->gc_trace_ptr = NULL;
+ arena_base->gc_mark_start = NULL;
arena_base->num_early_PMCs_seen = 0;
arena_base->num_extended_PMCs = 0;
}
Modified: trunk/src/gc/generational_ms.c
==============================================================================
--- trunk/src/gc/generational_ms.c Tue Feb 10 16:02:37 2009 (r36540)
+++ trunk/src/gc/generational_ms.c Tue Feb 10 16:02:47 2009 (r36541)
@@ -1525,10 +1525,10 @@
ASSERT_ARGS(gc_gms_init_mark)
Arenas * const arena_base = interp->arena_base;
- arena_base->dod_trace_ptr = NULL;
- arena_base->dod_mark_start = NULL;
+ arena_base->gc_trace_ptr = NULL;
+ arena_base->gc_mark_start = NULL;
arena_base->num_early_PMCs_seen = 0;
- arena_base->num_extended_PMCs = 0;
+ arena_base->num_extended_PMCs = 0;
Parrot_forall_header_pools(interp, POOL_ALL, 0, init_mark_cb);
}
@@ -1610,7 +1610,7 @@
return 1;
}
/* TODO propagate flag in pobject_lives */
- arena_base->dod_trace_ptr = current;
+ arena_base->gc_trace_ptr = current;
if (!PObj_needs_early_DOD_TEST(current))
PObj_high_priority_DOD_CLEAR(current);
Modified: trunk/src/gc/incremental_ms.c
==============================================================================
--- trunk/src/gc/incremental_ms.c Tue Feb 10 16:02:37 2009 (r36540)
+++ trunk/src/gc/incremental_ms.c Tue Feb 10 16:02:47 2009 (r36541)
@@ -749,7 +749,7 @@
Parrot_gc_trace_children(interp, todo);
/* check if we are finished with marking -- the end is self-referential */
- next = arena_base->dod_mark_start;
+ next = arena_base->gc_mark_start;
if (next == PMC_next_for_GC(next))
g_ims->state = GC_IMS_START_SWEEP;
Modified: trunk/src/gc/mark_sweep.c
==============================================================================
--- trunk/src/gc/mark_sweep.c Tue Feb 10 16:02:37 2009 (r36540)
+++ trunk/src/gc/mark_sweep.c Tue Feb 10 16:02:47 2009 (r36541)
@@ -210,8 +210,8 @@
: GC_TRACE_ROOT_ONLY)) {
int ignored;
- arena_base->dod_trace_ptr = NULL;
- arena_base->dod_mark_ptr = NULL;
+ arena_base->gc_trace_ptr = NULL;
+ arena_base->gc_mark_ptr = NULL;
/* mark is now finished */
pt_DOD_stop_mark(interp);
@@ -292,9 +292,9 @@
Parrot_gc_profile_start(interp);
/* We have to start somewhere; the interpreter globals is a good place */
- if (!arena_base->dod_mark_start) {
- arena_base->dod_mark_start
- = arena_base->dod_mark_ptr
+ if (!arena_base->gc_mark_start) {
+ arena_base->gc_mark_start
+ = arena_base->gc_mark_ptr
= interp->iglobals;
}
@@ -387,7 +387,7 @@
const UINTVAL object_size = pool->object_size;
Small_Object_Arena *cur_arena;
- dod_object_fn_type dod_object = pool->dod_object;
+ gc_object_fn_type gc_object = pool->gc_object;
#if GC_VERBOSE
if (Interp_trace_TEST(interp, 1)) {
@@ -445,7 +445,7 @@
}
}
- dod_object(interp, pool, b);
+ gc_object(interp, pool, b);
pool->add_free_object(interp, pool, b);
}
@@ -617,8 +617,8 @@
interp = PMC_sync(obj)->owner;
PARROT_ASSERT(interp);
/* XXX FIXME hack */
- if (!interp->arena_base->dod_mark_ptr)
- interp->arena_base->dod_mark_ptr = obj;
+ if (!interp->arena_base->gc_mark_ptr)
+ interp->arena_base->gc_mark_ptr = obj;
}
arena_base = interp->arena_base;
@@ -626,16 +626,16 @@
if (PObj_needs_early_DOD_TEST(obj))
++arena_base->num_early_PMCs_seen;
- if (PObj_high_priority_DOD_TEST(obj) && arena_base->dod_trace_ptr) {
+ if (PObj_high_priority_DOD_TEST(obj) && arena_base->gc_trace_ptr) {
/* set obj's parent to high priority */
- PObj_high_priority_DOD_SET(arena_base->dod_trace_ptr);
+ PObj_high_priority_DOD_SET(arena_base->gc_trace_ptr);
hi_prio = 1;
}
else
hi_prio = 0;
if (obj->pmc_ext) {
- PMC * const tptr = arena_base->dod_trace_ptr;
+ PMC * const tptr = arena_base->gc_trace_ptr;
++arena_base->num_extended_PMCs;
/*
@@ -661,11 +661,11 @@
}
else {
/* put it on the end of the list */
- PMC_next_for_GC(arena_base->dod_mark_ptr) = obj;
+ PMC_next_for_GC(arena_base->gc_mark_ptr) = obj;
/* Explicitly make the tail of the linked list be
* self-referential */
- arena_base->dod_mark_ptr = PMC_next_for_GC(obj) = obj;
+ arena_base->gc_mark_ptr = PMC_next_for_GC(obj) = obj;
}
}
if (PObj_custom_mark_TEST(obj)) {
@@ -955,7 +955,7 @@
ASSERT_ARGS(Parrot_gc_trace_children)
Arenas * const arena_base = interp->arena_base;
const int lazy_dod = arena_base->lazy_dod;
- PMC *current = arena_base->dod_mark_start;
+ PMC *current = arena_base->gc_mark_start;
/*
* First phase of mark is finished. Now if we are the owner
@@ -979,7 +979,7 @@
return 0;
}
- arena_base->dod_trace_ptr = current;
+ arena_base->gc_trace_ptr = current;
/* short-term hack to color objects black */
PObj_get_FLAGS(current) |= PObj_custom_GC_FLAG;
@@ -1005,8 +1005,8 @@
current = next;
} while (--how_many > 0);
- arena_base->dod_mark_start = current;
- arena_base->dod_trace_ptr = NULL;
+ arena_base->gc_mark_start = current;
+ arena_base->gc_trace_ptr = NULL;
if (interp->profile)
Parrot_gc_profile_end(interp, PARROT_PROF_DOD_p2);
Modified: trunk/src/gc/pools.c
==============================================================================
--- trunk/src/gc/pools.c Tue Feb 10 16:02:37 2009 (r36540)
+++ trunk/src/gc/pools.c Tue Feb 10 16:02:47 2009 (r36541)
@@ -141,7 +141,7 @@
new_small_object_pool(sizeof (PMC), num_headers);
pmc_pool->mem_pool = NULL;
- pmc_pool->dod_object = Parrot_gc_free_pmc;
+ pmc_pool->gc_object = Parrot_gc_free_pmc;
(interp->arena_base->init_pool)(interp, pmc_pool);
return pmc_pool;
@@ -171,8 +171,8 @@
Small_Object_Pool * const pool =
new_small_object_pool(buffer_size, num_headers);
- pool->dod_object = Parrot_gc_free_sysmem;
- pool->mem_pool = interp->arena_base->memory_pool;
+ pool->gc_object = Parrot_gc_free_sysmem;
+ pool->mem_pool = interp->arena_base->memory_pool;
(interp->arena_base->init_pool)(interp, pool);
return pool;
}
@@ -199,9 +199,9 @@
Small_Object_Pool * const pool = get_bufferlike_pool(interp, sizeof (Buffer));
#ifdef GC_IS_MALLOC
- pool->dod_object = Parrot_gc_free_buffer_malloc;
+ pool->gc_object = Parrot_gc_free_buffer_malloc;
#else
- pool->dod_object = Parrot_gc_free_buffer;
+ pool->gc_object = Parrot_gc_free_buffer;
#endif
return pool;
Modified: trunk/src/stacks.c
==============================================================================
--- trunk/src/stacks.c Tue Feb 10 16:02:37 2009 (r36540)
+++ trunk/src/stacks.c Tue Feb 10 16:02:47 2009 (r36541)
@@ -386,7 +386,7 @@
if (cur_chunk->refcount <= 0) {
Small_Object_Pool * const pool = cur_chunk->pool;
- pool->dod_object(interp, pool, (PObj *)cur_chunk);
+ pool->gc_object(interp, pool, (PObj *)cur_chunk);
pool->add_free_object(interp, pool, (PObj *)cur_chunk);
}
Modified: trunk/src/thread.c
==============================================================================
--- trunk/src/thread.c Tue Feb 10 16:02:37 2009 (r36540)
+++ trunk/src/thread.c Tue Feb 10 16:02:47 2009 (r36541)
@@ -1605,7 +1605,7 @@
TODO - Have a count of shared PMCs and check it during DOD.
-TODO - Evaluate if a interpreter lock is cheaper when C<dod_mark_ptr> is
+TODO - Evaluate if a interpreter lock is cheaper when C<gc_mark_ptr> is
updated.
=cut
More information about the parrot-commits
mailing list