Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Clean up HAVE_RB_GC_MARK_MOVABLE #910

Closed
wants to merge 1 commit into from
Closed

Clean up HAVE_RB_GC_MARK_MOVABLE #910

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 0 additions & 1 deletion ext/oj/extconf.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,6 @@
}

# Support for compaction.
have_func('rb_gc_mark_movable')
have_func('stpcpy')
have_func('pthread_mutex_init')
have_func('rb_enc_interned_str')
Expand Down
16 changes: 3 additions & 13 deletions ext/oj/fast.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,13 +22,6 @@
// #define BATCH_SIZE (4096 / sizeof(struct _leaf) - 1)
#define BATCH_SIZE 100

// Support for compaction
#ifdef HAVE_RB_GC_MARK_MOVABLE
#define mark rb_gc_mark_movable
#else
#define mark rb_gc_mark
#endif

typedef struct _batch {
struct _batch *next;
int next_avail;
Expand Down Expand Up @@ -688,7 +681,7 @@ static void mark_leaf(Leaf leaf) {
} while (e != first);
}
break;
case RUBY_VAL: mark(leaf->value); break;
case RUBY_VAL: rb_gc_mark_movable(leaf->value); break;

default: break;
}
Expand All @@ -699,11 +692,11 @@ static void mark_doc(void *ptr) {
if (NULL != ptr) {
Doc doc = (Doc)ptr;

mark(doc->self);
rb_gc_mark_movable(doc->self);
mark_leaf(doc->data);
}
}
#ifdef HAVE_RB_GC_MARK_MOVABLE

static void compact_leaf(Leaf leaf) {
switch (leaf->value_type) {
case COL_VAL:
Expand Down Expand Up @@ -731,17 +724,14 @@ static void compact_doc(void *ptr) {
compact_leaf(doc->data);
}
}
#endif

static const rb_data_type_t oj_doc_type = {
"Oj/doc",
{
mark_doc,
free_doc_cb,
NULL,
#ifdef HAVE_RB_GC_MARK_MOVABLE
compact_doc,
#endif
},
0,
0,
Expand Down
Loading