Increase ASYNCIFY_STACK_SIZE (bellard#114)

* Increase ASYNCIFY_STACK_SIZE * Add dynamic asyncify stack size
GerHobbelt · May 3, 2023 · c6bcdf9 · c6bcdf9
1 parent a992448
commit c6bcdf9
Show file tree

Hide file tree

Showing 8 changed files with 355 additions and 341 deletions.
diff --git a/Makefile b/Makefile
@@ -86,6 +86,7 @@ CFLAGS_WASM+=-s NODEJS_CATCH_EXIT=0
 # https://emscripten.org/docs/porting/asyncify.html
 CFLAGS_WASM_ASYNCIFY+=-s ASYNCIFY=1
 CFLAGS_WASM_ASYNCIFY+=-DQTS_ASYNCIFY=1
+CFLAGS_WASM_ASYNCIFY+=-s ASYNCIFY_STACK_SIZE=81920
 CFLAGS_WASM_ASYNCIFY+=-s ASYNCIFY_REMOVE=@$(BUILD_WRAPPER)/asyncify-remove.json
 CFLAGS_WASM_ASYNCIFY+=-s ASYNCIFY_IMPORTS=@$(BUILD_WRAPPER)/asyncify-imports.json
 # CFLAGS_WASM_ASYNCIFY+=-s ENVIRONMENT=web

diff --git a/c/interface.c b/c/interface.c
@@ -215,10 +215,19 @@ int QTS_BuildIsSanitizeLeak() {
 #endif
 }
 
+#ifdef QTS_ASYNCIFY
+EM_JS(void, set_asyncify_stack_size, (size_t size), {
+  Asyncify.StackSize = size || 81920;
+});
+#endif
+
 /**
  * Set the stack size limit, in bytes. Set to 0 to disable.
  */
 void QTS_RuntimeSetMaxStackSize(JSRuntime *rt, size_t stack_size) {
+#ifdef QTS_ASYNCIFY
+  set_asyncify_stack_size(stack_size);
+#endif
   JS_SetMaxStackSize(rt, stack_size);
 }
 

diff --git a/ts/generated/emscripten-module.WASM_DEBUG_ASYNCIFY.js b/ts/generated/emscripten-module.WASM_DEBUG_ASYNCIFY.js
diff --git a/ts/generated/emscripten-module.WASM_DEBUG_ASYNCIFY.wasm.map b/ts/generated/emscripten-module.WASM_DEBUG_ASYNCIFY.wasm.map
diff --git a/ts/generated/emscripten-module.WASM_DEBUG_SYNC.js b/ts/generated/emscripten-module.WASM_DEBUG_SYNC.js
diff --git a/ts/generated/emscripten-module.WASM_RELEASE_ASYNCIFY.js b/ts/generated/emscripten-module.WASM_RELEASE_ASYNCIFY.js
diff --git a/ts/generated/emscripten-module.WASM_RELEASE_SYNC.js b/ts/generated/emscripten-module.WASM_RELEASE_SYNC.js
diff --git a/ts/quickjs.test.ts b/ts/quickjs.test.ts
@@ -980,6 +980,38 @@ function asyncContextTests(getContext: () => Promise<QuickJSAsyncContext>) {
       )
     })
   })
+
+  describe("ASYNCIFY_STACK_SIZE", () => {
+    // | ASYNCIFY_STACK_SIZE | Max Nesting Levels |
+    // |---------------------|--------------------|
+    // | 4096 (default)      | 12                 |
+    // | 81920               | 297                |
+    it("is enough to support at least 20 levels of function nesting", async () => {
+      // The nesting levels of the test cannot be too high, otherwise the
+      // node.js call stack will overflow when executing `yarn test`
+      let asyncFunctionCalls = 0
+      const asyncFn = async () => {
+        asyncFunctionCalls++
+      }
+      vm.newAsyncifiedFunction("asyncFn", asyncFn).consume((fn) =>
+        vm.setProp(vm.global, "asyncFn", fn)
+      )
+
+      await vm.evalCodeAsync(`
+        let nestingLevels = 0
+        function nestingFn() {
+          nestingLevels++
+          asyncFn()
+          if (nestingLevels < 20) {
+            nestingFn()
+          }
+        }
+        nestingFn();
+      `)
+
+      assert.equal(asyncFunctionCalls, 20, "20 levels of nesting")
+    })
+  })
 }
 
 describe("QuickJSContext", function () {