Add support for more WASM_EXPORT overrides in the Null VM (proxy-wasm#31)

Signed-off-by: John Plevyak <[email protected]>

Author: jplevyak

include/proxy-wasm/null_plugin.h

@@ -38,6 +38,8 @@ namespace proxy_wasm {
  * Registry for Plugin implementation.
  */
 struct NullPluginRegistry {
+  void (*proxy_abi_version_0_1_0_)() = nullptr;
+  void (*proxy_on_log_)(uint32_t context_id) = nullptr;
   uint32_t (*proxy_validate_configuration_)(uint32_t root_context_id,
                                             uint32_t plugin_configuration_size) = nullptr;
   void (*proxy_on_context_create_)(uint32_t context_id, uint32_t parent_context_id) = nullptr;
@@ -127,14 +129,21 @@ class NullPlugin : public NullVmPlugin {
   extern NullPluginRegistry *context_registry_;                                                    \
   struct RegisterContextFactory {                                                                  \
     explicit RegisterContextFactory(null_plugin::ContextFactory context_factory,                   \
-                                    null_plugin::RootFactory root_factory = nullptr,               \
+                                    null_plugin::RootFactory root_factory,                         \
                                     StringView root_id = "") {                                     \
       if (!context_registry_) {                                                                    \
         context_registry_ = new NullPluginRegistry;                                                \
       }                                                                                            \
       context_registry_->context_factories[std::string(root_id)] = context_factory;                \
       context_registry_->root_factories[std::string(root_id)] = root_factory;                      \
     }                                                                                              \
+    explicit RegisterContextFactory(null_plugin::ContextFactory context_factory,                   \
+                                    StringView root_id = "") {                                     \
+      if (!context_registry_) {                                                                    \
+        context_registry_ = new NullPluginRegistry;                                                \
+      }                                                                                            \
+      context_registry_->context_factories[std::string(root_id)] = context_factory;                \
+    }                                                                                              \
     explicit RegisterContextFactory(null_plugin::RootFactory root_factory,                         \
                                     StringView root_id = "") {                                     \
       if (!context_registry_) {                                                                    \

src/null/null_plugin.cc

@@ -468,7 +468,13 @@ void NullPlugin::onForeignFunction(uint64_t context_id, uint64_t foreign_functio
   getContextBase(context_id)->onForeignFunction(foreign_function_id, data_size);
 }
 
-void NullPlugin::onLog(uint64_t context_id) { getContext(context_id)->onLog(); }
+void NullPlugin::onLog(uint64_t context_id) {
+  if (registry_->proxy_on_log_) {
+    registry_->proxy_on_log_(context_id);
+    return;
+  }
+  getContext(context_id)->onLog();
+}
 
 uint64_t NullPlugin::onDone(uint64_t context_id) {
   if (registry_->proxy_on_done_) {