1berry/ruby
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

* string.c: introduce STR_FAKESTR to show string is FAKESTR or not.

Browse Source 
* string.c (STR_SET_SHARED): ignore FAKESTR because only Ruby objects
  can use write barrier.



git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@49998 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
ko1 2015-03-17 20:38:02 +00:00
parent ce8eeb84c3
commit 1e98a25e9f
2 changed files with 25 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
ChangeLog
View File

@ -1,3 +1,10 @@
Wed Mar 18 05:34:32 2015 Koichi Sasada <ko1@atdot.net>
* string.c: introduce STR_FAKESTR to show string is FAKESTR or not.
* string.c (STR_SET_SHARED): ignore FAKESTR because only Ruby objects
can use write barrier.
Tue Mar 17 18:59:16 2015 Koichi Sasada <ko1@atdot.net> Tue Mar 17 18:59:16 2015 Koichi Sasada <ko1@atdot.net>
* include/ruby/ruby.h: use rb_gc_writebrrier() simply. * include/ruby/ruby.h: use rb_gc_writebrrier() simply.

17
string.c
View File

@ -52,9 +52,22 @@ static VALUE rb_str_clear(VALUE str);
VALUE rb_cString; VALUE rb_cString;
VALUE rb_cSymbol; VALUE rb_cSymbol;
/* FLAGS of RString
*
* 1: RSTRING_NOEMBED
* 2: STR_SHARED (== ELTS_SHARED)
* 2-6: RSTRING_EMBED_LEN (5 bits == 32)
* 7: STR_TMPLOCK
* 8-9: ENC_CODERANGE (2 bits)
* 10-16: ENCODING (7 bits == 128)
* 18: STR_NOFREE
* 19: STR_FAKESTR
*/
#define RUBY_MAX_CHAR_LEN 16 #define RUBY_MAX_CHAR_LEN 16
#define STR_TMPLOCK FL_USER7 #define STR_TMPLOCK FL_USER7
#define STR_NOFREE FL_USER18 #define STR_NOFREE FL_USER18
#define STR_FAKESTR FL_USER19
#define STR_SET_NOEMBED(str) do {\ #define STR_SET_NOEMBED(str) do {\
FL_SET((str), STR_NOEMBED);\ FL_SET((str), STR_NOEMBED);\
@ -120,8 +133,10 @@ VALUE rb_cSymbol;
} while (0) } while (0)
#define STR_SET_SHARED(str, shared_str) do { \ #define STR_SET_SHARED(str, shared_str) do { \
if (!FL_TEST(str, STR_FAKESTR)) { \
RB_OBJ_WRITE((str), &RSTRING(str)->as.heap.aux.shared, (shared_str)); \ RB_OBJ_WRITE((str), &RSTRING(str)->as.heap.aux.shared, (shared_str)); \
FL_SET((str), STR_SHARED); \ FL_SET((str), STR_SHARED); \
} \
} while (0) } while (0)
#define STR_HEAP_PTR(str) (RSTRING(str)->as.heap.ptr) #define STR_HEAP_PTR(str) (RSTRING(str)->as.heap.ptr)
@ -262,7 +277,7 @@ rb_fstring(VALUE str)
static VALUE static VALUE
setup_fake_str(struct RString *fake_str, const char *name, long len, int encidx) setup_fake_str(struct RString *fake_str, const char *name, long len, int encidx)
{ {
fake_str->basic.flags = T_STRING|RSTRING_NOEMBED|STR_NOFREE; fake_str->basic.flags = T_STRING|RSTRING_NOEMBED|STR_NOFREE|STR_FAKESTR;
/* SHARED to be allocated by the callback */ /* SHARED to be allocated by the callback */
ENCODING_SET_INLINED((VALUE)fake_str, encidx); ENCODING_SET_INLINED((VALUE)fake_str, encidx);