Skip to content

Commit

Permalink
Browse files Browse the repository at this point in the history
Support preliminary Guild.
  • Loading branch information
@ko1
ko1 committed Jun 5, 2018
1 parent 76daf51 commit fa33730
Show file tree
Hide file tree
Showing 18 changed files with 1,215 additions and 341 deletions.
4 changes: 4 additions & 0 deletions common.mk
View file
Expand Up @@ -92,6 +92,7 @@ COMMONOBJS = array.$(OBJEXT) \
eval.$(OBJEXT) \
file.$(OBJEXT) \
gc.$(OBJEXT) \
guild.$(OBJEXT) \
hash.$(OBJEXT) \
inits.$(OBJEXT) \
io.$(OBJEXT) \
Expand Down Expand Up @@ -1949,6 +1950,9 @@ goruby.$(OBJEXT): {$(VPATH)}node.h
goruby.$(OBJEXT): {$(VPATH)}st.h
goruby.$(OBJEXT): {$(VPATH)}subst.h
goruby.$(OBJEXT): {$(VPATH)}vm_debug.h
guild.$(OBJEXT): $(top_srcdir)/include/ruby.h
guild.$(OBJEXT): {$(VPATH)}guild.c
guild.$(OBJEXT): {$(VPATH)}vm_core.h
hash.$(OBJEXT): $(hdrdir)/ruby/ruby.h
hash.$(OBJEXT): $(top_srcdir)/include/ruby.h
hash.$(OBJEXT): {$(VPATH)}config.h
Expand Down
16 changes: 8 additions & 8 deletions cont.c
View file
Expand Up @@ -255,7 +255,7 @@ static inline void
ec_switch(rb_thread_t *th, rb_fiber_t *fib)
{
rb_execution_context_t *ec = &fib->cont.saved_ec;
ruby_current_execution_context_ptr = th->ec = ec;
rb_current_execution_context_set(th->ec = ec);
VM_ASSERT(ec->fiber_ptr->cont.self == 0 || ec->vm_stack != NULL);
}

Expand Down Expand Up @@ -734,11 +734,11 @@ cont_restore_thread(rb_context_t *cont)

/* trace on -> trace off */
if (th->ec->trace_arg != NULL && sec->trace_arg == NULL) {
GET_VM()->trace_running--;
th->g->trace_running--;

This comment has been minimized.

Sign in to view

Copy link
@ioquatix

ioquatix Jun 5, 2018

Rather than using abbreviations, can you use the full name? It's so much easier to read thread->guild than th->g. Who knows what g is?
}
/* trace off -> trace on */
else if (th->ec->trace_arg == NULL && sec->trace_arg != NULL) {
GET_VM()->trace_running++;
th->g->trace_running++;
}
th->ec->trace_arg = sec->trace_arg;

Expand Down Expand Up @@ -1383,7 +1383,7 @@ fiber_init(VALUE fibval, VALUE proc)
rb_context_t *cont = &fib->cont;
rb_execution_context_t *sec = &cont->saved_ec;
rb_thread_t *cth = GET_THREAD();
size_t fib_stack_size = cth->vm->default_params.fiber_vm_stack_size / sizeof(VALUE);
size_t fib_stack_size = cth->g->vm->default_params.fiber_vm_stack_size / sizeof(VALUE);

/* initialize cont */
cont->saved_vm_stack.ptr = NULL;
Expand Down Expand Up @@ -1441,7 +1441,7 @@ rb_fiber_start(void)
enum ruby_tag_type state;
int need_interrupt = TRUE;

VM_ASSERT(th->ec == ruby_current_execution_context_ptr);
VM_ASSERT(th->ec == GET_EC());
VM_ASSERT(FIBER_RESUMED_P(fib));

EC_PUSH_TAG(th->ec);
Expand Down Expand Up @@ -1537,8 +1537,8 @@ rb_threadptr_root_fiber_release(rb_thread_t *th)
VM_ASSERT(th->ec->fiber_ptr->cont.self == 0);
fiber_free(th->ec->fiber_ptr);

if (th->ec == ruby_current_execution_context_ptr) {
ruby_current_execution_context_ptr = NULL;
if (th->ec == GET_EC()) {
rb_current_execution_context_set(NULL);
}
th->ec = NULL;
}
Expand Down Expand Up @@ -1601,7 +1601,7 @@ fiber_store(rb_fiber_t *next_fib, rb_thread_t *th)

