Address review comments:

- Reduce STACK_SIZE to 256KB
- Update Makefile to be in sync with Bazel build rule

Signed-off-by: Michael Warres <[email protected]>

Author: mpwarres

Makefile

@@ -29,17 +29,23 @@ PKG_CONFIG_PATH = ${EMSDK}/upstream/emscripten/cache/sysroot/lib/pkgconfig
 WASM_LIBS = $(shell $(PKG_CONFIG) $(WASM_DEPS) $(PROTO_DEPS) \
 	  --with-path=$(PKG_CONFIG_PATH) --libs | sed -e 's/-pthread //g')
 
+# See proxy_wasm_cc_binary build rule definition in bazel/defs.bzl for
+# explanation of emscripten link options.
+EMSCRIPTEN_LINK_OPTS := --no-entry \
+	--js-library ${PROXY_WASM_CPP_SDK}/proxy_wasm_intrinsics.js \
+	-sSTANDALONE_WASM -sEXPORTED_FUNCTIONS=_malloc \
+	-sALLOW_MEMORY_GROWTH=1 -sSTACK_SIZE=256KB -sINITIAL_HEAP=1MB
+
+
 debug-deps:
 	# WASM_DEPS : ${WASM_DEPS}
 	# WASM_LIBS : ${WASM_LIBS}
 	# PROTO_DEPS: ${PROTO_DEPS}
 	# PROTO_OPTS: ${PROTO_OPTS}
 
-# TODO(mpwarres): Add Emscripten stack/heap size params in PR#174.
 %.wasm %.wat: %.cc
-	em++ --no-entry -sSTANDALONE_WASM -sEXPORTED_FUNCTIONS=_malloc \
-		--std=c++17 -O3 -flto \
-		--js-library ${PROXY_WASM_CPP_SDK}/proxy_wasm_intrinsics.js \
+	em++ --std=c++17 -O3 -flto \
+		${EMSCRIPTEN_LINK_OPTS} \
 		-I${PROXY_WASM_CPP_SDK} \
 		${CPP_CONTEXT_LIB} \
 		${PROTO_OPTS} \

bazel/defs.bzl

@@ -104,9 +104,10 @@ def proxy_wasm_cc_binary(
             "-sALLOW_MEMORY_GROWTH=1",
             # Total stack size (fixed). Emscripten default stack size changed from 5MiB to 64KiB in
             # 3.1.27: https://github.com/emscripten-core/emscripten/blob/main/ChangeLog.md,
-            # https://github.com/emscripten-core/emscripten/pull/18191. We pick 1MiB somewhat
-            # arbitrarily, since it is gives a little more room and is easy to remember.
-            "-sSTACK_SIZE=1MB",
+            # https://github.com/emscripten-core/emscripten/pull/18191. We pick 256KB as a balance
+            # between reducing memory size and providing more headroom in case of deeper call
+            # stacks. For comparison, the Rust SDK uses 1MB stack by default.
+            "-sSTACK_SIZE=256KB",
             # Initial amount of heap memory
             "-sINITIAL_HEAP=1MB",
         ],