admin/mruby-mruby
1
0
Fork 0
mirror of https://github.com/mruby/mruby synced 2026-06-08 16:11:16 +00:00
Code Issues Packages Projects Releases Wiki Activity

add new macros for MRB_STR_SHARED operations, based on 0f7aecf from @ksss; ref #1782

Browse Source
This commit is contained in:
Yukihiro "Matz" Matsumoto
2014-03-04 01:33:58 +09:00
parent 369c6c3649
commit 18f0fcb0c7
1 changed files with 15 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/string.c
+15 -11
View File
@@ -25,6 +25,10 @@ typedef struct mrb_shared_string {
mrb_int len;
} mrb_shared_string;
#define STR_SHARED_P(s) ((s)->flags & MRB_STR_SHARED)
#define STR_SET_SHARED_FLAG(s) ((s)->flags |= MRB_STR_SHARED)
#define STR_UNSET_SHARED_FLAG(s) ((s)->flags &= ~MRB_STR_SHARED)
static mrb_value str_replace(mrb_state *mrb, struct RString *s1, struct RString *s2);
static mrb_value mrb_str_subseq(mrb_state *mrb, mrb_value str, mrb_int beg, mrb_int len);
@@ -48,7 +52,7 @@ str_decref(mrb_state *mrb, mrb_shared_string *shared)
void
mrb_str_modify(mrb_state *mrb, struct RString *s)
{
if (s->flags & MRB_STR_SHARED) {
if (STR_SHARED_P(s)) {
mrb_shared_string *shared = s->aux.shared;
if (shared->refcnt == 1 && s->ptr == shared->ptr) {
@@ -72,7 +76,7 @@ mrb_str_modify(mrb_state *mrb, struct RString *s)
s->aux.capa = len;
str_decref(mrb, shared);
}
s->flags &= ~MRB_STR_SHARED;
STR_UNSET_SHARED_FLAG(s);
return;
}
if (s->flags & MRB_STR_NOFREE) {
@@ -271,7 +275,7 @@ mrb_str_new_static(mrb_state *mrb, const char *p, size_t len)
void
mrb_gc_free_str(mrb_state *mrb, struct RString *str)
{
if (str->flags & MRB_STR_SHARED)
if (STR_SHARED_P(str))
str_decref(mrb, str->aux.shared);
else if ((str->flags & MRB_STR_NOFREE) == 0)
mrb_free(mrb, str->ptr);
@@ -296,7 +300,7 @@ mrb_str_to_cstr(mrb_state *mrb, mrb_value str0)
static void
str_make_shared(mrb_state *mrb, struct RString *s)
{
if (!(s->flags & MRB_STR_SHARED)) {
if (!STR_SHARED_P(s)) {
mrb_shared_string *shared = (mrb_shared_string *)mrb_malloc(mrb, sizeof(mrb_shared_string));
shared->refcnt = 1;
@@ -316,7 +320,7 @@ str_make_shared(mrb_state *mrb, struct RString *s)
}
shared->len = s->len;
s->aux.shared = shared;
s->flags |= MRB_STR_SHARED;
STR_SET_SHARED_FLAG(s);
}
}
@@ -1148,7 +1152,7 @@ mrb_str_subseq(mrb_state *mrb, mrb_value str, mrb_int beg, mrb_int len)
s->ptr = orig->ptr + beg;
s->len = len;
s->aux.shared = shared;
s->flags |= MRB_STR_SHARED;
STR_SET_SHARED_FLAG(s);
shared->refcnt++;
return mrb_obj_value(s);
@@ -1337,9 +1341,9 @@ mrb_str_index_m(mrb_state *mrb, mrb_value str)
static mrb_value
str_replace(mrb_state *mrb, struct RString *s1, struct RString *s2)
{
if (s2->flags & MRB_STR_SHARED) {
if (STR_SHARED_P(s2)) {
L_SHARE:
if (s1->flags & MRB_STR_SHARED){
if (STR_SHARED_P(s1)) {
str_decref(mrb, s1->aux.shared);
}
else {
@@ -1348,7 +1352,7 @@ str_replace(mrb_state *mrb, struct RString *s1, struct RString *s2)
s1->ptr = s2->ptr;
s1->len = s2->len;
s1->aux.shared = s2->aux.shared;
s1->flags |= MRB_STR_SHARED;
STR_SET_SHARED_FLAG(s1);
s1->aux.shared->refcnt++;
}
else if (s2->len > STR_REPLACE_SHARED_MIN) {
@@ -1356,9 +1360,9 @@ str_replace(mrb_state *mrb, struct RString *s1, struct RString *s2)
goto L_SHARE;
}
else {
if (s1->flags & MRB_STR_SHARED) {
if (STR_SHARED_P(s1)) {
str_decref(mrb, s1->aux.shared);
s1->flags &= ~MRB_STR_SHARED;
STR_UNSET_SHARED_FLAG(s1);
s1->ptr = (char *)mrb_malloc(mrb, s2->len+1);
}
else {