Change the canary function to be the member function of WasmHandleBase

Signed-off-by: Ingwon Song <igsong@google.com>

Author: ingwonsong

include/proxy-wasm/wasm.h

@@ -314,6 +314,10 @@ class WasmBase : public std::enable_shared_from_this<WasmBase> {
   std::shared_ptr<VmIdHandle> vm_id_handle_;
 };
 
+using WasmHandleFactory = std::function<std::shared_ptr<WasmHandleBase>(std::string_view vm_id)>;
+using WasmHandleCloneFactory =
+    std::function<std::shared_ptr<WasmHandleBase>(std::shared_ptr<WasmHandleBase> wasm)>;
+
 // Handle which enables shutdown operations to run post deletion (e.g. post listener drain).
 class WasmHandleBase : public std::enable_shared_from_this<WasmHandleBase> {
 public:
@@ -324,6 +328,8 @@ class WasmHandleBase : public std::enable_shared_from_this<WasmHandleBase> {
     }
   }
 
+  bool canary(const std::shared_ptr<PluginBase> &plugin, const WasmHandleCloneFactory &clone_factory);
+
   void kill() { wasm_base_ = nullptr; }
 
   std::shared_ptr<WasmBase> &wasm() { return wasm_base_; }
@@ -335,10 +341,6 @@ class WasmHandleBase : public std::enable_shared_from_this<WasmHandleBase> {
 std::string makeVmKey(std::string_view vm_id, std::string_view configuration,
                       std::string_view code);
 
-using WasmHandleFactory = std::function<std::shared_ptr<WasmHandleBase>(std::string_view vm_id)>;
-using WasmHandleCloneFactory =
-    std::function<std::shared_ptr<WasmHandleBase>(std::shared_ptr<WasmHandleBase> wasm)>;
-
 // Returns nullptr on failure (i.e. initialization of the VM fails).
 std::shared_ptr<WasmHandleBase> createWasm(const std::string &vm_key, const std::string &code,
                                            const std::shared_ptr<PluginBase> &plugin,

src/wasm.cc

@@ -447,11 +447,11 @@ void WasmBase::finishShutdown() {
   }
 }
 
-bool canary(std::shared_ptr<WasmHandleBase> &wasm_handle, const std::shared_ptr<PluginBase> &plugin,
+bool WasmHandleBase::canary(const std::shared_ptr<PluginBase> &plugin,
             const WasmHandleCloneFactory &clone_factory) {
-  auto configuration_canary_handle = clone_factory(wasm_handle);
+  auto configuration_canary_handle = clone_factory(shared_from_this());
   if (!configuration_canary_handle) {
-    wasm_handle->wasm()->fail(FailState::UnableToCloneVm, "Failed to clone Base Wasm");
+    this->wasm()->fail(FailState::UnableToCloneVm, "Failed to clone Base Wasm");
     return false;
   }
   if (!configuration_canary_handle->wasm()->initialize()) {
@@ -511,7 +511,7 @@ std::shared_ptr<WasmHandleBase> createWasm(const std::string &vm_key, const std:
   }
 
   // Either creating new one or reusing the existing one, apply canary for each plugin.
-  if (!canary(wasm_handle, plugin, clone_factory)) {
+  if (!wasm_handle->canary(plugin, clone_factory)) {
     return nullptr;
   }
   return wasm_handle;