[svn:parrot] r36605 - in trunk: include/parrot src src/gc

cotto at svn.parrot.org cotto at svn.parrot.org
Wed Feb 11 23:30:57 UTC 2009


Author: cotto
Date: Wed Feb 11 23:30:55 2009
New Revision: 36605
URL: https://trac.parrot.org/parrot/changeset/36605

Log:
[gc] rename PROF_DOD_* to PROF_GC_*

Modified:
   trunk/include/parrot/interpreter.h
   trunk/src/embed.c
   trunk/src/gc/gc_malloc.c
   trunk/src/gc/incremental_ms.c
   trunk/src/gc/mark_sweep.c

Modified: trunk/include/parrot/interpreter.h
==============================================================================
--- trunk/include/parrot/interpreter.h	Wed Feb 11 23:21:26 2009	(r36604)
+++ trunk/include/parrot/interpreter.h	Wed Feb 11 23:30:55 2009	(r36605)
@@ -153,10 +153,10 @@
  * one entry per op at (op + extra) */
 
 typedef enum {
-     PARROT_PROF_DOD_p1,        /* pass 1 mark root set */
-     PARROT_PROF_DOD_p2,        /* pass 2 mark next_for_GC */
-     PARROT_PROF_DOD_cp,        /* collect PMCs */
-     PARROT_PROF_DOD_cb,        /* collect buffers */
+     PARROT_PROF_GC_p1,        /* pass 1 mark root set */
+     PARROT_PROF_GC_p2,        /* pass 2 mark next_for_GC */
+     PARROT_PROF_GC_cp,        /* collect PMCs */
+     PARROT_PROF_GC_cb,        /* collect buffers */
      /* DOD must be 0..3 */
      PARROT_PROF_GC,
      PARROT_PROF_EXCEPTION,

Modified: trunk/src/embed.c
==============================================================================
--- trunk/src/embed.c	Wed Feb 11 23:21:26 2009	(r36604)
+++ trunk/src/embed.c	Wed Feb 11 23:30:55 2009	(r36605)
@@ -669,13 +669,13 @@
 {
     ASSERT_ARGS(op_name)
     switch (k) {
-        case PARROT_PROF_DOD_p1:
+        case PARROT_PROF_GC_p1:
             return "DOD_mark_root";
-        case PARROT_PROF_DOD_p2:
+        case PARROT_PROF_GC_p2:
             return "DOD_mark_next";
-        case PARROT_PROF_DOD_cp:
+        case PARROT_PROF_GC_cp:
             return "DOD_collect_PMC";
-        case PARROT_PROF_DOD_cb:
+        case PARROT_PROF_GC_cb:
             return "DOD_collect_buffers";
         case PARROT_PROF_GC:
             return "GC";

Modified: trunk/src/gc/gc_malloc.c
==============================================================================
--- trunk/src/gc/gc_malloc.c	Wed Feb 11 23:21:26 2009	(r36604)
+++ trunk/src/gc/gc_malloc.c	Wed Feb 11 23:30:55 2009	(r36605)
@@ -83,7 +83,7 @@
         clear_cow(interp, pool, 0);
 
     if (interp->profile && (flag & POOL_PMC))
-        Parrot_gc_profile_end(interp, PARROT_PROF_DOD_cp);
+        Parrot_gc_profile_end(interp, PARROT_PROF_GC_cp);
 
     *total_free += pool->num_free_objects;
 

Modified: trunk/src/gc/incremental_ms.c
==============================================================================
--- trunk/src/gc/incremental_ms.c	Wed Feb 11 23:21:26 2009	(r36604)
+++ trunk/src/gc/incremental_ms.c	Wed Feb 11 23:30:55 2009	(r36605)
@@ -775,7 +775,7 @@
     Parrot_gc_sweep(interp, pool);
 
     if (interp->profile && (flag & POOL_PMC))
-        Parrot_gc_profile_end(interp, PARROT_PROF_DOD_cp);
+        Parrot_gc_profile_end(interp, PARROT_PROF_GC_cp);
 
     *n_obj += pool->total_objects - pool->num_free_objects;
 
@@ -826,7 +826,7 @@
     UNUSED(ignored);
 
     if (interp->profile)
-        Parrot_gc_profile_end(interp, PARROT_PROF_DOD_cb);
+        Parrot_gc_profile_end(interp, PARROT_PROF_GC_cb);
 
     g_ims->state           = GC_IMS_COLLECT;
     g_ims->n_objects       = n_objects;

Modified: trunk/src/gc/mark_sweep.c
==============================================================================
--- trunk/src/gc/mark_sweep.c	Wed Feb 11 23:21:26 2009	(r36604)
+++ trunk/src/gc/mark_sweep.c	Wed Feb 11 23:30:55 2009	(r36605)
@@ -222,7 +222,7 @@
         UNUSED(ignored);
 
         if (interp->profile)
-            Parrot_gc_profile_end(interp, PARROT_PROF_DOD_cb);
+            Parrot_gc_profile_end(interp, PARROT_PROF_GC_cb);
     }
     else {
         pt_gc_stop_mark(interp); /* XXX */
@@ -232,7 +232,7 @@
 
         Parrot_gc_clear_live_bits(interp);
         if (interp->profile)
-            Parrot_gc_profile_end(interp, PARROT_PROF_DOD_p2);
+            Parrot_gc_profile_end(interp, PARROT_PROF_GC_p2);
     }
 
     /* Note it */
@@ -361,7 +361,7 @@
         trace_system_areas(interp);
 
     if (interp->profile)
-        Parrot_gc_profile_end(interp, PARROT_PROF_DOD_p1);
+        Parrot_gc_profile_end(interp, PARROT_PROF_GC_p1);
 
     return 1;
 }
@@ -854,7 +854,7 @@
     Parrot_gc_sweep(interp, pool);
 
     if (interp->profile && (flag & POOL_PMC))
-        Parrot_gc_profile_end(interp, PARROT_PROF_DOD_cp);
+        Parrot_gc_profile_end(interp, PARROT_PROF_GC_cp);
 
     *total_free += pool->num_free_objects;
 
@@ -1009,7 +1009,7 @@
     arena_base->gc_trace_ptr  = NULL;
 
     if (interp->profile)
-        Parrot_gc_profile_end(interp, PARROT_PROF_DOD_p2);
+        Parrot_gc_profile_end(interp, PARROT_PROF_GC_p2);
 
     return 1;
 }


More information about the parrot-commits mailing list