kotovalexarian-likes-github/ruby--ruby
1
0
Fork 0
mirror of https://github.com/ruby/ruby.git synced 2022-11-09 12:17:21 -05:00
Code Releases Activity

cont.c : keep context.uc_stack.ss_sp and context.uc_stack.ss_size for later use.

Browse source 
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@46373 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
kanemoto 2014-06-07 07:11:31 +00:00
parent 0e7cd6417a
commit 3acff92b2b
2 changed files with 18 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

5
ChangeLog
View file

@ -1,3 +1,8 @@
Sat Jun 7 16:01:57 2014 Yutaka Kanemoto <kanemoto@ruby-lang.org>
* cont.c (rb_fiber_struct): keep context.uc_stack.ss_sp and context.uc_stack.ss_size
for later use. Patch by Rei Odaira. [ruby-core:62945] [Bug #9905]
Sat Jun 7 12:51:51 2014 Nobuyoshi Nakada <nobu@ruby-lang.org> Sat Jun 7 12:51:51 2014 Nobuyoshi Nakada <nobu@ruby-lang.org>
* io.c (read_all): truncate the buffer before appending read data, * io.c (read_all): truncate the buffer before appending read data,

17
cont.c
View file

@ -147,6 +147,12 @@ typedef struct rb_fiber_struct {
void *fib_handle; void *fib_handle;
#else #else
ucontext_t context; ucontext_t context;
/* Because context.uc_stack.ss_sp and context.uc_stack.ss_size
* are not necessarily valid after makecontext() or swapcontext(),
* they are saved in these variables for later use.
*/
void *ss_sp;
size_t ss_size;
#endif #endif
#endif #endif
} rb_fiber_t; } rb_fiber_t;
@ -243,11 +249,11 @@ cont_free(void *ptr)
#else /* not WIN32 */ #else /* not WIN32 */
if (GET_THREAD()->fiber != cont->self) { if (GET_THREAD()->fiber != cont->self) {
rb_fiber_t *fib = (rb_fiber_t*)cont; rb_fiber_t *fib = (rb_fiber_t*)cont;
if (fib->context.uc_stack.ss_sp) { if (fib->ss_sp) {
if (cont->type == ROOT_FIBER_CONTEXT) { if (cont->type == ROOT_FIBER_CONTEXT) {
rb_bug("Illegal root fiber parameter"); rb_bug("Illegal root fiber parameter");
} }
munmap((void*)fib->context.uc_stack.ss_sp, fib->context.uc_stack.ss_size); munmap((void*)fib->ss_sp, fib->ss_size);
} }
} }
else { else {
@ -668,6 +674,8 @@ fiber_initialize_machine_stack_context(rb_fiber_t *fib, size_t size)
context->uc_link = NULL; context->uc_link = NULL;
context->uc_stack.ss_sp = ptr; context->uc_stack.ss_sp = ptr;
context->uc_stack.ss_size = size; context->uc_stack.ss_size = size;
fib->ss_sp = ptr;
fib->ss_size = size;
makecontext(context, rb_fiber_start, 0); makecontext(context, rb_fiber_start, 0);
sth->machine.stack_start = (VALUE*)(ptr + STACK_DIR_UPPER(0, size)); sth->machine.stack_start = (VALUE*)(ptr + STACK_DIR_UPPER(0, size));
sth->machine.stack_maxsize = size - RB_PAGE_SIZE; sth->machine.stack_maxsize = size - RB_PAGE_SIZE;
@ -1258,8 +1266,9 @@ rb_fiber_terminate(rb_fiber_t *fib)
fib->status = TERMINATED; fib->status = TERMINATED;
#if FIBER_USE_NATIVE && !defined(_WIN32) #if FIBER_USE_NATIVE && !defined(_WIN32)
/* Ruby must not switch to other thread until storing terminated_machine_stack */ /* Ruby must not switch to other thread until storing terminated_machine_stack */
terminated_machine_stack.ptr = fib->context.uc_stack.ss_sp; terminated_machine_stack.ptr = fib->ss_sp;
terminated_machine_stack.size = fib->context.uc_stack.ss_size / sizeof(VALUE); terminated_machine_stack.size = fib->ss_size / sizeof(VALUE);
fib->ss_sp = NULL;
fib->context.uc_stack.ss_sp = NULL; fib->context.uc_stack.ss_sp = NULL;
fib->cont.machine.stack = NULL; fib->cont.machine.stack = NULL;
fib->cont.machine.stack_size = 0; fib->cont.machine.stack_size = 0;