From f5f218f7c2ebe712562155e78daef013696d40a4 Mon Sep 17 00:00:00 2001 From: nobu Date: Tue, 8 May 2018 00:01:16 +0000 Subject: cont.c: host out context setup git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@63355 b2dd03c8-39d4-4d8f-98ff-823fe69b080e --- cont.c | 19 +++++++++++++------ 1 file changed, 13 insertions(+), 6 deletions(-) (limited to 'cont.c') diff --git a/cont.c b/cont.c index 6d51e0a285..0618f5a25d 100644 --- a/cont.c +++ b/cont.c @@ -141,6 +141,18 @@ enum fiber_status { #define FIBER_TERMINATED_P(fib) ((fib)->status == FIBER_TERMINATED) #define FIBER_RUNNABLE_P(fib) (FIBER_CREATED_P(fib) || FIBER_SUSPENDED_P(fib)) +#if FIBER_USE_NATIVE && !defined(_WIN32) +static inline void +fiber_context_create(ucontext_t *context, void (*func)(void *), void *arg, void *ptr, size_t size) +{ + getcontext(context); + context->uc_link = NULL; + context->uc_stack.ss_sp = ptr; + context->uc_stack.ss_size = size; + makecontext(context, func, 0); +} +#endif + #if FIBER_USE_NATIVE && !defined(_WIN32) #define MAX_MACHINE_STACK_CACHE 10 static int machine_stack_cache_index = 0; @@ -838,18 +850,13 @@ fiber_initialize_machine_stack_context(rb_fiber_t *fib, size_t size) } sec->machine.stack_maxsize = size; #else /* not WIN32 */ - ucontext_t *context = &fib->context; char *ptr; STACK_GROW_DIR_DETECTION; - getcontext(context); ptr = fiber_machine_stack_alloc(size); - context->uc_link = NULL; - context->uc_stack.ss_sp = ptr; - context->uc_stack.ss_size = size; fib->ss_sp = ptr; fib->ss_size = size; - makecontext(context, fiber_entry, 0); + fiber_context_create(&fib->context, fiber_entry, NULL, fib->ss_sp, fib->ss_size); sec->machine.stack_start = (VALUE*)(ptr + STACK_DIR_UPPER(0, size)); sec->machine.stack_maxsize = size - RB_PAGE_SIZE; #endif -- cgit v1.2.3