[WASI Threads] handle imported shared memory

WasmEdge · May 3, 2023 · 44a487a · 44a487a
1 parent 0c597bf
commit 44a487a
Show file tree

Hide file tree

Showing 2 changed files with 37 additions and 0 deletions.
diff --git a/include/runtime/storemgr.h b/include/runtime/storemgr.h
@@ -92,6 +92,18 @@ class StoreManager {
     return {};
   }
 
+  // Expect<void>
+  // addMemoryInModule(std::string_view ModName,std::string_view MemName,
+  //                   std::unique_ptr<Instance::MemoryInstance> &&MemIns) {
+  //   std::unique_lock Lock(Mutex);
+  //   auto Iter = NamedMod.find(ModName);
+  //   if (likely(Iter != NamedMod.cend())) {
+  //     return Unexpect(ErrCode::Value::ModuleNameConflict); // TODO
+  //   }
+  //   Iter->second->addHostMemory(MemName, std::move(MemIns)); // Iter is const...
+  //   return {};
+  // }
+
   /// Collect the instantiation failed module.
   void recycleModule(std::unique_ptr<Instance::ModuleInstance> &&Mod) {
     FailedMod = std::move(Mod);

diff --git a/lib/executor/instantiate/import.cpp b/lib/executor/instantiate/import.cpp
@@ -100,6 +100,31 @@ checkImportMatched(std::string_view ModName, std::string_view ExtName,
 Expect<void> Executor::instantiate(Runtime::StoreManager &StoreMgr,
                                    Runtime::Instance::ModuleInstance &ModInst,
                                    const AST::ImportSection &ImportSec) {
+  // Find the first shared memory and create it
+  if (Conf.hasProposal(Proposal::Threads)) {
+    // Inject an shared memory in env
+    // TODO: if env is existing?
+    if (StoreMgr.findModule("env") == nullptr) {
+      for (const auto &ImpDesc : ImportSec.getContent()) {
+        auto ExtType = ImpDesc.getExternalType();
+        auto ModName = ImpDesc.getModuleName();
+        auto ExtName = ImpDesc.getExternalName();
+        if (ExtType == ExternalType::Memory && ModName == "env") {
+          auto MemType = ImpDesc.getExternalMemoryType();
+          if (MemType.getLimit().isShared()) {
+            spdlog::error("isShared");
+            spdlog::error(ExtName);
+            auto EnvMod = new Runtime::Instance::ModuleInstance("env");
+            EnvMod->addHostMemory(
+                ExtName, std::make_unique<
+                             WasmEdge::Runtime::Instance::MemoryInstance>(MemType));
+            StoreMgr.registerModule(EnvMod);
+          }
+        }
+      }
+    }
+  }
+
   // Iterate and instantiate import descriptions.
   for (const auto &ImpDesc : ImportSec.getContent()) {
     // Get data from import description and find import module.