[svn:parrot] r49477 - branches/generational_gc/src/gc

[bacek at svn.parrot.org]

Author: bacek
Date: Fri Oct  8 10:58:24 2010
New Revision: 49477
URL: https://trac.parrot.org/parrot/changeset/49477

Log:
Rename GC.mark_pobj_header into .mark_str_header to reflect semantics.

Modified:
   branches/generational_gc/src/gc/api.c
   branches/generational_gc/src/gc/gc_ms.c
   branches/generational_gc/src/gc/gc_ms2.c
   branches/generational_gc/src/gc/gc_private.h

Modified: branches/generational_gc/src/gc/api.c
==============================================================================
--- branches/generational_gc/src/gc/api.c	Fri Oct  8 10:57:58 2010	(r49476)
+++ branches/generational_gc/src/gc/api.c	Fri Oct  8 10:58:24 2010	(r49477)
@@ -125,7 +125,7 @@
         interp->gc_sys->mark_pmc_header(interp, (PMC*) obj);
     }
     else {
-        interp->gc_sys->mark_pobj_header(interp, obj);
+        interp->gc_sys->mark_str_header(interp, (STRING*) obj);
     }
 }
 
@@ -162,7 +162,8 @@
 Parrot_gc_mark_STRING_alive_fun(PARROT_INTERP, ARGMOD_NULLOK(STRING *obj))
 {
     ASSERT_ARGS(Parrot_gc_mark_STRING_alive_fun)
-    interp->gc_sys->mark_pobj_header(interp, (PObj*)obj);
+    if (obj)
+        interp->gc_sys->mark_str_header(interp, obj);
 }
 
 /*

Modified: branches/generational_gc/src/gc/gc_ms.c
==============================================================================
--- branches/generational_gc/src/gc/gc_ms.c	Fri Oct  8 10:57:58 2010	(r49476)
+++ branches/generational_gc/src/gc/gc_ms.c	Fri Oct  8 10:58:24 2010	(r49477)
@@ -171,14 +171,14 @@
 static void gc_ms_mark_and_sweep(PARROT_INTERP, UINTVAL flags)
         __attribute__nonnull__(1);
 
-static void gc_ms_mark_pobj_header(PARROT_INTERP, ARGMOD_NULLOK(PObj *obj))
-        __attribute__nonnull__(1)
-        FUNC_MODIFIES(*obj);
-
 static void gc_ms_mark_special(PARROT_INTERP, ARGIN(PMC *pmc))
         __attribute__nonnull__(1)
         __attribute__nonnull__(2);
 
+static void gc_ms_mark_str_header(PARROT_INTERP, ARGMOD_NULLOK(STRING *obj))
+        __attribute__nonnull__(1)
+        FUNC_MODIFIES(*obj);
+
 static void gc_ms_more_traceable_objects(PARROT_INTERP,
     ARGIN(Memory_Pools *mem_pools),
     ARGMOD(Fixed_Size_Pool *pool))
@@ -329,11 +329,11 @@
        PARROT_ASSERT_ARG(interp))
 #define ASSERT_ARGS_gc_ms_mark_and_sweep __attribute__unused__ int _ASSERT_ARGS_CHECK = (\
        PARROT_ASSERT_ARG(interp))
-#define ASSERT_ARGS_gc_ms_mark_pobj_header __attribute__unused__ int _ASSERT_ARGS_CHECK = (\
-       PARROT_ASSERT_ARG(interp))
 #define ASSERT_ARGS_gc_ms_mark_special __attribute__unused__ int _ASSERT_ARGS_CHECK = (\
        PARROT_ASSERT_ARG(interp) \
     , PARROT_ASSERT_ARG(pmc))
+#define ASSERT_ARGS_gc_ms_mark_str_header __attribute__unused__ int _ASSERT_ARGS_CHECK = (\
+       PARROT_ASSERT_ARG(interp))
 #define ASSERT_ARGS_gc_ms_more_traceable_objects __attribute__unused__ int _ASSERT_ARGS_CHECK = (\
        PARROT_ASSERT_ARG(interp) \
     , PARROT_ASSERT_ARG(mem_pools) \
@@ -422,7 +422,7 @@
     interp->gc_sys->is_pmc_ptr              = gc_ms_is_pmc_ptr;
     interp->gc_sys->is_string_ptr           = gc_ms_is_string_ptr;
     interp->gc_sys->mark_pmc_header         = gc_ms_mark_pmc_header;
-    interp->gc_sys->mark_pobj_header        = gc_ms_mark_pobj_header;
+    interp->gc_sys->mark_str_header         = gc_ms_mark_str_header;
 
     interp->gc_sys->allocate_pmc_attributes = gc_ms_allocate_pmc_attributes;
     interp->gc_sys->free_pmc_attributes     = gc_ms_free_pmc_attributes;
@@ -940,9 +940,9 @@
 */
 
 static void
