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

[wasm] Scan machine stack based on ec->machine.stack_{start,end}

Browse source 
fiber machine stack is placed outside of C stack allocated by wasm-ld,
so highest stack address recorded by `rb_wasm_record_stack_base` is
invalid when running on non-main fiber.
Therefore, we should scan `stack_{start,end}` which always point a valid
stack range in any context.
This commit is contained in:
Yuta Saito 2022-11-05 16:10:35 +00:00
parent 267452e6fe
commit 3a6cdeda89
Notes: git 2022-11-05 20:03:40 +00:00 
Merged: https://github.com/ruby/ruby/pull/6679
4 changed files with 16 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
gc.c
View file

@ -6756,8 +6756,10 @@ mark_current_machine_context(rb_objspace_t *objspace, rb_execution_context_t *ec
static void static void
mark_current_machine_context(rb_objspace_t *objspace, rb_execution_context_t *ec) mark_current_machine_context(rb_objspace_t *objspace, rb_execution_context_t *ec)
{ {
rb_wasm_scan_stack(rb_mark_locations); VALUE *stack_start, *stack_end;
each_stack_location(objspace, ec, rb_stack_range_tmp[0], rb_stack_range_tmp[1], gc_mark_maybe); SET_STACK_END;
GET_STACK_BOUNDS(stack_start, stack_end, 1);
each_stack_location(objspace, ec, stack_start, stack_end, gc_mark_maybe);
rb_wasm_scan_locals(rb_mark_locations); rb_wasm_scan_locals(rb_mark_locations);
each_stack_location(objspace, ec, rb_stack_range_tmp[0], rb_stack_range_tmp[1], gc_mark_maybe); each_stack_location(objspace, ec, rb_stack_range_tmp[0], rb_stack_range_tmp[1], gc_mark_maybe);

7
thread_none.c
View file

@ -15,6 +15,10 @@
#include <time.h> #include <time.h>
#if defined(__wasm__) && !defined(__EMSCRIPTEN__)
# include "wasm/machine.h"
#endif
#define TIME_QUANTUM_MSEC (100) #define TIME_QUANTUM_MSEC (100)
#define TIME_QUANTUM_USEC (TIME_QUANTUM_MSEC * 1000) #define TIME_QUANTUM_USEC (TIME_QUANTUM_MSEC * 1000)
#define TIME_QUANTUM_NSEC (TIME_QUANTUM_USEC * 1000) #define TIME_QUANTUM_NSEC (TIME_QUANTUM_USEC * 1000)
@ -143,6 +147,9 @@ ruby_init_stack(volatile VALUE *addr)
static int static int
native_thread_init_stack(rb_thread_t *th) native_thread_init_stack(rb_thread_t *th)
{ {
#if defined(__wasm__) && !defined(__EMSCRIPTEN__)
th->ec->machine.stack_start = (VALUE *)rb_wasm_stack_get_base();
#endif
return 0; // success return 0; // success
} }

6
wasm/machine.c
View file

@ -49,10 +49,10 @@ rb_wasm_record_stack_base(void)
return 0; return 0;
} }
void void *
_rb_wasm_scan_stack(rb_wasm_scan_func scan, void *current) rb_wasm_stack_get_base(void)
{ {
scan(current, rb_wasm_stack_base); return rb_wasm_stack_base;
} }
void * void *

5
wasm/machine.h
View file

@ -8,9 +8,8 @@ typedef void (*rb_wasm_scan_func)(void*, void*);
// Used by conservative GC // Used by conservative GC
void rb_wasm_scan_locals(rb_wasm_scan_func scan); void rb_wasm_scan_locals(rb_wasm_scan_func scan);
// Scan userland C-stack memory space in WebAssembly. Used by conservative GC // Get base address of userland C-stack memory space in WebAssembly. Used by conservative GC
#define rb_wasm_scan_stack(scan) _rb_wasm_scan_stack((scan), rb_wasm_get_stack_pointer()) void *rb_wasm_stack_get_base(void);
void _rb_wasm_scan_stack(rb_wasm_scan_func scan, void *current);
// Get the current stack pointer // Get the current stack pointer