wasm fix, asset label fix

fix that shortening asset name could throw exception
fix initializing thread environment in wasm calls
disable hw bounds checks in wasm

Author: malytomas

externals/wamr/CMakeLists.txt

@@ -34,8 +34,8 @@ set(WAMR_BUILD_TAIL_CALL 1)
 set(WAMR_BUILD_THREAD_MGR 0)
 set(WAMR_BUILD_WASI_NN 0)
 set(WAMR_DISABLE_APP_ENTRY 1)
-set(WAMR_DISABLE_HW_BOUND_CHECK 0)
-set(WAMR_DISABLE_STACK_HW_BOUND_CHECK 0)
+set(WAMR_DISABLE_HW_BOUND_CHECK 1)
+set(WAMR_DISABLE_STACK_HW_BOUND_CHECK 1)
 set(WAMR_DISABLE_WAKEUP_BLOCKING_OP 0)
 add_compile_definitions(BUILTIN_LIBC_BUFFERED_PRINTF=1 BUILTIN_LIBC_BUFFERED_PRINT_SIZE=512)
 add_compile_definitions("$<$<CONFIG:Debug>:BH_DEBUG=1>")
@@ -65,11 +65,3 @@ if(MSVC)
 		set(CMAKE_ASM_MASM_FLAGS "${CMAKE_ASM_MASM_FLAGS} /safeseh")
 	endif()
 endif()
-
-if(WAMR_DISABLE_STACK_OVERFLOW_CHECK)
-	message(STATUS "disabling stack overflow detection")
-	set(file "${CMAKE_CURRENT_LIST_DIR}/wamr/core/shared/platform/common/posix/posix_thread.c")
-	set(flags "-Dos_thread_get_stack_boundary=os_thread_get_stack_boundary_original")
-	set_source_files_properties(${file} PROPERTIES COMPILE_FLAGS "${flags}")
-	target_sources(iwasm_static PRIVATE os_thread_get_stack_boundary_dummy.c)
-endif()

externals/wamr/os_thread_get_stack_boundary_dummy.c

@@ -233,7 +233,7 @@ namespace cage
 	class CAGE_CORE_API WasmInstance : private Immovable
 	{
 	public:
-		String instanceName;
+		AssetLabel instanceName;
 
 		Holder<WasmModule> module() const;
 

sources/include/cage-core/wasm.h

@@ -12,7 +12,6 @@
 #include <cage-core/assetsManager.h>
 #include <cage-core/concurrent.h>
 #include <cage-core/concurrentQueue.h>
-#include <cage-core/config.h>
 #include <cage-core/debug.h>
 #include <cage-core/files.h>
 #include <cage-core/hashString.h>
@@ -355,9 +354,17 @@ namespace cage
 			fetch = defaultFetch;
 		}
 
