Keep the wasm handler reference to reuse the wasm vm

Author: ingwonsong

test/wasm_test.cc

@@ -15,6 +15,7 @@
 #include "include/proxy-wasm/wasm.h"
 
 #include "gtest/gtest.h"
+#include <unordered_set>
 
 #include "test/utility.h"
 
@@ -177,6 +178,8 @@ TEST_P(TestVm, AlwaysApplyCanary) {
   // For each create Wasm, canary should be done.
   EXPECT_EQ(canary_count, 1);
 
+  std::unordered_set<std::shared_ptr<WasmHandleBase>> reference_holder;
+
   for (const auto &root_id : root_ids) {
     for (const auto &vm_id : vm_ids) {
       for (const auto &vm_config : vm_configs) {
@@ -208,6 +211,10 @@ TEST_P(TestVm, AlwaysApplyCanary) {
             }
 
             ASSERT_TRUE(wasm_handle_comp && wasm_handle_comp->wasm());
+            // Keep the reference of wasm_handle_comp in order to utilize the WasmHandleBase
+            // cache of createWasm. If we don't keep the reference, WasmHandleBase and VM will be
+            // destroyed for each iteration.
+            reference_holder.insert(wasm_handle_comp);
 
             EXPECT_TRUE(TestContext::isGlobalLogged("onConfigure: " + root_id));
 
@@ -228,10 +235,6 @@ TEST_P(TestVm, AlwaysApplyCanary) {
             }
             // For each create Wasm, canary should be done.
             EXPECT_EQ(canary_count, 1);
-
-            if (wasm_handle_comp->wasm() != wasm_handle_baseline->wasm()) {
-              wasm_handle_comp->kill();
-            }
           }
         }
       }