Move WasmEdge initialization from the constructor into initStore() so it is more in line with other runtimes.

Signed-off-by: Rachel Green <[email protected]>

Author: rachgreen33

src/wasmedge/wasmedge.cc

@@ -225,9 +225,6 @@ using HostModuleDataPtr = std::unique_ptr<HostModuleData>;
 class WasmEdge : public WasmVm {
 public:
   WasmEdge() {
-    loader_ = WasmEdge_LoaderCreate(nullptr);
-    validator_ = WasmEdge_ValidatorCreate(nullptr);
-    executor_ = WasmEdge_ExecutorCreate(nullptr, nullptr);
     store_ = nullptr;
     ast_module_ = nullptr;
     module_ = nullptr;
@@ -324,6 +321,9 @@ void WasmEdge::initStore() {
   if (store_ != nullptr) {
     return;
   }
+  loader_ = WasmEdge_LoaderCreate(nullptr);
+  validator_ = WasmEdge_ValidatorCreate(nullptr);
+  executor_ = WasmEdge_ExecutorCreate(nullptr, nullptr);
   store_ = WasmEdge_StoreCreate();
 }
 

test/wasm_vm_test.cc

@@ -55,10 +55,9 @@ TEST_P(TestVm, Init) {
   EXPECT_LE(warm, warm_time_ns_limit);
 
   // Verify that getting a "warm" engine takes at least 50x less time than getting a "cold" one.
-  // We skip NullVM because warm() is a noop, and we skip wasmedge because its engine is initialized
-  // in the constructor vs. on cold start.
-  if (engine_ == "null" || engine_ == "wasmedge") {
-    std::cout << "Skipping warm() performance assertions for " << engine_ << "." << std::endl;
+  // We skip NullVM because warm() is a noop.
+  if (engine_ == "null") {
+    std::cout << "Skipping warm() performance assertions for NullVM." << std::endl;
     return;
   }
   EXPECT_LE(warm * 50, cold);