+		AssetLabel convert(const String &name)
+		{
+			if (name.length() <= AssetLabel::MaxLength)
+				return name;
+			const uint32 start = name.length() - AssetLabel::MaxLength + 5;
+			return Stringizer() + "..." + subString(name, start, m);
+		}
+
 		Asset::Asset(AssetsManagerImpl *impl, uint32 scheme_, uint32 assetId, const String &textId_, Holder<void> &&value_) : AssetContext(impl, assetId)
 		{
-			textId = textId_.empty() ? (Stringizer() + "<" + assetId + "> with value") : textId_;
+			textId = textId_.empty() ? (Stringizer() + "<" + assetId + "> with value") : convert(textId_);
 			scheme = scheme_;
 			impl->existsCounter++;
 			*(AssetsScheme *)this = impl->schemes[scheme];
@@ -366,7 +373,7 @@ namespace cage
 
 		Asset::Asset(AssetsManagerImpl *impl, uint32 scheme_, uint32 assetId, const String &textId_, const AssetsScheme &customScheme_, Holder<void> &&customData_) : AssetContext(impl, assetId)
 		{
-			textId = textId_.empty() ? (Stringizer() + "<" + assetId + "> with custom scheme") : textId_;
+			textId = textId_.empty() ? (Stringizer() + "<" + assetId + "> with custom scheme") : convert(textId_);
 			scheme = scheme_;
 			impl->existsCounter++;
 			*(AssetsScheme *)this = customScheme_;
@@ -870,7 +877,7 @@ namespace cage
 				CAGE_THROW_ERROR(Exception, "file is not a cage asset");
 			if (h.version != CurrentAssetVersion)
 				CAGE_THROW_ERROR(Exception, "cage asset version mismatch");
-			asset->textId = h.textId.data();
+			asset->textId = h.textId;
 			if (h.scheme >= impl->schemes.size())
 				CAGE_THROW_ERROR(Exception, "cage asset scheme out of range");
 			asset->scheme = h.scheme;

sources/libcore/assets/assetsManager.cpp

@@ -236,7 +236,7 @@ namespace cage
 
 			WasmFunctionImpl(WasmInstanceImpl *instance, const String &name) : name(name), instance(instance)
 			{
-				CAGE_ASSERT(wasm_runtime_thread_env_inited());
+				initialize();
 
 				func = wasm_runtime_lookup_function(instance->instance, name.c_str());
 				if (!func)
@@ -480,6 +480,7 @@ namespace cage
 
 		void WasmFunctionInternal::call()
 		{
+			initialize();
 			WasmFunctionImpl *impl = (WasmFunctionImpl *)this;
 			if (!wasm_runtime_call_wasm(impl->instance->exec, impl->func, impl->data.size(), impl->data.data()))
 			{

sources/libcore/wasm.cpp

@@ -133,8 +133,6 @@ void testAssetManager()
 {
 	CAGE_TESTCASE("asset manager");
 
-	//configSetUint32("cage/assets/logLevel", 2);
-
 	{
 		CAGE_TESTCASE("basics");
 		Holder<AssetsManager> man = instantiate();
@@ -368,6 +366,22 @@ void testAssetManager()
 		man->waitTillEmpty();
 	}
 
+	{
+		CAGE_TESTCASE("fabricated with long name");
+		Holder<AssetsManager> man = instantiate();
+		{
+			Holder<AssetCounter> f = systemMemory().createHolder<AssetCounter>();
+			man->loadValue<AssetSchemeIndexCounter, AssetCounter>(10, std::move(f), "really very very much very long long long name with a lot of text here to make sure it does not fit in the asset id string which is shorter than the string limit");
+		}
+		waitProcessing(man);
+		CAGE_TEST(AssetCounter::counter == 1);
+		CAGE_TEST((man->get<AssetSchemeIndexCounter, AssetCounter>(10)));
+		man->unload(10);
+		waitProcessing(man);
+		CAGE_TEST(AssetCounter::counter == 0);
+		man->waitTillEmpty();
+	}
+
 	{
 		CAGE_TESTCASE("non-existent asset");
 		Holder<AssetsManager> man = instantiate();

sources/test-core/assetsManager.cpp

@@ -1,5 +1,6 @@
 #include <cmath>
 
+#include <cage-core/concurrent.h>
 #include <cage-core/wasm.h>
 
 #include "main.h"
@@ -38,12 +39,8 @@ namespace
 		WasmBuffer buf = inst->adapt(wasmAddr, inst->strLen(wasmAddr) + 1);
 		return buf.read() == s;
 	}
-}
-
-void testWasm()
-{
-	CAGE_TESTCASE("wasm");
 
+	void testSimpleFunctions()
 	{
 		CAGE_TESTCASE("simple functions");
 		Holder<WasmModule> mod = newWasmModule(sums_wasm().cast<const char>());
@@ -112,6 +109,7 @@ void testWasm()
 		}
 	}
 
+	void testFunctionsWithBuffers()
 	{
 		CAGE_TESTCASE("functions with buffers");
 		Holder<WasmModule> mod = newWasmModule(strings_wasm().cast<const char>());
@@ -150,8 +148,9 @@ void testWasm()
 		}
 	}
 
+	void testCppObjectsLifetimes()
 	{
-		CAGE_TESTCASE("foo (c++ objects lifetime)");
+		CAGE_TESTCASE("c++ objects lifetime");
 		Holder<WasmModule> mod = newWasmModule(foo_wasm().cast<const char>());
 		printModuleDetails(+mod);
 		Holder<WasmInstance> inst = wasmInstantiate(mod.share());
@@ -174,6 +173,7 @@ void testWasm()
 		CAGE_TEST(get_map(30) == 900);
 	}
 
+	void testMultipleInstantiations()
 	{
 		CAGE_TESTCASE("multiple instantiations of same module");
 		Holder<WasmModule> mod = newWasmModule(strings_wasm().cast<const char>());
@@ -191,6 +191,7 @@ void testWasm()
 		CAGE_TEST(testStr(+inst2, get2(), "ABCDEFGHIJ"));
 	}
 
+	void testUnlinkedNativeFunction()
 	{
 		CAGE_TESTCASE("unlinked native functions");
 		Holder<WasmModule> mod = newWasmModule(natives_wasm().cast<const char>());
@@ -200,9 +201,10 @@ void testWasm()
 		CAGE_TEST_THROWN(call1());
 	}
 
+	void testLinkedNativeFunctions()
 	{
 		CAGE_TESTCASE("linked native functions");
-		uint32 fnc1cnt = 0, fnc2cnt = 0, fnc3cnt = 0;
+		static uint32 fnc1cnt = 0, fnc2cnt = 0, fnc3cnt = 0;
 		{
 			Holder<WasmNatives> nats = newWasmNatives();
 			nats->add(Delegate<void()>([&]() { fnc1cnt++; }), "cage_test_func1");
@@ -250,8 +252,52 @@ void testWasm()
 		CAGE_TEST(fnc3cnt == 1);
 	}
 
+	void testEmptyModule()
 	{
 		CAGE_TESTCASE("empty module");
 		CAGE_TEST_THROWN(newWasmModule({}));
 	}
+
+	void testInThreads()
+	{
+		CAGE_TESTCASE("wasm in threads");
+
+		struct Context
+		{
+			Holder<WasmModule> mod;
+			Holder<WasmInstance> inst;
+			WasmFunction<void()> call;
+		};
+		Context context;
+
+		{
+			Holder<Thread> t1 = newThread([&]() { context.mod = newWasmModule(natives_wasm().cast<const char>()); }, "t1");
+			t1->wait();
+		}
+		{
+			Holder<Thread> t2 = newThread([&]() { context.inst = wasmInstantiate(context.mod.share()); }, "t2");
+			t2->wait();
+		}
+		{
+			Holder<Thread> t3 = newThread([&]() { context.call = context.inst->function<void()>("cage_test_call1"); }, "t3");
+			t3->wait();
+		}
+		{
+			Holder<Thread> t4 = newThread([&]() { context.call(); }, "t4");
+			t4->wait();
+		}
+	}
+}
+
+void testWasm()
+{
+	CAGE_TESTCASE("wasm");
+	testSimpleFunctions();
+	testFunctionsWithBuffers();
+	testCppObjectsLifetimes();
+	testMultipleInstantiations();
+	testUnlinkedNativeFunction();
+	testLinkedNativeFunctions();
+	testEmptyModule();
+	testInThreads();
 }