-gc_ms_mark_pobj_header(PARROT_INTERP, ARGMOD_NULLOK(PObj *obj))
+gc_ms_mark_str_header(PARROT_INTERP, ARGMOD_NULLOK(STRING *obj))
 {
-    ASSERT_ARGS(gc_ms_mark_pobj_header)
+    ASSERT_ARGS(gc_ms_mark_str_header)
     if (obj) {
         /* mark it live */
         PObj_live_SET(obj);

Modified: branches/generational_gc/src/gc/gc_ms2.c
==============================================================================
--- branches/generational_gc/src/gc/gc_ms2.c	Fri Oct  8 10:57:58 2010	(r49476)
+++ branches/generational_gc/src/gc/gc_ms2.c	Fri Oct  8 10:58:24 2010	(r49477)
@@ -239,9 +239,6 @@
         __attribute__nonnull__(1)
         __attribute__nonnull__(2);
 
-static void gc_ms2_mark_pobj_header(PARROT_INTERP, ARGIN_NULLOK(PObj * obj))
-        __attribute__nonnull__(1);
-
 static void gc_ms2_mark_string_header(PARROT_INTERP, ARGIN(STRING *str))
         __attribute__nonnull__(1)
         __attribute__nonnull__(2);
@@ -397,8 +394,6 @@
 #define ASSERT_ARGS_gc_ms2_mark_pmc_header __attribute__unused__ int _ASSERT_ARGS_CHECK = (\
        PARROT_ASSERT_ARG(interp) \
     , PARROT_ASSERT_ARG(pmc))
-#define ASSERT_ARGS_gc_ms2_mark_pobj_header __attribute__unused__ int _ASSERT_ARGS_CHECK = (\
-       PARROT_ASSERT_ARG(interp))
 #define ASSERT_ARGS_gc_ms2_mark_string_header __attribute__unused__ int _ASSERT_ARGS_CHECK = (\
        PARROT_ASSERT_ARG(interp) \
     , PARROT_ASSERT_ARG(str))
@@ -656,7 +651,7 @@
     interp->gc_sys->is_pmc_ptr                  = gc_ms2_is_pmc_ptr;
     interp->gc_sys->is_string_ptr               = gc_ms2_is_string_ptr;
     interp->gc_sys->mark_pmc_header             = gc_ms2_mark_pmc_header;
-    interp->gc_sys->mark_pobj_header            = gc_ms2_mark_pobj_header;
+    interp->gc_sys->mark_str_header             = gc_ms2_mark_string_header;
 
     interp->gc_sys->block_mark                  = gc_ms2_block_GC_mark;
     interp->gc_sys->unblock_mark                = gc_ms2_unblock_GC_mark;

Modified: branches/generational_gc/src/gc/gc_private.h
==============================================================================
--- branches/generational_gc/src/gc/gc_private.h	Fri Oct  8 10:57:58 2010	(r49476)
+++ branches/generational_gc/src/gc/gc_private.h	Fri Oct  8 10:58:24 2010	(r49477)
@@ -157,7 +157,7 @@
 
     int  (*is_pmc_ptr)(PARROT_INTERP, void*);
     int  (*is_string_ptr)(PARROT_INTERP, void*);
-    void (*mark_pobj_header)(PARROT_INTERP, PObj*);
+    void (*mark_str_header)(PARROT_INTERP, STRING *);
     void (*mark_pmc_header)(PARROT_INTERP, PMC *);
 
     void* (*allocate_pmc_attributes)(PARROT_INTERP, PMC *);