1berry/ruby
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

[wasm] Allocate asyncify buffer on heap to save stack usage

Browse Source
This commit is contained in:
Yuta Saito 2022-09-04 14:34:24 +00:00
parent ab7bb38aca
commit 8945143464
Notes: git 2023-05-15 18:53:27 +00:00 
Merged: https://github.com/ruby/ruby/pull/7818
2 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
wasm/setjmp.c
View File

@ -84,6 +84,7 @@ _rb_wasm_setjmp_internal(rb_wasm_jmp_buf *env)
RB_WASM_DEBUG_LOG(" JMP_BUF_STATE_INITIALIZED"); RB_WASM_DEBUG_LOG(" JMP_BUF_STATE_INITIALIZED");
env->state = JMP_BUF_STATE_CAPTURING; env->state = JMP_BUF_STATE_CAPTURING;
env->payload = 0; env->payload = 0;
env->longjmp_buf_ptr = NULL;
_rb_wasm_active_jmpbuf = env; _rb_wasm_active_jmpbuf = env;
async_buf_init(&env->setjmp_buf); async_buf_init(&env->setjmp_buf);
asyncify_start_unwind(&env->setjmp_buf); asyncify_start_unwind(&env->setjmp_buf);
@ -100,6 +101,7 @@ _rb_wasm_setjmp_internal(rb_wasm_jmp_buf *env)
asyncify_stop_rewind(); asyncify_stop_rewind();
RB_WASM_DEBUG_LOG(" JMP_BUF_STATE_RETURNING"); RB_WASM_DEBUG_LOG(" JMP_BUF_STATE_RETURNING");
env->state = JMP_BUF_STATE_CAPTURED; env->state = JMP_BUF_STATE_CAPTURED;
free(env->longjmp_buf_ptr);
_rb_wasm_active_jmpbuf = NULL; _rb_wasm_active_jmpbuf = NULL;
return env->payload; return env->payload;
} }
@ -117,9 +119,10 @@ _rb_wasm_longjmp(rb_wasm_jmp_buf* env, int value)
assert(value != 0); assert(value != 0);
env->state = JMP_BUF_STATE_RETURNING; env->state = JMP_BUF_STATE_RETURNING;
env->payload = value; env->payload = value;
env->longjmp_buf_ptr = malloc(sizeof(struct __rb_wasm_asyncify_jmp_buf));
_rb_wasm_active_jmpbuf = env; _rb_wasm_active_jmpbuf = env;
async_buf_init(&env->longjmp_buf); async_buf_init(env->longjmp_buf_ptr);
asyncify_start_unwind(&env->longjmp_buf); asyncify_start_unwind(env->longjmp_buf_ptr);
} }

2
wasm/setjmp.h
View File

@ -19,7 +19,7 @@ typedef struct {
struct __rb_wasm_asyncify_jmp_buf setjmp_buf; struct __rb_wasm_asyncify_jmp_buf setjmp_buf;
// Internal Asyncify buffer space used while unwinding from longjmp // Internal Asyncify buffer space used while unwinding from longjmp
// but never used for rewinding. // but never used for rewinding.
struct __rb_wasm_asyncify_jmp_buf longjmp_buf; struct __rb_wasm_asyncify_jmp_buf *longjmp_buf_ptr;
// Used to save top address of Asyncify stack `setjmp_buf`, which is // Used to save top address of Asyncify stack `setjmp_buf`, which is
// overwritten during first rewind. // overwritten during first rewind.
void *dst_buf_top; void *dst_buf_top;