#if FIBER_USE_NATIVE
if (FIBER_CREATED_P(next_fib)) {
fiber_initialize_machine_stack_context(next_fib, th->vm->default_params.fiber_machine_stack_size);
fiber_initialize_machine_stack_context(next_fib, th->g->vm->default_params.fiber_machine_stack_size);
}
#endif

Expand Down
2 changes: 1 addition & 1 deletion eval.c
View file
Expand Up @@ -71,7 +71,7 @@ ruby_setup(void)
if ((state = EC_EXEC_TAG()) == TAG_NONE) {
rb_call_inits();
ruby_prog_init();
GET_VM()->running = 1;
GET_VM()->system_running = 1;
}
EC_POP_TAG();

Expand Down
156 changes: 143 additions & 13 deletions gc.c
View file
Expand Up @@ -1836,7 +1836,7 @@ gc_event_hook_body(rb_execution_context_t *ec, rb_objspace_t *objspace, const rb
} while (0)

static inline VALUE
newobj_init(VALUE klass, VALUE flags, VALUE v1, VALUE v2, VALUE v3, int wb_protected, rb_objspace_t *objspace, VALUE obj)
newobj_init(VALUE klass, VALUE flags, VALUE v1, VALUE v2, VALUE v3, int wb_protected, rb_objspace_t *objspace, VALUE obj, rb_execution_context_t *ec)
{
GC_ASSERT(BUILTIN_TYPE(obj) == T_NONE);
GC_ASSERT((flags & FL_WB_PROTECTED) == 0);
Expand Down Expand Up @@ -1912,11 +1912,15 @@ newobj_init(VALUE klass, VALUE flags, VALUE v1, VALUE v2, VALUE v3, int wb_prote
}
#endif
check_rvalue_consistency(obj);

// TODO
RB_VM_RESOURCE_UNLOCK(ec->thread_ptr->g);

return obj;
}

static inline VALUE
newobj_slowpath(VALUE klass, VALUE flags, VALUE v1, VALUE v2, VALUE v3, rb_objspace_t *objspace, int wb_protected)
newobj_slowpath(VALUE klass, VALUE flags, VALUE v1, VALUE v2, VALUE v3, rb_objspace_t *objspace, rb_execution_context_t *ec, int wb_protected)
{
VALUE obj;

Expand All @@ -1935,31 +1939,44 @@ newobj_slowpath(VALUE klass, VALUE flags, VALUE v1, VALUE v2, VALUE v3, rb_objsp
}

obj = heap_get_freeobj(objspace, heap_eden);
newobj_init(klass, flags, v1, v2, v3, wb_protected, objspace, obj);
newobj_init(klass, flags, v1, v2, v3, wb_protected, objspace, obj, ec);
gc_event_hook(objspace, RUBY_INTERNAL_EVENT_NEWOBJ, obj);
return obj;
}

NOINLINE(static VALUE newobj_slowpath_wb_protected(VALUE klass, VALUE flags, VALUE v1, VALUE v2, VALUE v3, rb_objspace_t *objspace));
NOINLINE(static VALUE newobj_slowpath_wb_unprotected(VALUE klass, VALUE flags, VALUE v1, VALUE v2, VALUE v3, rb_objspace_t *objspace));
NOINLINE(static VALUE newobj_slowpath_wb_protected(VALUE klass, VALUE flags, VALUE v1, VALUE v2, VALUE v3, rb_objspace_t *objspace, rb_execution_context_t *ec));
NOINLINE(static VALUE newobj_slowpath_wb_unprotected(VALUE klass, VALUE flags, VALUE v1, VALUE v2, VALUE v3, rb_objspace_t *objspace, rb_execution_context_t *ec));

static VALUE
newobj_slowpath_wb_protected(VALUE klass, VALUE flags, VALUE v1, VALUE v2, VALUE v3, rb_objspace_t *objspace)
newobj_slowpath_wb_protected(VALUE klass, VALUE flags, VALUE v1, VALUE v2, VALUE v3, rb_objspace_t *objspace, rb_execution_context_t *ec)
{
return newobj_slowpath(klass, flags, v1, v2, v3, objspace, TRUE);
return newobj_slowpath(klass, flags, v1, v2, v3, objspace, ec, TRUE);
}

