[svn:parrot] r36557 - in trunk: lib/Parrot src src/gc

[cotto at svn.parrot.org]

Author: cotto
Date: Tue Feb 10 22:45:35 2009
New Revision: 36557
URL: https://trac.parrot.org/parrot/changeset/36557

Log:
[gc] fix final references to "dod" and the now nonexistent docs/dev/dod.pod

Modified:
   trunk/lib/Parrot/Manifest.pm
   trunk/src/gc/api.c
   trunk/src/gc/mark_sweep.c
   trunk/src/runops_cores.c

Modified: trunk/lib/Parrot/Manifest.pm
==============================================================================
--- trunk/lib/Parrot/Manifest.pm	Tue Feb 10 19:57:33 2009	(r36556)
+++ trunk/lib/Parrot/Manifest.pm	Tue Feb 10 22:45:35 2009	(r36557)
@@ -160,7 +160,6 @@
         docs/compiler_faq.pod                           [devel]doc
         docs/configuration.pod                          [devel]doc
         docs/debug.pod                                  [devel]doc
-        docs/dev/dod.pod                                [devel]doc
         docs/dev/events.pod                             [devel]doc
         docs/dev/fhs.pod                                [devel]doc
         docs/dev/infant.pod                             [devel]doc

Modified: trunk/src/gc/api.c
==============================================================================
--- trunk/src/gc/api.c	Tue Feb 10 19:57:33 2009	(r36556)
+++ trunk/src/gc/api.c	Tue Feb 10 22:45:35 2009	(r36557)
@@ -13,7 +13,7 @@
 may operate very differently internally. The functions in this file can be used
 throughtout Parrot without having to be concerned about the internal operations
 of the GC. This is documented in PDD 9 with supplementary notes in
-F<docs/dev/dod.pod> and F<docs/memory_internals.pod>.
+F<docs/memory_internals.pod>.
 
 =head1 FUNCTIONS
 
@@ -523,8 +523,7 @@
 
 =head1 SEE ALSO
 
-F<include/parrot/gc_api.h>, F<src/cpu_dep.c>, F<docs/dev/dod.dev> and
-F<docs/pdds/pdd09_gc.pod>.
+F<include/parrot/gc_api.h>, F<src/cpu_dep.c> and F<docs/pdds/pdd09_gc.pod>.
 
 =head1 HISTORY
 

Modified: trunk/src/gc/mark_sweep.c
==============================================================================
--- trunk/src/gc/mark_sweep.c	Tue Feb 10 19:57:33 2009	(r36556)
+++ trunk/src/gc/mark_sweep.c	Tue Feb 10 22:45:35 2009	(r36557)
@@ -603,7 +603,7 @@
     Arenas *arena_base;
 
     /*
-     * If the object is shared, we have to use the arena and dod
+     * If the object is shared, we have to use the arena and gc
      * pointers of the originating interpreter.
      *
      * We are possibly changing another interpreter's data here, so
@@ -705,7 +705,7 @@
         }
     }
 
-    /* requires that num_free_objects be updated in Parrot_do_gc_run. If dod
+    /* requires that num_free_objects be updated in Parrot_do_gc_run. If gc
      * is disabled, then we must check the free list directly. */
     if (!pool->free_list)
         (*pool->alloc_objects) (interp, pool);

Modified: trunk/src/runops_cores.c
==============================================================================
--- trunk/src/runops_cores.c	Tue Feb 10 19:57:33 2009	(r36556)
+++ trunk/src/runops_cores.c	Tue Feb 10 22:45:35 2009	(r36557)
@@ -346,12 +346,13 @@
 runops_trace_core(PARROT_INTERP, ARGIN(opcode_t *pc))
 {
     ASSERT_ARGS(runops_trace_core)
-    static size_t dod, gc;
+
+    static size_t  gc_runs, collect_runs;
     Arenas * const arena_base = interp->arena_base;
-    Interp *debugger;
+    Interp        *debugger;
 
-    dod = arena_base->gc_runs;
-    gc = arena_base->collect_runs;
+    gc_runs      = arena_base->gc_runs;
+    collect_runs = arena_base->collect_runs;
     if (interp->pdb) {
         debugger = interp->pdb->debugger;
         PARROT_ASSERT(debugger);
@@ -398,13 +399,13 @@
         DO_OP(pc, interp);
         trace_op(interp, code_start, code_end, pc);
 
-        if (dod != arena_base->gc_runs) {
-            dod = arena_base->gc_runs;
+        if (gc_runs != arena_base->gc_runs) {
+            gc_runs = arena_base->gc_runs;
             Parrot_io_eprintf(debugger, "       DOD\n");
         }
 
-        if (gc != arena_base->collect_runs) {
-            gc = arena_base->collect_runs;
+        if (collect_runs != arena_base->collect_runs) {
+            collect_runs  = arena_base->collect_runs;
             Parrot_io_eprintf(debugger, "       GC\n");
         }
     }