Feat: Add additional virtual keywords to wasm base.

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

Author: rachgreen33

include/proxy-wasm/context.h

@@ -150,14 +150,23 @@ class ContextBase : public RootInterface,
               const std::shared_ptr<PluginHandleBase> &plugin_handle); // Stream context.
   virtual ~ContextBase();
 
+#ifdef PROXY_WASM_CPP_HOST_MORE_VIRTUAL_METHODS
+  virtual WasmBase *wasm() const { return wasm_; }
+#else
   WasmBase *wasm() const { return wasm_; }
+#endif
   uint32_t id() const { return id_; }
   // The VM Context used for calling "malloc" has an id_ == 0.
   bool isVmContext() const { return id_ == 0; }
   // Root Contexts have the VM Context as a parent.
   bool isRootContext() const { return parent_context_id_ == 0; }
+#ifdef PROXY_WASM_CPP_HOST_MORE_VIRTUAL_METHODS
+  virtual ContextBase *parent_context() const { return parent_context_; }
+  virtual ContextBase *root_context() const {
+#else
   ContextBase *parent_context() const { return parent_context_; }
   ContextBase *root_context() const {
+#endif
     const ContextBase *previous = this;
     ContextBase *parent = parent_context_;
     while (parent != previous) {
@@ -170,7 +179,11 @@ class ContextBase : public RootInterface,
   std::string_view log_prefix() const {
     return isRootContext() ? root_log_prefix_ : plugin_->log_prefix();
   }
+#ifdef PROXY_WASM_CPP_HOST_MORE_VIRTUAL_METHODS
+  virtual WasmVm *wasmVm() const;
+#else
   WasmVm *wasmVm() const;
+#endif
 
   // Called before deleting the context.
   virtual void destroy();

include/proxy-wasm/wasm.h

@@ -54,18 +54,34 @@ class WasmBase : public std::enable_shared_from_this<WasmBase> {
   WasmBase(const std::shared_ptr<WasmHandleBase> &base_wasm_handle, const WasmVmFactory &factory);
   virtual ~WasmBase();
 
+#ifdef PROXY_WASM_CPP_HOST_MORE_VIRTUAL_METHODS
+  virtual bool load(const std::string &code, bool allow_precompiled = false);
+  virtual bool initialize();
+  virtual void startVm(ContextBase *root_context);
+  virtual bool configure(ContextBase *root_context, std::shared_ptr<PluginBase> plugin);
+#else
   bool load(const std::string &code, bool allow_precompiled = false);
   bool initialize();
   void startVm(ContextBase *root_context);
   bool configure(ContextBase *root_context, std::shared_ptr<PluginBase> plugin);
+#endif
   // Returns the root ContextBase or nullptr if onStart returns false.
+#ifdef PROXY_WASM_CPP_HOST_MORE_VIRTUAL_METHODS
+  virtual ContextBase *start(const std::shared_ptr<PluginBase> &plugin);
+#else
   ContextBase *start(const std::shared_ptr<PluginBase> &plugin);
+#endif
 
   std::string_view vm_id() const { return vm_id_; }
   std::string_view vm_key() const { return vm_key_; }
   WasmVm *wasm_vm() const { return wasm_vm_.get(); }
+#ifdef PROXY_WASM_CPP_HOST_MORE_VIRTUAL_METHODS
+  virtual ContextBase *vm_context() const { return vm_context_.get(); }
+  virtual ContextBase *getRootContext(const std::shared_ptr<PluginBase> &plugin, bool allow_closed);
+#else
   ContextBase *vm_context() const { return vm_context_.get(); }
   ContextBase *getRootContext(const std::shared_ptr<PluginBase> &plugin, bool allow_closed);
+#endif
   ContextBase *getContext(uint32_t id) {
     auto it = contexts_.find(id);
     if (it != contexts_.end())
@@ -321,14 +337,23 @@ using WasmHandleCloneFactory =
 class WasmHandleBase : public std::enable_shared_from_this<WasmHandleBase> {
 public:
   explicit WasmHandleBase(std::shared_ptr<WasmBase> wasm_base) : wasm_base_(wasm_base) {}
+#ifdef PROXY_WASM_CPP_HOST_MORE_VIRTUAL_METHODS
+  virtual ~WasmHandleBase() {
+#else
   ~WasmHandleBase() {
+#endif
     if (wasm_base_) {
       wasm_base_->startShutdown();
     }
   }
 
+#ifdef PROXY_WASM_CPP_HOST_MORE_VIRTUAL_METHODS
+  virtual bool canary(const std::shared_ptr<PluginBase> &plugin,
+                      const WasmHandleCloneFactory &clone_factory);
+#else
   bool canary(const std::shared_ptr<PluginBase> &plugin,
               const WasmHandleCloneFactory &clone_factory);
+#endif
 
   void kill() { wasm_base_ = nullptr; }
 
@@ -356,7 +381,11 @@ class PluginHandleBase : public std::enable_shared_from_this<PluginHandleBase> {
   explicit PluginHandleBase(std::shared_ptr<WasmHandleBase> wasm_handle,
                             std::shared_ptr<PluginBase> plugin)
       : plugin_(plugin), wasm_handle_(wasm_handle) {}
+#ifdef PROXY_WASM_CPP_HOST_MORE_VIRTUAL_METHODS
+  virtual ~PluginHandleBase() {
+#else
   ~PluginHandleBase() {
+#endif
     if (wasm_handle_) {
       wasm_handle_->wasm()->startShutdown(plugin_->key());
     }