static VALUE
newobj_slowpath_wb_unprotected(VALUE klass, VALUE flags, VALUE v1, VALUE v2, VALUE v3, rb_objspace_t *objspace)
newobj_slowpath_wb_unprotected(VALUE klass, VALUE flags, VALUE v1, VALUE v2, VALUE v3, rb_objspace_t *objspace, rb_execution_context_t *ec)
{
return newobj_slowpath(klass, flags, v1, v2, v3, objspace, FALSE);
return newobj_slowpath(klass, flags, v1, v2, v3, objspace, ec, FALSE);
}

static inline VALUE
newobj_of(VALUE klass, VALUE flags, VALUE v1, VALUE v2, VALUE v3, int wb_protected)
{
rb_objspace_t *objspace = &rb_objspace;
VALUE obj;
rb_execution_context_t *ec = GET_EC();
rb_guild_t *g = ec->thread_ptr->g;

RB_VM_RESOURCE_LOCK(g);

while (g->gc_rendezvous.pause_request) {
if (GUILD_DEBUG) fprintf(stderr, "%d: newobj_of: pause_request\n", GET_GUILD()->id);
RB_VM_RESOURCE_UNLOCK(g);
{
RUBY_VM_CHECK_INTS(ec);
}
RB_VM_RESOURCE_LOCK(g);
}

#if GC_DEBUG_STRESS_TO_CLASS
if (UNLIKELY(stress_to_class)) {
Expand All @@ -1974,12 +1991,12 @@ newobj_of(VALUE klass, VALUE flags, VALUE v1, VALUE v2, VALUE v3, int wb_protect
ruby_gc_stressful ||
gc_event_hook_available_p(objspace)) &&
(obj = heap_get_freeobj_head(objspace, heap_eden)) != Qfalse) {
return newobj_init(klass, flags, v1, v2, v3, wb_protected, objspace, obj);
return newobj_init(klass, flags, v1, v2, v3, wb_protected, objspace, obj, ec);
}
else {
return wb_protected ?
newobj_slowpath_wb_protected(klass, flags, v1, v2, v3, objspace) :
newobj_slowpath_wb_unprotected(klass, flags, v1, v2, v3, objspace);
newobj_slowpath_wb_protected(klass, flags, v1, v2, v3, objspace, ec) :
newobj_slowpath_wb_unprotected(klass, flags, v1, v2, v3, objspace, ec);
}
}

Expand Down Expand Up @@ -3762,6 +3779,7 @@ gc_sweep_continue(rb_objspace_t *objspace, rb_heap_t *heap)
GC_ASSERT(dont_gc == FALSE);

gc_enter(objspace, "sweep_continue");

