[svn:parrot] r36543 - in trunk: include/parrot src src/gc src/ops src/pmc src/string
cotto at svn.parrot.org
cotto at svn.parrot.org
Tue Feb 10 16:21:30 UTC 2009
Author: cotto
Date: Tue Feb 10 16:21:29 2009
New Revision: 36543
URL: https://trac.parrot.org/parrot/changeset/36543
Log:
[gc] update do_dod_run to do_gc_run
Modified:
trunk/include/parrot/gc_api.h
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/resources.c
trunk/src/inter_create.c
trunk/src/ops/core.ops
trunk/src/pmc/filehandle.pmc
trunk/src/pmc/parrotinterpreter.pmc
trunk/src/pmc_freeze.c
trunk/src/runops_cores.c
trunk/src/string/api.c
Modified: trunk/include/parrot/gc_api.h
==============================================================================
--- trunk/include/parrot/gc_api.h Tue Feb 10 16:14:03 2009 (r36542)
+++ trunk/include/parrot/gc_api.h Tue Feb 10 16:21:29 2009 (r36543)
@@ -85,7 +85,7 @@
STRING * new_string_header(PARROT_INTERP, UINTVAL flags)
__attribute__nonnull__(1);
-void Parrot_do_dod_run(PARROT_INTERP, UINTVAL flags)
+void Parrot_do_gc_run(PARROT_INTERP, UINTVAL flags)
__attribute__nonnull__(1);
void Parrot_gc_free_buffer(SHIM_INTERP,
@@ -143,7 +143,7 @@
PARROT_ASSERT_ARG(interp)
#define ASSERT_ARGS_new_string_header __attribute__unused__ int _ASSERT_ARGS_CHECK = \
PARROT_ASSERT_ARG(interp)
-#define ASSERT_ARGS_Parrot_do_dod_run __attribute__unused__ int _ASSERT_ARGS_CHECK = \
+#define ASSERT_ARGS_Parrot_do_gc_run __attribute__unused__ int _ASSERT_ARGS_CHECK = \
PARROT_ASSERT_ARG(interp)
#define ASSERT_ARGS_Parrot_gc_free_buffer __attribute__unused__ int _ASSERT_ARGS_CHECK = \
PARROT_ASSERT_ARG(pool) \
Modified: trunk/src/gc/api.c
==============================================================================
--- trunk/src/gc/api.c Tue Feb 10 16:14:03 2009 (r36542)
+++ trunk/src/gc/api.c Tue Feb 10 16:21:29 2009 (r36543)
@@ -500,7 +500,7 @@
/*
-=item C<void Parrot_do_dod_run>
+=item C<void Parrot_do_gc_run>
Calls the configured garbage collector to find and reclaim unused
headers.
@@ -510,9 +510,9 @@
*/
void
-Parrot_do_dod_run(PARROT_INTERP, UINTVAL flags)
+Parrot_do_gc_run(PARROT_INTERP, UINTVAL flags)
{
- ASSERT_ARGS(Parrot_do_dod_run)
+ ASSERT_ARGS(Parrot_do_gc_run)
interp->arena_base->do_gc_mark(interp, flags);
parrot_gc_context(interp);
}
Modified: trunk/src/gc/generational_ms.c
==============================================================================
--- trunk/src/gc/generational_ms.c Tue Feb 10 16:14:03 2009 (r36542)
+++ trunk/src/gc/generational_ms.c Tue Feb 10 16:21:29 2009 (r36543)
@@ -741,7 +741,7 @@
if (pool->skip)
pool->skip = 0;
else if (pool->last_Arena) {
- Parrot_do_dod_run(interp, GC_trace_stack_FLAG);
+ Parrot_do_gc_run(interp, GC_trace_stack_FLAG);
if (pool->num_free_objects <= pool->replenish_level)
pool->skip = 1;
}
@@ -1829,7 +1829,7 @@
=item C<static void parrot_gc_gms_run>
-Interface to C<Parrot_do_dod_run>. C<flags> is one of:
+Interface to C<Parrot_do_gc_run>. C<flags> is one of:
GC_lazy_FLAG ... timely destruction
GC_finish_FLAG ... run a final sweep to destruct objects at
Modified: trunk/src/gc/incremental_ms.c
==============================================================================
--- trunk/src/gc/incremental_ms.c Tue Feb 10 16:14:03 2009 (r36542)
+++ trunk/src/gc/incremental_ms.c Tue Feb 10 16:21:29 2009 (r36543)
@@ -1011,7 +1011,7 @@
=item C<static void parrot_gc_ims_run>
-Interface to C<Parrot_do_dod_run>. C<flags> is one of:
+Interface to C<Parrot_do_gc_run>. C<flags> is one of:
GC_lazy_FLAG ... timely destruction
GC_finish_FLAG ... run until live bits are clear
Modified: trunk/src/gc/mark_sweep.c
==============================================================================
--- trunk/src/gc/mark_sweep.c Tue Feb 10 16:14:03 2009 (r36542)
+++ trunk/src/gc/mark_sweep.c Tue Feb 10 16:21:29 2009 (r36543)
@@ -698,14 +698,14 @@
Small_Object_Arena * const arena = pool->last_Arena;
if (arena) {
if (arena->used == arena->total_objects)
- Parrot_do_dod_run(interp, GC_trace_stack_FLAG);
+ Parrot_do_gc_run(interp, GC_trace_stack_FLAG);
if (pool->num_free_objects <= pool->replenish_level)
pool->skip = 1;
}
}
- /* requires that num_free_objects be updated in Parrot_do_dod_run. If dod
+ /* requires that num_free_objects be updated in Parrot_do_gc_run. If dod
* is disabled, then we must check the free list directly. */
if (!pool->free_list)
(*pool->alloc_objects) (interp, pool);
Modified: trunk/src/gc/resources.c
==============================================================================
--- trunk/src/gc/resources.c Tue Feb 10 16:14:03 2009 (r36542)
+++ trunk/src/gc/resources.c Tue Feb 10 16:21:29 2009 (r36543)
@@ -247,7 +247,7 @@
*/
if (!interp->arena_base->DOD_block_level
&& interp->arena_base->mem_allocs_since_last_collect) {
- Parrot_do_dod_run(interp, GC_trace_stack_FLAG);
+ Parrot_do_gc_run(interp, GC_trace_stack_FLAG);
#if !PARROT_GC_IMS
/* Compact the pool if allowed and worthwhile */
if (pool->compact) {
Modified: trunk/src/inter_create.c
==============================================================================
--- trunk/src/inter_create.c Tue Feb 10 16:14:03 2009 (r36542)
+++ trunk/src/inter_create.c Tue Feb 10 16:21:29 2009 (r36543)
@@ -348,7 +348,7 @@
if (interp->thread_data)
interp->thread_data->state |= THREAD_STATE_SUSPENDED_GC;
- Parrot_do_dod_run(interp, GC_finish_FLAG);
+ Parrot_do_gc_run(interp, GC_finish_FLAG);
/*
* that doesn't get rid of constant PMCs like these in vtable->data
Modified: trunk/src/ops/core.ops
==============================================================================
--- trunk/src/ops/core.ops Tue Feb 10 16:14:03 2009 (r36542)
+++ trunk/src/ops/core.ops Tue Feb 10 16:21:29 2009 (r36543)
@@ -1219,10 +1219,10 @@
op sweep(inconst INT) {
if ($1)
- Parrot_do_dod_run(interp, 0);
+ Parrot_do_gc_run(interp, 0);
else
if (interp->arena_base->num_early_DOD_PMCs)
- Parrot_do_dod_run(interp, GC_lazy_FLAG);
+ Parrot_do_gc_run(interp, GC_lazy_FLAG);
}
=item B<collect>()
Modified: trunk/src/pmc/filehandle.pmc
==============================================================================
--- trunk/src/pmc/filehandle.pmc Tue Feb 10 16:14:03 2009 (r36542)
+++ trunk/src/pmc/filehandle.pmc Tue Feb 10 16:21:29 2009 (r36543)
@@ -508,7 +508,7 @@
#if ! DISABLE_GC_DEBUG
/* trigger GC for debug - but not during tests */
if (0 && GC_DEBUG(interp))
- Parrot_do_dod_run(interp, GC_trace_stack_FLAG);
+ Parrot_do_gc_run(interp, GC_trace_stack_FLAG);
#endif
if (Parrot_io_is_encoding(interp, SELF, CONST_STRING(interp, "utf8")))
Modified: trunk/src/pmc/parrotinterpreter.pmc
==============================================================================
--- trunk/src/pmc/parrotinterpreter.pmc Tue Feb 10 16:14:03 2009 (r36542)
+++ trunk/src/pmc/parrotinterpreter.pmc Tue Feb 10 16:21:29 2009 (r36543)
@@ -702,7 +702,7 @@
}
METHOD run_gc() {
- Parrot_do_dod_run(PMC_data_typed(SELF, Parrot_Interp), 0);
+ Parrot_do_gc_run(PMC_data_typed(SELF, Parrot_Interp), 0);
}
/*
Modified: trunk/src/pmc_freeze.c
==============================================================================
--- trunk/src/pmc_freeze.c Tue Feb 10 16:14:03 2009 (r36542)
+++ trunk/src/pmc_freeze.c Tue Feb 10 16:21:29 2009 (r36543)
@@ -1839,7 +1839,7 @@
* collected under us.
*/
if (1 || (Parrot_str_byte_length(interp, image) > THAW_BLOCK_DOD_SIZE)) {
- Parrot_do_dod_run(interp, 1);
+ Parrot_do_gc_run(interp, 1);
Parrot_block_GC_mark(interp);
Parrot_block_GC_sweep(interp);
dod_block = 1;
Modified: trunk/src/runops_cores.c
==============================================================================
--- trunk/src/runops_cores.c Tue Feb 10 16:14:03 2009 (r36542)
+++ trunk/src/runops_cores.c Tue Feb 10 16:21:29 2009 (r36543)
@@ -477,7 +477,7 @@
Parrot_ex_throw_from_c_args(interp, NULL, 1,
"attempt to access code outside of current code segment");
- Parrot_do_dod_run(interp, 0);
+ Parrot_do_gc_run(interp, 0);
CONTEXT(interp)->current_pc = pc;
DO_OP(pc, interp);
@@ -569,7 +569,7 @@
"attempt to access code outside of current code segment");
if (interp->pdb->state & PDB_GCDEBUG)
- Parrot_do_dod_run(interp, 0);
+ Parrot_do_gc_run(interp, 0);
if (interp->pdb->state & PDB_TRACING) {
trace_op(interp,
Modified: trunk/src/string/api.c
==============================================================================
--- trunk/src/string/api.c Tue Feb 10 16:14:03 2009 (r36542)
+++ trunk/src/string/api.c Tue Feb 10 16:21:29 2009 (r36543)
@@ -1609,7 +1609,7 @@
#if ! DISABLE_GC_DEBUG
/* trigger GC for debug */
if (interp && GC_DEBUG(interp))
- Parrot_do_dod_run(interp, GC_trace_stack_FLAG);
+ Parrot_do_gc_run(interp, GC_trace_stack_FLAG);
#endif
make_writable(interp, &res, minlen, enum_stringrep_one);
@@ -1761,7 +1761,7 @@
#if ! DISABLE_GC_DEBUG
/* trigger GC for debug */
if (interp && GC_DEBUG(interp))
- Parrot_do_dod_run(interp, GC_trace_stack_FLAG);
+ Parrot_do_gc_run(interp, GC_trace_stack_FLAG);
#endif
make_writable(interp, &res, maxlen, enum_stringrep_one);
@@ -1836,7 +1836,7 @@
#if ! DISABLE_GC_DEBUG
/* trigger GC for debug */
if (interp && GC_DEBUG(interp))
- Parrot_do_dod_run(interp, GC_trace_stack_FLAG);
+ Parrot_do_gc_run(interp, GC_trace_stack_FLAG);
#endif
make_writable(interp, &res, maxlen, enum_stringrep_one);
@@ -1914,7 +1914,7 @@
#if ! DISABLE_GC_DEBUG
/* trigger GC for debug */
if (interp && GC_DEBUG(interp))
- Parrot_do_dod_run(interp, GC_trace_stack_FLAG);
+ Parrot_do_gc_run(interp, GC_trace_stack_FLAG);
#endif
make_writable(interp, &res, len, enum_stringrep_one);
More information about the parrot-commits
mailing list