From f30c01500208d4c459986a32cd4e36bc2a483789 Mon Sep 17 00:00:00 2001 From: Ivan Maidanski Date: Fri, 18 May 2018 00:24:30 +0300 Subject: [PATCH] Rename GC_dirty_async back to GC_dirty (fix of commit bb8e97c) * include/private/gc_priv.h [MANUAL_VDB] (GC_dirty_async_inner): Rename to GC_dirty_inner; add comment. * os_dep.c [MANUAL_VDB] (GC_dirty_async_inner): Likewise. * include/private/gc_priv.h (GC_dirty_async): Rename to GC_dirty. * mallocx.c (GC_end_stubborn_change): Rename GC_dirty_async to GC_dirty. * mark.c [THREADS] (GC_mark_and_push_stack): Likewise. --- include/private/gc_priv.h | 7 +++---- mallocx.c | 2 +- mark.c | 2 +- os_dep.c | 2 +- 4 files changed, 6 insertions(+), 7 deletions(-) diff --git a/include/private/gc_priv.h b/include/private/gc_priv.h index f5a555b..8bcd690 100644 --- a/include/private/gc_priv.h +++ b/include/private/gc_priv.h @@ -2181,11 +2181,10 @@ GC_EXTERN GC_bool GC_print_back_height; #endif /* !GC_DISABLE_INCREMENTAL */ #ifdef MANUAL_VDB - GC_INNER void GC_dirty_async_inner(const void *p); -# define GC_dirty_async(p) \ - (GC_incremental ? GC_dirty_async_inner(p) : (void)0) + GC_INNER void GC_dirty_inner(const void *p); /* does not require locking */ +# define GC_dirty(p) (GC_incremental ? GC_dirty_inner(p) : (void)0) #else -# define GC_dirty_async(p) (void)(p) +# define GC_dirty(p) (void)(p) #endif /* Same as GC_base but excepts and returns a pointer to const object. */ diff --git a/mallocx.c b/mallocx.c index b4ee570..7b5cd5c 100644 --- a/mallocx.c +++ b/mallocx.c @@ -613,5 +613,5 @@ GC_API void GC_CALL GC_change_stubborn(const void *p GC_ATTR_UNUSED) GC_API void GC_CALL GC_end_stubborn_change(const void *p) { - GC_dirty_async(p); /* entire object */ + GC_dirty(p); /* entire object */ } diff --git a/mark.c b/mark.c index bf0f65f..64604b9 100644 --- a/mark.c +++ b/mark.c @@ -1496,7 +1496,7 @@ GC_API struct GC_ms_entry * GC_CALL GC_mark_and_push(void *obj, # ifdef THREADS /* Pointer is on the stack. We may have dirtied the object */ /* it points to, but have not called GC_dirty yet. */ - GC_dirty_async(p); /* entire object */ + GC_dirty(p); /* entire object */ # endif PUSH_CONTENTS_HDR(r, GC_mark_stack_top, GC_mark_stack_limit, source, hhdr, FALSE); diff --git a/os_dep.c b/os_dep.c index b5c99f1..17478ec 100644 --- a/os_dep.c +++ b/os_dep.c @@ -3040,7 +3040,7 @@ GC_API GC_push_other_roots_proc GC_CALL GC_get_push_other_roots(void) /* Mark the page containing p as dirty. Logically, this dirties the */ /* entire object. */ - GC_INNER void GC_dirty_async_inner(const void *p) + GC_INNER void GC_dirty_inner(const void *p) { word index = PHT_HASH(p); async_set_pht_entry_from_index(GC_dirty_pages, index); -- 2.7.4