summaryrefslogtreecommitdiff
path: root/thread_win32.c
diff options
context:
space:
mode:
authorko1 <ko1@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2017-09-10 15:49:45 (GMT)
committerko1 <ko1@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2017-09-10 15:49:45 (GMT)
commit4f0c9a5cc49cf36f15af85f644982fbb847f0dca (patch)
treeacfb66f8c2b3df4b0572647f35b77a2d5b722ff0 /thread_win32.c
parent83299c73f36a56442a24de26f049f1a21d724d5c (diff)
move th->machine to ec->machine.
* vm_core.h: move rb_thread_t::machine to rb_execution_context_t::machine. * vm_core.h, gc.c (rb_gc_mark_machine_stack): accept ec instead of th. it enables to call this func from rb_execution_context_mark() in vm.c. * cont.c (fiber_setcontext): catch up this fix. fiber_restore_thread() restores machine stack information too. * gc.c: catch up structure layout changes. * thread.c: ditto. * thread_pthread.c: ditto. * thread_win32.c: ditto. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@59825 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'thread_win32.c')
-rw-r--r--thread_win32.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/thread_win32.c b/thread_win32.c
index 5b42310..683fafc 100644
--- a/thread_win32.c
+++ b/thread_win32.c
@@ -546,8 +546,8 @@ native_thread_init_stack(rb_thread_t *th)
size = end - base;
space = size / 5;
if (space > 1024*1024) space = 1024*1024;
- th->machine.stack_start = (VALUE *)end - 1;
- th->machine.stack_maxsize = size - space;
+ th->ec.machine.stack_start = (VALUE *)end - 1;
+ th->ec.machine.stack_maxsize = size - space;
}
#ifndef InterlockedExchangePointer
@@ -575,7 +575,7 @@ thread_start_func_1(void *th_ptr)
thread_debug("thread created (th: %p, thid: %p, event: %p)\n", th,
th->thread_id, th->native_thread_data.interrupt_event);
- thread_start_func_2(th, th->machine.stack_start, rb_ia64_bsp());
+ thread_start_func_2(th, th->ec.machine.stack_start, rb_ia64_bsp());
w32_close_handle(thread_id);
thread_debug("thread deleted (th: %p)\n", th);