From 982fee4fcc4cf5163405570b278afd1f53e30d0b Mon Sep 17 00:00:00 2001 From: ko1 Date: Sat, 22 Jun 2013 21:54:10 +0000 Subject: * include/ruby/ruby.h, gc.c: rename macros and functions: OBJ_WB_GIVEUP() -> OBJ_WB_UNPROTECT(), rb_obj_wb_giveup() -> rb_obj_wb_unprotect(), rb_gc_giveup_promoted_writebarrier() -> rb_gc_writebarrier_unprotect_promoted(), * class.c, eval.c, hash.c: use OBJ_WB_UNPROTECT(). git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@41582 b2dd03c8-39d4-4d8f-98ff-823fe69b080e --- include/ruby/ruby.h | 20 +++++++++----------- 1 file changed, 9 insertions(+), 11 deletions(-) (limited to 'include') diff --git a/include/ruby/ruby.h b/include/ruby/ruby.h index 6d1fd80019..d18b9e96f8 100644 --- a/include/ruby/ruby.h +++ b/include/ruby/ruby.h @@ -972,7 +972,7 @@ struct RArray { OBJ_WRITE(_ary_, &RARRAY_RAWPTR(_ary_)[i], (v)); \ } while (0) -#define RARRAY_PTR(a) ((VALUE *)RARRAY_RAWPTR(RGENGC_WB_PROTECTED_ARRAY ? OBJ_WB_GIVEUP((VALUE)a) : ((VALUE)a))) +#define RARRAY_PTR(a) ((VALUE *)RARRAY_RAWPTR(RGENGC_WB_PROTECTED_ARRAY ? OBJ_WB_UNPROTECT((VALUE)a) : ((VALUE)a))) struct RRegexp { struct RBasic basic; @@ -1129,7 +1129,7 @@ struct RStruct { ((RBASIC(st)->flags & RSTRUCT_EMBED_LEN_MASK) ? \ RSTRUCT(st)->as.ary : \ RSTRUCT(st)->as.heap.ptr) -#define RSTRUCT_PTR(st) ((VALUE *)RSTRUCT_RAWPTR(RGENGC_WB_PROTECTED_STRUCT ? OBJ_WB_GIVEUP((VALUE)st) : (VALUE)st)) +#define RSTRUCT_PTR(st) ((VALUE *)RSTRUCT_RAWPTR(RGENGC_WB_PROTECTED_STRUCT ? OBJ_WB_UNPROTECT((VALUE)st) : (VALUE)st)) #define RSTRUCT_SET(st, idx, v) OBJ_WRITE(st, &RSTRUCT_RAWPTR(st)[idx], (v)) #define RSTRUCT_GET(st, idx) (RSTRUCT_RAWPTR(st)[idx]) @@ -1245,27 +1245,25 @@ struct RBignum { #if USE_RGENGC #define OBJ_PROMOTED(x) (SPECIAL_CONST_P(x) ? 0 : FL_TEST_RAW((x), FL_OLDGEN)) #define OBJ_WB_PROTECTED(x) (SPECIAL_CONST_P(x) ? 1 : FL_TEST_RAW((x), FL_WB_PROTECTED)) -#define OBJ_WB_GIVEUP(x) rb_obj_wb_giveup(x, __FILE__, __LINE__) -#define OBJ_WB_ +#define OBJ_WB_UNPROTECT(x) rb_obj_wb_unprotect(x, __FILE__, __LINE__) void rb_gc_writebarrier(VALUE a, VALUE b); -void rb_gc_giveup_promoted_writebarrier(VALUE obj); +void rb_gc_writebarrier_unprotect_promoted(VALUE obj); #else /* USE_RGENGC */ #define OBJ_PROMOTED(x) 0 #define OBJ_WB_PROTECTED(x) 0 -#define OBJ_WB_GIVEUP(x) rb_obj_wb_giveup(x, __FILE__, __LINE__) -#define OBJ_SHADE(x) OBJ_WB_GIVEUP(x) /* RGENGC terminology */ +#define OBJ_WB_UNPROTECT(x) rb_obj_wb_unprotect(x, __FILE__, __LINE__) #endif #define OBJ_WRITE(a, slot, b) rb_obj_write((VALUE)(a), (VALUE *)(slot), (VALUE)(b), __FILE__, __LINE__) #define OBJ_WRITTEN(a, oldv, b) rb_obj_written((VALUE)(a), (VALUE)(oldv), (VALUE)(b), __FILE__, __LINE__) static inline VALUE -rb_obj_wb_giveup(VALUE x, const char *filename, int line) +rb_obj_wb_unprotect(VALUE x, const char *filename, int line) { -#ifdef RGENGC_LOGGING_WB_GIVEUP - RGENGC_LOGGING_WB_GIVEUP(x, filename, line); +#ifdef RGENGC_LOGGING_WB_UNPROTECT + RGENGC_LOGGING_WB_UNPROTECT(x, filename, line); #endif #if USE_RGENGC @@ -1274,7 +1272,7 @@ rb_obj_wb_giveup(VALUE x, const char *filename, int line) RBASIC(x)->flags &= ~FL_WB_PROTECTED; if (FL_TEST_RAW((x), FL_OLDGEN)) { - rb_gc_giveup_promoted_writebarrier(x); + rb_gc_writebarrier_unprotect_promoted(x); } } #endif -- cgit v1.2.3