Skip to content

Commit 90881fe

Browse files
committed
Merge branch 'main' into update/rust
Signed-off-by: Matt Leon <mattleon@google.com>
2 parents df8290d + ad71f14 commit 90881fe

2 files changed

Lines changed: 9 additions & 3 deletions

File tree

include/proxy-wasm/limits.h

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -40,3 +40,8 @@
4040
#ifndef PROXY_WASM_HOST_PAIRS_MAX_COUNT
4141
#define PROXY_WASM_HOST_PAIRS_MAX_COUNT 1024
4242
#endif
43+
44+
// Maximum number of frames in Wasm backtrace.
45+
#ifndef PROXY_WASM_HOST_MAX_BACKTRACE_FRAMES_COUNT
46+
#define PROXY_WASM_HOST_MAX_BACKTRACE_FRAMES_COUNT 20
47+
#endif

src/v8/v8.cc

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -44,9 +44,10 @@ wasm::Engine *engine() {
4444

4545
std::call_once(init, []() {
4646
// Disable the Liftoff compiler to force optimized JIT up-front.
47-
std::string args = absl::StrFormat("--wasm_max_mem_pages=%u --no-liftoff",
48-
PROXY_WASM_HOST_MAX_WASM_MEMORY_SIZE_BYTES /
49-
PROXY_WASM_HOST_WASM_MEMORY_PAGE_SIZE_BYTES);
47+
std::string args = absl::StrFormat(
48+
"--no-liftoff --wasm_max_mem_pages=%u --stack-trace-limit=%u",
49+
PROXY_WASM_HOST_MAX_WASM_MEMORY_SIZE_BYTES / PROXY_WASM_HOST_WASM_MEMORY_PAGE_SIZE_BYTES,
50+
PROXY_WASM_HOST_MAX_BACKTRACE_FRAMES_COUNT);
5051
::v8::V8::SetFlagsFromString(args.c_str(), args.size());
5152
::v8::V8::EnableWebAssemblyTrapHandler(true);
5253

0 commit comments

Comments
 (0)