Author: chromatic
Date: Thu Jan 1 16:22:06 2009
New Revision: 34775
Modified:
branches/pdd09gc_part2/docs/pdds/pdd09_gc.pod
branches/pdd09gc_part2/include/parrot/gc_api.h
branches/pdd09gc_part2/src/gc/api.c
branches/pdd09gc_part2/src/gc/gc_gms.c
branches/pdd09gc_part2/src/gc/gc_ims.c
branches/pdd09gc_part2/src/gc/resources.c
branches/pdd09gc_part2/src/gc/smallobject.c
branches/pdd09gc_part2/src/headers.c
branches/pdd09gc_part2/src/thread.c
Log:
[GC] Renamed Parrot_dod_* functions to Parrot_gc_* functions.
Modified: branches/pdd09gc_part2/docs/pdds/pdd09_gc.pod
==============================================================================
--- branches/pdd09gc_part2/docs/pdds/pdd09_gc.pod (original)
+++ branches/pdd09gc_part2/docs/pdds/pdd09_gc.pod Thu Jan 1 16:22:06 2009
@@ -567,7 +567,7 @@
The PMC has some sort of active destructor, and will have that destructor
called when the PMC is destroyed. The destructor is typically called from
-within C<src/gc/api.c:Parrot_dod_free_pmc>.
+within C<src/gc/api.c:Parrot_gc_free_pmc>.
=item PObj_custom_mark_FLAG
Modified: branches/pdd09gc_part2/include/parrot/gc_api.h
==============================================================================
--- branches/pdd09gc_part2/include/parrot/gc_api.h (original)
+++ branches/pdd09gc_part2/include/parrot/gc_api.h Thu Jan 1 16:22:06 2009
@@ -8,8 +8,8 @@
* Initial version by Mike Lambert on 2002.05.27
*/
-#ifndef PARROT_DOD_H_GUARD
-#define PARROT_DOD_H_GUARD
+#ifndef PARROT_GC_API_H_GUARD
+#define PARROT_GC_API_H_GUARD
#include "parrot/parrot.h"
@@ -64,10 +64,10 @@
void Parrot_do_dod_run(PARROT_INTERP, UINTVAL flags)
__attribute__nonnull__(1);
-void Parrot_dod_clear_live_bits(PARROT_INTERP)
+void Parrot_gc_clear_live_bits(PARROT_INTERP)
__attribute__nonnull__(1);
-void Parrot_dod_free_buffer(SHIM_INTERP,
+void Parrot_gc_free_buffer(SHIM_INTERP,
ARGMOD(Small_Object_Pool *pool),
ARGMOD(PObj *b))
__attribute__nonnull__(2)
@@ -75,50 +75,50 @@
FUNC_MODIFIES(*pool)
FUNC_MODIFIES(*b);
-void Parrot_dod_free_buffer_malloc(SHIM_INTERP,
+void Parrot_gc_free_buffer_malloc(SHIM_INTERP,
SHIM(Small_Object_Pool *pool),
ARGMOD(PObj *b))
__attribute__nonnull__(3)
FUNC_MODIFIES(*b);
-void Parrot_dod_free_pmc(PARROT_INTERP,
+void Parrot_gc_free_pmc(PARROT_INTERP,
SHIM(Small_Object_Pool *pool),
ARGMOD(PObj *p))
__attribute__nonnull__(1)
__attribute__nonnull__(3)
FUNC_MODIFIES(*p);
-void Parrot_dod_free_sysmem(SHIM_INTERP,
+void Parrot_gc_free_sysmem(SHIM_INTERP,
SHIM(Small_Object_Pool *pool),
ARGMOD(PObj *b))
__attribute__nonnull__(3)
FUNC_MODIFIES(*b);
-void Parrot_dod_ms_run(PARROT_INTERP, UINTVAL flags)
+void Parrot_gc_ms_run(PARROT_INTERP, UINTVAL flags)
__attribute__nonnull__(1);
-void Parrot_dod_ms_run_init(PARROT_INTERP)
+void Parrot_gc_ms_run_init(PARROT_INTERP)
__attribute__nonnull__(1);
-void Parrot_dod_profile_end(PARROT_INTERP, int what)
+void Parrot_gc_profile_end(PARROT_INTERP, int what)
__attribute__nonnull__(1);
-void Parrot_dod_profile_start(PARROT_INTERP)
+void Parrot_gc_profile_start(PARROT_INTERP)
__attribute__nonnull__(1);
-void Parrot_dod_sweep(PARROT_INTERP, ARGMOD(Small_Object_Pool *pool))
+void Parrot_gc_sweep(PARROT_INTERP, ARGMOD(Small_Object_Pool *pool))
__attribute__nonnull__(1)
__attribute__nonnull__(2)
FUNC_MODIFIES(*pool);
-int Parrot_dod_trace_children(PARROT_INTERP, size_t how_many)
+int Parrot_gc_trace_children(PARROT_INTERP, size_t how_many)
__attribute__nonnull__(1);
-void Parrot_dod_trace_pmc_data(PARROT_INTERP, ARGIN(PMC *p))
+void Parrot_gc_trace_pmc_data(PARROT_INTERP, ARGIN(PMC *p))
__attribute__nonnull__(1)
__attribute__nonnull__(2);
-int Parrot_dod_trace_root(PARROT_INTERP, int trace_stack)
+int Parrot_gc_trace_root(PARROT_INTERP, int trace_stack)
__attribute__nonnull__(1);
void Parrot_free_pmc_ext(PARROT_INTERP, ARGMOD(PMC *p))
@@ -196,7 +196,7 @@
/* HEADERIZER BEGIN: src/gc/gc_ims.c */
/* Don't modify between HEADERIZER BEGIN / HEADERIZER END. Your changes will
be lost. */
-void Parrot_dod_ims_wb(PARROT_INTERP, ARGMOD(PMC *agg), ARGMOD(PMC *_new))
+void Parrot_gc_ims_wb(PARROT_INTERP, ARGMOD(PMC *agg), ARGMOD(PMC *_new))
__attribute__nonnull__(1)
__attribute__nonnull__(2)
__attribute__nonnull__(3)
@@ -219,7 +219,7 @@
PObj_live_TEST(agg) && \
(PObj_get_FLAGS(agg) & PObj_custom_GC_FLAG) && \
!PObj_live_TEST(_new)) { \
- Parrot_dod_ims_wb((interp), (agg), (_new)); \
+ Parrot_gc_ims_wb((interp), (agg), (_new)); \
} \
} while (0)
@@ -256,7 +256,7 @@
#endif
-#endif /* PARROT_DOD_H_GUARD */
+#endif /* PARROT_GC_API_H_GUARD */
/*
* Local variables:
Modified: branches/pdd09gc_part2/src/gc/api.c
==============================================================================
--- branches/pdd09gc_part2/src/gc/api.c (original)
+++ branches/pdd09gc_part2/src/gc/api.c Thu Jan 1 16:22:06 2009
@@ -235,7 +235,7 @@
/*
-=item C<int Parrot_dod_trace_root>
+=item C<int Parrot_gc_trace_root>
Traces the root set. Returns 0 if it's a lazy DOD run and all objects
that need timely destruction were found.
@@ -251,7 +251,7 @@
*/
int
-Parrot_dod_trace_root(PARROT_INTERP, int trace_stack)
+Parrot_gc_trace_root(PARROT_INTERP, int trace_stack)
{
Arenas * const arena_base = interp->arena_base;
Parrot_Context *ctx;
@@ -266,7 +266,7 @@
}
if (interp->profile)
- Parrot_dod_profile_start(interp);
+ Parrot_gc_profile_start(interp);
/* We have to start somewhere; the interpreter globals is a good place */
if (!arena_base->dod_mark_start) {
@@ -343,7 +343,7 @@
trace_system_areas(interp);
if (interp->profile)
- Parrot_dod_profile_end(interp, PARROT_PROF_DOD_p1);
+ Parrot_gc_profile_end(interp, PARROT_PROF_DOD_p1);
return 1;
}
@@ -364,17 +364,17 @@
static int
trace_active_PMCs(PARROT_INTERP, int trace_stack)
{
- if (!Parrot_dod_trace_root(interp, trace_stack))
+ if (!Parrot_gc_trace_root(interp, trace_stack))
return 0;
/* Okay, we've marked the whole root set, and should have a good-sized
* list of things to look at. Run through it */
- return Parrot_dod_trace_children(interp, (size_t) -1);
+ return Parrot_gc_trace_children(interp, (size_t) -1);
}
/*
-=item C<int Parrot_dod_trace_children>
+=item C<int Parrot_gc_trace_children>
Returns whether the tracing process has completed.
@@ -383,7 +383,7 @@
*/
int
-Parrot_dod_trace_children(PARROT_INTERP, size_t how_many)
+Parrot_gc_trace_children(PARROT_INTERP, size_t how_many)
{
Arenas * const arena_base = interp->arena_base;
const int lazy_dod = arena_base->lazy_dod;
@@ -401,7 +401,7 @@
* all these, we could skip that.
*/
if (interp->profile)
- Parrot_dod_profile_start(interp);
+ Parrot_gc_profile_start(interp);
pt_DOD_mark_root_finished(interp);
@@ -432,7 +432,7 @@
* pointer that we need to trace. */
if (bits) {
if (bits == PObj_data_is_PMC_array_FLAG)
- Parrot_dod_trace_pmc_data(interp, current);
+ Parrot_gc_trace_pmc_data(interp, current);
else {
/* All that's left is the custom */
PARROT_ASSERT(!PObj_on_free_list_TEST(current));
@@ -452,14 +452,14 @@
arena_base->dod_trace_ptr = NULL;
if (interp->profile)
- Parrot_dod_profile_end(interp, PARROT_PROF_DOD_p2);
+ Parrot_gc_profile_end(interp, PARROT_PROF_DOD_p2);
return 1;
}
/*
-=item C<void Parrot_dod_trace_pmc_data>
+=item C<void Parrot_gc_trace_pmc_data>
If the PMC is an array of PMCs, trace all elements in the array as children.
Touches each object in the array to mark it as being alive. To determine
@@ -471,7 +471,7 @@
*/
void
-Parrot_dod_trace_pmc_data(PARROT_INTERP, ARGIN(PMC *p))
+Parrot_gc_trace_pmc_data(PARROT_INTERP, ARGIN(PMC *p))
{
/* malloced array of PMCs */
PMC ** const data = PMC_data_typed(p, PMC **);
@@ -576,7 +576,7 @@
/*
-=item C<void Parrot_dod_sweep>
+=item C<void Parrot_gc_sweep>
Puts any buffers/PMCs that are now unused onto the pool's free list. If
C<GC_IS_MALLOC>, bufstart gets freed too, if possible. Avoids buffers that
@@ -587,7 +587,7 @@
*/
void
-Parrot_dod_sweep(PARROT_INTERP, ARGMOD(Small_Object_Pool *pool))
+Parrot_gc_sweep(PARROT_INTERP, ARGMOD(Small_Object_Pool *pool))
{
UINTVAL total_used = 0;
const UINTVAL object_size = pool->object_size;
@@ -665,7 +665,7 @@
/*
-=item C<void Parrot_dod_free_pmc>
+=item C<void Parrot_gc_free_pmc>
Frees a PMC that is no longer being used. Calls a custom C<destroy>
VTABLE method if one is available. If the PMC uses a PMC_EXT
@@ -676,7 +676,7 @@
*/
void
-Parrot_dod_free_pmc(PARROT_INTERP, SHIM(Small_Object_Pool *pool),
+Parrot_gc_free_pmc(PARROT_INTERP, SHIM(Small_Object_Pool *pool),
ARGMOD(PObj *p))
{
PMC * const pmc = (PMC *)p;
@@ -735,7 +735,7 @@
/*
-=item C<void Parrot_dod_free_sysmem>
+=item C<void Parrot_gc_free_sysmem>
If the PMC uses memory allocated directly from the system, this function
frees that memory.
@@ -745,7 +745,7 @@
*/
void
-Parrot_dod_free_sysmem(SHIM_INTERP, SHIM(Small_Object_Pool *pool),
+Parrot_gc_free_sysmem(SHIM_INTERP, SHIM(Small_Object_Pool *pool),
ARGMOD(PObj *b))
{
/* has sysmem allocated, e.g. string_pin */
@@ -758,7 +758,7 @@
/*
-=item C<void Parrot_dod_free_buffer_malloc>
+=item C<void Parrot_gc_free_buffer_malloc>
Frees the given buffer, returning the storage space to the operating system
and removing it from Parrot's memory management system. If the buffer is COW,
@@ -769,7 +769,7 @@
*/
void
-Parrot_dod_free_buffer_malloc(SHIM_INTERP, SHIM(Small_Object_Pool *pool),
+Parrot_gc_free_buffer_malloc(SHIM_INTERP, SHIM(Small_Object_Pool *pool),
ARGMOD(PObj *b))
{
@@ -793,7 +793,7 @@
/*
-=item C<void Parrot_dod_free_buffer>
+=item C<void Parrot_gc_free_buffer>
Frees a buffer, returning it to the memory pool for Parrot to possibly
reuse later.
@@ -803,7 +803,7 @@
*/
void
-Parrot_dod_free_buffer(SHIM_INTERP, ARGMOD(Small_Object_Pool *pool),
ARGMOD(PObj *b))
+Parrot_gc_free_buffer(SHIM_INTERP, ARGMOD(Small_Object_Pool *pool),
ARGMOD(PObj *b))
{
Memory_Pool * const mem_pool = (Memory_Pool *)pool->mem_pool;
@@ -962,7 +962,7 @@
/*
-=item C<void Parrot_dod_clear_live_bits>
+=item C<void Parrot_gc_clear_live_bits>
Resets the PMC pool, so all objects are marked as "White". This
is done after a GC run to reset the system and prepare for the
@@ -973,7 +973,7 @@
*/
void
-Parrot_dod_clear_live_bits(PARROT_INTERP)
+Parrot_gc_clear_live_bits(PARROT_INTERP)
{
Small_Object_Pool * const pool = interp->arena_base->pmc_pool;
clear_live_bits(pool);
@@ -981,7 +981,7 @@
/*
-=item C<void Parrot_dod_profile_start>
+=item C<void Parrot_gc_profile_start>
Records the start time of a DOD run when profiling is enabled.
@@ -990,7 +990,7 @@
*/
void
-Parrot_dod_profile_start(PARROT_INTERP)
+Parrot_gc_profile_start(PARROT_INTERP)
{
if (Interp_flags_TEST(interp, PARROT_PROFILE_FLAG))
interp->profile->dod_time = Parrot_floatval_time();
@@ -998,7 +998,7 @@
/*
-=item C<void Parrot_dod_profile_end>
+=item C<void Parrot_gc_profile_end>
Records the end time of the DOD part C<what> run when profiling is
enabled. Also record start time of next part.
@@ -1008,7 +1008,7 @@
*/
void
-Parrot_dod_profile_end(PARROT_INTERP, int what)
+Parrot_gc_profile_end(PARROT_INTERP, int what)
{
if (Interp_flags_TEST(interp, PARROT_PROFILE_FLAG)) {
RunProfile * const profile = interp->profile;
@@ -1032,7 +1032,7 @@
/*
-=item C<void Parrot_dod_ms_run_init>
+=item C<void Parrot_gc_ms_run_init>
Prepares the collector for a mark & sweep DOD run. This is the
initializer function for the MS garbage collector.
@@ -1042,7 +1042,7 @@
*/
void
-Parrot_dod_ms_run_init(PARROT_INTERP)
+Parrot_gc_ms_run_init(PARROT_INTERP)
{
Arenas * const arena_base = interp->arena_base;
@@ -1075,7 +1075,7 @@
used_cow(interp, pool, 0);
#endif
- Parrot_dod_sweep(interp, pool);
+ Parrot_gc_sweep(interp, pool);
#ifdef GC_IS_MALLOC
if (flag & POOL_BUFFER)
@@ -1083,7 +1083,7 @@
#endif
if (interp->profile && (flag & POOL_PMC))
- Parrot_dod_profile_end(interp, PARROT_PROF_DOD_cp);
+ Parrot_gc_profile_end(interp, PARROT_PROF_DOD_cp);
*total_free += pool->num_free_objects;
@@ -1092,7 +1092,7 @@
/*
-=item C<void Parrot_dod_ms_run>
+=item C<void Parrot_gc_ms_run>
Runs the stop-the-world mark & sweep (MS) collector.
@@ -1101,7 +1101,7 @@
*/
void
-Parrot_dod_ms_run(PARROT_INTERP, UINTVAL flags)
+Parrot_gc_ms_run(PARROT_INTERP, UINTVAL flags)
{
Arenas * const arena_base = interp->arena_base;
@@ -1119,7 +1119,7 @@
* other non-shared object, these wouldn't be marked and hence
* collected.
*/
- Parrot_dod_clear_live_bits(interp);
+ Parrot_gc_clear_live_bits(interp);
}
/*
@@ -1135,12 +1135,12 @@
if (interp->scheduler) {
pobject_lives(interp, (PObj *)interp->scheduler);
VTABLE_mark(interp, interp->scheduler);
- Parrot_dod_sweep(interp, interp->arena_base->pmc_pool);
+ Parrot_gc_sweep(interp, interp->arena_base->pmc_pool);
}
/* now sweep everything that's left */
- Parrot_dod_sweep(interp, interp->arena_base->pmc_pool);
- Parrot_dod_sweep(interp, interp->arena_base->constant_pmc_pool);
+ Parrot_gc_sweep(interp, interp->arena_base->pmc_pool);
+ Parrot_gc_sweep(interp, interp->arena_base->constant_pmc_pool);
return;
}
@@ -1150,7 +1150,7 @@
/* tell the threading system that we're doing DOD mark */
pt_DOD_start_mark(interp);
- Parrot_dod_ms_run_init(interp);
+ Parrot_gc_ms_run_init(interp);
/* compact STRING pools to collect free headers and allocated buffers */
Parrot_go_collect(interp);
@@ -1171,7 +1171,7 @@
UNUSED(ignored);
if (interp->profile)
- Parrot_dod_profile_end(interp, PARROT_PROF_DOD_cb);
+ Parrot_gc_profile_end(interp, PARROT_PROF_DOD_cb);
}
else {
pt_DOD_stop_mark(interp); /* XXX */
@@ -1179,9 +1179,9 @@
/* successful lazy DOD count */
++arena_base->lazy_dod_runs;
- Parrot_dod_clear_live_bits(interp);
+ Parrot_gc_clear_live_bits(interp);
if (interp->profile)
- Parrot_dod_profile_end(interp, PARROT_PROF_DOD_p2);
+ Parrot_gc_profile_end(interp, PARROT_PROF_DOD_p2);
}
/* Note it */
Modified: branches/pdd09gc_part2/src/gc/gc_gms.c
==============================================================================
--- branches/pdd09gc_part2/src/gc/gc_gms.c (original)
+++ branches/pdd09gc_part2/src/gc/gc_gms.c Thu Jan 1 16:22:06 2009
@@ -1446,7 +1446,7 @@
static int
gc_gms_trace_root(PARROT_INTERP, int trace_stack)
{
- const int ret = Parrot_dod_trace_root(interp, trace_stack);
+ const int ret = Parrot_gc_trace_root(interp, trace_stack);
if (ret == 0)
return 0;
Modified: branches/pdd09gc_part2/src/gc/gc_ims.c
==============================================================================
--- branches/pdd09gc_part2/src/gc/gc_ims.c (original)
+++ branches/pdd09gc_part2/src/gc/gc_ims.c Thu Jan 1 16:22:06 2009
@@ -659,13 +659,13 @@
Arenas * const arena_base = interp->arena_base;
arena_base->lazy_dod = 0;
- Parrot_dod_ms_run_init(interp);
+ Parrot_gc_ms_run_init(interp);
/*
* trace root set w/o system areas
* TODO also skip volatile roots
*/
- Parrot_dod_trace_root(interp, 0);
+ Parrot_gc_trace_root(interp, 0);
g_ims = (Gc_ims_private *)arena_base->gc_private;
g_ims->state = GC_IMS_MARKING;
@@ -705,7 +705,7 @@
todo = (size_t)(g_ims->alloc_trigger * g_ims->throttle * work_factor);
PARROT_ASSERT(arena_base->lazy_dod == 0);
- Parrot_dod_trace_children(interp, todo);
+ Parrot_gc_trace_children(interp, todo);
/* check if we are finished with marking -- the end is self-referential */
next = arena_base->dod_mark_start;
@@ -730,10 +730,10 @@
{
int * const n_obj = (int *)arg;
- Parrot_dod_sweep(interp, pool);
+ Parrot_gc_sweep(interp, pool);
if (interp->profile && (flag & POOL_PMC))
- Parrot_dod_profile_end(interp, PARROT_PROF_DOD_cp);
+ Parrot_gc_profile_end(interp, PARROT_PROF_DOD_cp);
*n_obj += pool->total_objects - pool->num_free_objects;
@@ -770,10 +770,10 @@
*/
/* TODO mark volatile roots */
- Parrot_dod_trace_root(interp, g_ims->lazy ? 0 : (int)GC_trace_stack_FLAG);
+ Parrot_gc_trace_root(interp, g_ims->lazy ? 0 : (int)GC_trace_stack_FLAG);
/* mark (again) rest of children */
- Parrot_dod_trace_children(interp, (size_t) -1);
+ Parrot_gc_trace_children(interp, (size_t) -1);
/* now sweep all */
n_objects = 0;
@@ -782,7 +782,7 @@
UNUSED(ignored);
if (interp->profile)
- Parrot_dod_profile_end(interp, PARROT_PROF_DOD_cb);
+ Parrot_gc_profile_end(interp, PARROT_PROF_DOD_cb);
g_ims->state = GC_IMS_COLLECT;
g_ims->n_objects = n_objects;
@@ -861,7 +861,7 @@
int ret;
if (!check_only && interp->profile)
- Parrot_dod_profile_start(interp);
+ Parrot_gc_profile_start(interp);
g_ims = (Gc_ims_private *)arena_base->gc_private;
@@ -875,7 +875,7 @@
return 0;
if (interp->profile)
- Parrot_dod_profile_end(interp, PARROT_PROF_GC);
+ Parrot_gc_profile_end(interp, PARROT_PROF_GC);
g_ims->state = GC_IMS_FINISHED;
#endif
@@ -992,9 +992,9 @@
* Be sure live bits are clear.
*/
if (g_ims->state >= GC_IMS_RE_INIT || g_ims->state < GC_IMS_FINISHED)
- Parrot_dod_clear_live_bits(interp);
+ Parrot_gc_clear_live_bits(interp);
- Parrot_dod_sweep(interp, interp->arena_base->pmc_pool);
+ Parrot_gc_sweep(interp, interp->arena_base->pmc_pool);
g_ims->state = GC_IMS_DEAD;
return;
@@ -1064,7 +1064,7 @@
/*
-=item C<void Parrot_dod_ims_wb>
+=item C<void Parrot_gc_ims_wb>
Write barrier called by the GC_WRITE_BARRIER macro. Always when storing
a white object into a black aggregate, either the object must
@@ -1077,7 +1077,7 @@
#define DOD_IMS_GREY_NEW 1
void
-Parrot_dod_ims_wb(PARROT_INTERP, ARGMOD(PMC *agg), ARGMOD(PMC *_new))
+Parrot_gc_ims_wb(PARROT_INTERP, ARGMOD(PMC *agg), ARGMOD(PMC *_new))
{
#if DOD_IMS_GREY_NEW
IMS_DEBUG((stderr, "%d agg %p mark %p\n",
Modified: branches/pdd09gc_part2/src/gc/resources.c
==============================================================================
--- branches/pdd09gc_part2/src/gc/resources.c (original)
+++ branches/pdd09gc_part2/src/gc/resources.c Thu Jan 1 16:22:06 2009
@@ -347,7 +347,7 @@
++arena_base->GC_block_level;
if (interp->profile)
- Parrot_dod_profile_start(interp);
+ Parrot_gc_profile_start(interp);
/* We're collecting */
arena_base->mem_allocs_since_last_collect = 0;
@@ -548,7 +548,7 @@
pool->possibly_reclaimable = 0;
if (interp->profile)
- Parrot_dod_profile_end(interp, PARROT_PROF_GC);
+ Parrot_gc_profile_end(interp, PARROT_PROF_GC);
--arena_base->GC_block_level;
}
Modified: branches/pdd09gc_part2/src/gc/smallobject.c
==============================================================================
--- branches/pdd09gc_part2/src/gc/smallobject.c (original)
+++ branches/pdd09gc_part2/src/gc/smallobject.c Thu Jan 1 16:22:06 2009
@@ -501,7 +501,7 @@
{
Arenas * const arena_base = interp->arena_base;
- arena_base->do_gc_mark = Parrot_dod_ms_run;
+ arena_base->do_gc_mark = Parrot_gc_ms_run;
arena_base->finalize_gc_system = NULL;
arena_base->init_pool = gc_ms_pool_init;
}
Modified: branches/pdd09gc_part2/src/headers.c
==============================================================================
--- branches/pdd09gc_part2/src/headers.c (original)
+++ branches/pdd09gc_part2/src/headers.c Thu Jan 1 16:22:06 2009
@@ -136,7 +136,7 @@
new_small_object_pool(sizeof (PMC), num_headers);
pmc_pool->mem_pool = NULL;
- pmc_pool->dod_object = Parrot_dod_free_pmc;
+ pmc_pool->dod_object = Parrot_gc_free_pmc;
(interp->arena_base->init_pool)(interp, pmc_pool);
return pmc_pool;
@@ -164,7 +164,7 @@
Small_Object_Pool * const pool =
new_small_object_pool(buffer_size, num_headers);
- pool->dod_object = Parrot_dod_free_sysmem;
+ pool->dod_object = Parrot_gc_free_sysmem;
pool->mem_pool = interp->arena_base->memory_pool;
(interp->arena_base->init_pool)(interp, pool);
return pool;
@@ -191,9 +191,9 @@
Small_Object_Pool * const pool = make_bufferlike_pool(interp, sizeof
(Buffer));
#ifdef GC_IS_MALLOC
- pool->dod_object = Parrot_dod_free_buffer_malloc;
+ pool->dod_object = Parrot_gc_free_buffer_malloc;
#else
- pool->dod_object = Parrot_dod_free_buffer;
+ pool->dod_object = Parrot_gc_free_buffer;
#endif
return pool;
@@ -824,7 +824,7 @@
=item C<static int sweep_cb_buf>
Performs a final garbage collection sweep, and then frees the pool. Calls
-C<Parrot_dod_sweep> to perform the sweep, and C<free_pool> to free the
+C<Parrot_gc_sweep> to perform the sweep, and C<free_pool> to free the
pool and all it's arenas.
=cut
@@ -846,7 +846,7 @@
#endif
{
UNUSED(arg);
- Parrot_dod_sweep(interp, pool);
+ Parrot_gc_sweep(interp, pool);
free_pool(pool);
}
return 0;
@@ -858,7 +858,7 @@
=item C<static int sweep_cb_pmc>
Performs a garbage collection sweep of the given pmc pool, and then frees
-it. Calls C<Parrot_dod_sweep> to perform the sweep, and C<free_pool> to
+it. Calls C<Parrot_gc_sweep> to perform the sweep, and C<free_pool> to
free the pool and all it's arenas. Always returns C<0>.
=cut
@@ -869,7 +869,7 @@
sweep_cb_pmc(PARROT_INTERP, ARGMOD(Small_Object_Pool *pool),
SHIM(int flag), SHIM(void *arg))
{
- Parrot_dod_sweep(interp, pool);
+ Parrot_gc_sweep(interp, pool);
free_pool(pool);
return 0;
}
Modified: branches/pdd09gc_part2/src/thread.c
==============================================================================
--- branches/pdd09gc_part2/src/thread.c (original)
+++ branches/pdd09gc_part2/src/thread.c Thu Jan 1 16:22:06 2009
@@ -1195,7 +1195,7 @@
/* mark and sweep our world -- later callbacks will keep
* it sync'd
*/
- Parrot_dod_ms_run(interp, GC_trace_stack_FLAG);
+ Parrot_gc_ms_run(interp, GC_trace_stack_FLAG);
PARROT_ASSERT(!(interp->thread_data->state & THREAD_STATE_SUSPENDED_GC));
}
