[svn:parrot] r36632 - in trunk: compilers/imcc src src/gc t/op tools/build
cotto at svn.parrot.org
cotto at svn.parrot.org
Thu Feb 12 12:46:17 UTC 2009
Author: cotto
Date: Thu Feb 12 12:46:16 2009
New Revision: 36632
URL: https://trac.parrot.org/parrot/changeset/36632
Log:
[gc] various changes to remove/replace DOD in comments and macros
Modified:
trunk/compilers/imcc/parser_util.c
trunk/src/debug.c
trunk/src/embed.c
trunk/src/gc/api.c
trunk/src/gc/incremental_ms.c
trunk/src/pmc_freeze.c
trunk/src/runops_cores.c
trunk/t/op/interp.t
trunk/tools/build/vtable_extend.pl
Modified: trunk/compilers/imcc/parser_util.c
==============================================================================
--- trunk/compilers/imcc/parser_util.c Thu Feb 12 12:29:57 2009 (r36631)
+++ trunk/compilers/imcc/parser_util.c Thu Feb 12 12:46:16 2009 (r36632)
@@ -625,7 +625,7 @@
do_yylex_init(interp, &yyscanner);
- /* we create not yet anchored PMCs - e.g. Subs: turn off DOD */
+ /* we create not yet anchored PMCs - e.g. Subs: turn off GC */
Parrot_block_GC_mark(interp);
if (IMCC_INFO(interp)->last_unit) {
@@ -934,7 +934,7 @@
IMCC_INFO(interp)->line = 1;
/*
- * the Parrot_str_compare() called from pmc_type() triggers DOD
+ * the Parrot_str_compare() called from pmc_type() triggers GC
* which can destroy packfiles under construction
*/
Parrot_block_GC_mark(interp);
Modified: trunk/src/debug.c
==============================================================================
--- trunk/src/debug.c Thu Feb 12 12:29:57 2009 (r36631)
+++ trunk/src/debug.c Thu Feb 12 12:46:16 2009 (r36632)
@@ -3341,7 +3341,7 @@
interpinfo(interp, ACTIVE_PMCS));
Parrot_io_eprintf(interp, "Extended PMCs = %ld\n",
interpinfo(interp, EXTENDED_PMCS));
- Parrot_io_eprintf(interp, "Timely DOD PMCs = %ld\n",
+ Parrot_io_eprintf(interp, "Timely GC PMCs = %ld\n",
interpinfo(interp, IMPATIENT_PMCS));
Parrot_io_eprintf(interp, "Total PMCs = %ld\n",
interpinfo(interp, TOTAL_PMCS));
Modified: trunk/src/embed.c
==============================================================================
--- trunk/src/embed.c Thu Feb 12 12:29:57 2009 (r36631)
+++ trunk/src/embed.c Thu Feb 12 12:46:16 2009 (r36632)
@@ -670,13 +670,13 @@
ASSERT_ARGS(op_name)
switch (k) {
case PARROT_PROF_GC_p1:
- return "DOD_mark_root";
+ return "GC_mark_root";
case PARROT_PROF_GC_p2:
- return "DOD_mark_next";
+ return "GC_mark_next";
case PARROT_PROF_GC_cp:
- return "DOD_collect_PMC";
+ return "GC_collect_PMC";
case PARROT_PROF_GC_cb:
- return "DOD_collect_buffers";
+ return "GC_collect_buffers";
case PARROT_PROF_GC:
return "GC";
case PARROT_PROF_EXCEPTION:
Modified: trunk/src/gc/api.c
==============================================================================
--- trunk/src/gc/api.c Thu Feb 12 12:29:57 2009 (r36631)
+++ trunk/src/gc/api.c Thu Feb 12 12:46:16 2009 (r36632)
@@ -23,7 +23,7 @@
*/
-#define DOD_C_SOURCE
+#define GC_C_SOURCE
#include "parrot/parrot.h"
#include "parrot/gc_api.h"
#include "gc_private.h"
Modified: trunk/src/gc/incremental_ms.c
==============================================================================
--- trunk/src/gc/incremental_ms.c Thu Feb 12 12:29:57 2009 (r36631)
+++ trunk/src/gc/incremental_ms.c Thu Feb 12 12:46:16 2009 (r36632)
@@ -1117,13 +1117,13 @@
*/
-#define DOD_IMS_GREY_NEW 1
+#define GC_IMS_GREY_NEW 1
void
Parrot_gc_ims_wb(PARROT_INTERP, ARGMOD(PMC *agg), ARGMOD(PMC *_new))
{
ASSERT_ARGS(Parrot_gc_ims_wb)
-#if DOD_IMS_GREY_NEW
+#if GC_IMS_GREY_NEW
IMS_DEBUG((stderr, "%d agg %p mark %p\n",
((Gc_ims_private *)interp->arena_base->
gc_private)->state, agg, _new));
Modified: trunk/src/pmc_freeze.c
==============================================================================
--- trunk/src/pmc_freeze.c Thu Feb 12 12:29:57 2009 (r36631)
+++ trunk/src/pmc_freeze.c Thu Feb 12 12:46:16 2009 (r36632)
@@ -448,7 +448,7 @@
/* when thawing a string longer then this size, we first do a GC run and then
* block GC - the system can't give us more headers */
-#define THAW_BLOCK_DOD_SIZE 100000
+#define THAW_BLOCK_GC_SIZE 100000
/* preallocate freeze image for aggregates with this estimation */
#if FREEZE_ASCII
@@ -1838,7 +1838,7 @@
* info->thaw_ptr becomes invalid - seems that the hash got
* collected under us.
*/
- if (1 || (Parrot_str_byte_length(interp, image) > THAW_BLOCK_DOD_SIZE)) {
+ if (1 || (Parrot_str_byte_length(interp, image) > THAW_BLOCK_GC_SIZE)) {
Parrot_do_gc_run(interp, 1);
Parrot_block_GC_mark(interp);
Parrot_block_GC_sweep(interp);
Modified: trunk/src/runops_cores.c
==============================================================================
--- trunk/src/runops_cores.c Thu Feb 12 12:29:57 2009 (r36631)
+++ trunk/src/runops_cores.c Thu Feb 12 12:46:16 2009 (r36632)
@@ -401,12 +401,12 @@
if (gc_mark_runs != arena_base->gc_mark_runs) {
gc_mark_runs = arena_base->gc_mark_runs;
- Parrot_io_eprintf(debugger, " DOD\n");
+ Parrot_io_eprintf(debugger, " GC mark\n");
}
if (gc_collect_runs != arena_base->gc_collect_runs) {
gc_collect_runs = arena_base->gc_collect_runs;
- Parrot_io_eprintf(debugger, " GC\n");
+ Parrot_io_eprintf(debugger, " GC collect\n");
}
}
Modified: trunk/t/op/interp.t
==============================================================================
--- trunk/t/op/interp.t Thu Feb 12 12:29:57 2009 (r36631)
+++ trunk/t/op/interp.t Thu Feb 12 12:46:16 2009 (r36632)
@@ -76,7 +76,7 @@
OUTPUT
# Need to disable GC while trace is on, as there's a non-zero chance that a
-# GC sweep would occur, causing a bonus "DOD" line in the output, which makes
+# GC sweep would occur, causing a bonus "GC mark" line in the output, which makes
# the test fail.
pasm_output_like(
<<'CODE', <<'OUTPUT', "restart trace" );
Modified: trunk/tools/build/vtable_extend.pl
==============================================================================
--- trunk/tools/build/vtable_extend.pl Thu Feb 12 12:29:57 2009 (r36631)
+++ trunk/tools/build/vtable_extend.pl Thu Feb 12 12:46:16 2009 (r36632)
@@ -90,7 +90,7 @@
/* HEADERIZER STOP */
/* Some internal notes. Parrot will die a horrible and bizarre death
- if the stack start pointer's not set and a DOD run is
+ if the stack start pointer's not set and a GC run is
triggered. The pointer *will* be set by the interpreter if the
interpreter calls code which calls these functions, so most
extension code is safe, no problem.
More information about the parrot-commits
mailing list