#if USE_RGENGC
if (objspace->rgengc.need_major_gc == GPR_FLAG_NONE && heap_increment(objspace, heap)) {
gc_report(3, objspace, "gc_sweep_continue: success heap_increment().\n");
Expand Down Expand Up @@ -5664,6 +5682,8 @@ gc_marks_continue(rb_objspace_t *objspace, rb_heap_t *heap)

GC_ASSERT(dont_gc == FALSE);

GC_ASSERT(FALSE); /* TODO: incremental GC is not work on Guilds */

gc_enter(objspace, "marks_continue");

PUSH_MARK_FUNC_DATA(NULL);
Expand Down Expand Up @@ -6410,6 +6430,104 @@ garbage_collect(rb_objspace_t *objspace, int full_mark, int immediate_mark, int
return gc_start(objspace, full_mark, immediate_mark, immediate_sweep, reason);
}

static void
gc_pause_all_guilds(rb_objspace_t *objspace)
{
rb_execution_context_t *ec = GET_EC();
rb_guild_t *current_guild = rb_ec_guild_ptr(ec);
rb_vm_t *vm = current_guild->vm;
rb_guild_t *g;

VM_ASSERT(RB_VM_RESOURCE_LOCK_ACQUIRED_P(current_guild));

if (GUILD_DEBUG) fprintf(stderr, "%d: gc_pause_all_guilds start\n", current_guild->id);

list_for_each(&vm->guilds, g, guild_node) {
if (g != current_guild) {
/* TODO: send trap to all threads? running threads? */
g->gc_rendezvous.pause_request = TRUE;
}
}

while (1) {
// TODO: more sophisticated check
int guilds = 0;
int waiting_guilds = 0;
list_for_each(&vm->guilds, g, guild_node) {
guilds++;

if (g == current_guild) {
/* skip */
}
else {
if (GUILD_DEBUG) fprintf(stderr, "%d: gc_pause_all_guilds: check for %d (%d)\n", current_guild->id, g->id, g->gc_rendezvous.waiting);

if (g->gc_rendezvous.waiting == FALSE) {

}
else {
waiting_guilds++;
}
}
}

if (guilds > waiting_guilds + 1) {
if (GUILD_DEBUG) fprintf(stderr, "%d: gc_pause_all_guilds: wait_more (guilds:%d, waiting_guilds:%d)\n", current_guild->id, guilds, waiting_guilds);
pthread_cond_wait(&vm->gc_rendezvous_cond, &vm->global_resource_lock);
}
else {
if (GUILD_DEBUG) fprintf(stderr, "%d: gc_pause_all_guilds success!!!!\n", current_guild->id);
break;
}
}
}

void rb_gc_save_machine_context(rb_thread_t *th);

void
rb_gc_pause_for_gc(rb_guild_t *g)
{
rb_vm_t *vm = g->vm;

VM_ASSERT(!RB_VM_RESOURCE_LOCK_ACQUIRED_P(g));

RB_VM_RESOURCE_LOCK(g);
{
g->gc_rendezvous.waiting = TRUE;
pthread_cond_signal(&vm->gc_rendezvous_cond);

while (1) {
if (g->gc_rendezvous.pause_request == FALSE) {
g->gc_rendezvous.waiting = FALSE;
if (GUILD_DEBUG) fprintf(stderr, "%d: gc pause -> wakeup\n", g->id);
break;
}
if (GUILD_DEBUG) fprintf(stderr, "%d: gc wakeup cond_wait\n", g->id);
/* update thread's machine stack information */
if (g->running_thread) rb_gc_save_machine_context(g->running_thread);
pthread_cond_wait(&vm->gc_restart_cond, &vm->global_resource_lock); /* unlock and wait */
}
}
RB_VM_RESOURCE_UNLOCK(g);
}

static void
gc_restart_all_guilds(rb_objspace_t *objspace)
{
rb_execution_context_t *ec = GET_EC();
rb_guild_t *current_guild = rb_ec_guild_ptr(ec);
rb_vm_t *vm = current_guild->vm;
rb_guild_t *g;

list_for_each(&vm->guilds, g, guild_node) {
if (g != current_guild) {
g->gc_rendezvous.pause_request = FALSE;
}
}
if (GUILD_DEBUG) fprintf(stderr, "%d: gc wakeup all\n", current_guild->id);
pthread_cond_broadcast(&vm->gc_restart_cond);
}

static int
gc_start(rb_objspace_t *objspace, const int full_mark, const int immediate_mark, const unsigned int immediate_sweep, int reason)
{
Expand All @@ -6426,6 +6544,15 @@ gc_start(rb_objspace_t *objspace, const int full_mark, const int immediate_mark,
gc_verify_internal_consistency(Qnil);
#endif

#if VM_CHECK_MODE > 0
/* should be locked */
{
rb_guild_t *g = GET_GUILD();
VM_ASSERT(RB_VM_RESOURCE_LOCK_ACQUIRED_P(g));
}
#endif
gc_pause_all_guilds(objspace);

gc_enter(objspace, "gc_start");

if (ruby_gc_stressful) {
Expand Down Expand Up @@ -6492,6 +6619,9 @@ gc_start(rb_objspace_t *objspace, const int full_mark, const int immediate_mark,
gc_prof_timer_stop(objspace);

gc_exit(objspace, "gc_start");

gc_restart_all_guilds(objspace);

return TRUE;
}

Expand All @@ -6502,7 +6632,7 @@ gc_rest(rb_objspace_t *objspace)
int sweeping = is_lazy_sweeping(heap_eden);

if (marking || sweeping) {
gc_enter(objspace, "gc_rest");
gc_enter(objspace, "gc_rest");

if (RGENGC_CHECK_MODE >= 2) gc_verify_internal_consistency(Qnil);

Expand Down

0 comments on commit fa33730

Please sign in to comment.