Add test of NullVm. (proxy-wasm#5)

* Add test of NullVm.

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

Author: jplevyak

BUILD

@@ -4,28 +4,48 @@ package(default_visibility = ["//visibility:public"])
 
 cc_library(
     name = "include",
-    hdrs = [
-        "include/proxy-wasm/compat.h",
-        "include/proxy-wasm/context.h",
-        "include/proxy-wasm/wasm_vm.h",
-        "include/proxy-wasm/word.h",
-    ],
+    hdrs = glob(["include/proxy-wasm/**/*.h"]),
     deps = [
         "@proxy_wasm_cpp_sdk//:common_lib",
     ],
 )
 
+cc_library(
+    name = "lib",
+    srcs = glob(
+        ["src/**/*.cc"],
+        exclude = [
+            "src/**/wavm*",
+            "src/**/v8*",
+        ],
+    ) + glob(["src/**/*.h"]),
+    copts = ["-DWITHOUT_ZLIB=1"],
+    deps = [
+        ":include",
+        "@proxy_wasm_cpp_sdk//:api_lib",
+    ],
+)
+
 # TODO: remove when dependent projects have been upgraded.
 cc_library(
-    name = "include14",
-    hdrs = [
-        "include/proxy-wasm/compat.h",
-        "include/proxy-wasm/context.h",
-        "include/proxy-wasm/wasm_vm.h",
-        "include/proxy-wasm/word.h",
+    name = "lib14",
+    srcs = glob(
+        ["src/**/*.cc"],
+        exclude = [
+            "src/**/wavm*",
+            "src/**/v8*",
+        ],
+    ) + glob(["src/**/*.h"]),
+    copts = [
+        "-std=c++14",
+        "-DWITHOUT_ZLIB=1",
     ],
     deps = [
-        "@proxy_wasm_cpp_sdk//:common_lib",
+        ":include",
+        "@com_google_absl//absl/base",
+        "@com_google_absl//absl/strings",
+        "@com_google_absl//absl/types:optional",
+        "@proxy_wasm_cpp_sdk//:api_lib",
     ],
 )
 
@@ -34,7 +54,7 @@ cc_test(
     srcs = ["wasm_vm_test.cc"],
     copts = ["-std=c++17"],
     deps = [
-        ":include",
+        ":lib",
         "@com_google_googletest//:gtest",
         "@com_google_googletest//:gtest_main",
     ],
@@ -43,6 +63,7 @@ cc_test(
 cc_test(
     name = "context_test",
     srcs = ["context_test.cc"],
+    copts = ["-std=c++17"],
     deps = [
         ":include",
         "@com_google_googletest//:gtest",
@@ -51,26 +72,12 @@ cc_test(
 )
 
 # TODO: remove when dependent projects have been upgraded.
-cc_test(
-    name = "wasm_vm_14_test",
-    srcs = ["wasm_vm_test.cc"],
-    copts = ["-std=c++14"],
-    deps = [
-        ":include14",
-        "@com_google_absl//absl/base",
-        "@com_google_absl//absl/strings",
-        "@com_google_absl//absl/types:optional",
-        "@com_google_googletest//:gtest",
-        "@com_google_googletest//:gtest_main",
-    ],
-)
-
 cc_test(
     name = "context_14_test",
     srcs = ["context_test.cc"],
     copts = ["-std=c++14"],
     deps = [
-        ":include14",
+        ":include",
         "@com_google_absl//absl/base",
         "@com_google_absl//absl/strings",
         "@com_google_absl//absl/types:optional",

WORKSPACE

@@ -1,12 +1,15 @@
 workspace(name = "proxy_wasm_cpp_host")
 
 load("@bazel_tools//tools/build_defs/repo:http.bzl", "http_archive")
+load("@bazel_tools//tools/build_defs/repo:git.bzl", "git_repository")
 
 http_archive(
     name = "proxy_wasm_cpp_sdk",
     sha256 = "14f66f67e8f37ec81d28d7f5307be4407d206ac5f0daaf6d22fa5536797bcac1",
     strip_prefix = "proxy-wasm-cpp-sdk-31f1fc5b7e09f231fa532d2d296e479a113c3e10",
     urls = ["https://github.com/proxy-wasm/proxy-wasm-cpp-sdk/archive/31f1fc5b7e09f231fa532d2d296e479a113c3e10.tar.gz"],
+    patch_cmds = ["rm BUILD"],
+    build_file = '//bazel/external:proxy-wasm-cpp-sdk.BUILD',
 )
 
 http_archive(
@@ -17,6 +20,25 @@ http_archive(
     urls = ["https://github.com/abseil/abseil-cpp/archive/37dd2562ec830d547a1524bb306be313ac3f2556.tar.gz"],
 )
 
+
+# required by com_google_protobuf
+http_archive(
+    name = "bazel_skylib",
+    urls = [
+        "https://mirror.bazel.build/github.com/bazelbuild/bazel-skylib/releases/download/1.0.2/bazel-skylib-1.0.2.tar.gz",
+        "https://github.com/bazelbuild/bazel-skylib/releases/download/1.0.2/bazel-skylib-1.0.2.tar.gz",
+        ],
+    sha256 = "97e70364e9249702246c0e9444bccdc4b847bed1eb03c5a3ece4f83dfe6abc44",
+    )
+load("@bazel_skylib//:workspace.bzl", "bazel_skylib_workspace")
+bazel_skylib_workspace()
+
+git_repository(
+    name = "com_google_protobuf",
+    remote = "https://github.com/protocolbuffers/protobuf",
+    commit = "655310ca192a6e3a050e0ca0b7084a2968072260",
+)
+
 http_archive(
     name = "com_google_googletest",
     sha256 = "9dc9157a9a1551ec7a7e43daea9a694a0bb5fb8bec81235d8a1e6ef64c716dcb",

bazel/external/BUILD

@@ -0,0 +1,19 @@
+licenses(["notice"])  # Apache 2
+
+package(default_visibility = ["//visibility:public"])
+
+cc_library(
+    name = "api_lib",
+    hdrs = ["proxy_wasm_api.h"],
+)
+
+cc_library(
+    name = "common_lib",
+    hdrs = [
+        "proxy_wasm_common.h",
+        "proxy_wasm_enums.h",
+    ],
+    deps = [
+        "@com_google_protobuf//:protobuf_lite",
+    ],
+)

bazel/external/proxy-wasm-cpp-sdk.BUILD

@@ -20,7 +20,7 @@
 #include "include/proxy-wasm/null_vm_plugin.h"
 #include "include/proxy-wasm/wasm.h"
 
-#include <google/protobuf/message.h>
+#include "google/protobuf/message.h"
 
 namespace proxy_wasm {
 namespace null_plugin {
@@ -66,7 +66,7 @@ class NullPlugin : public NullVmPlugin {
   explicit NullPlugin(NullPluginRegistry *registry) : registry_(registry) {}
   NullPlugin(const NullPlugin &other) : registry_(other.registry_) {}
 
-#define _DECLARE_OVERRIDE(_t) void getFunction(absl::string_view function_name, _t *f) override;
+#define _DECLARE_OVERRIDE(_t) void getFunction(string_view function_name, _t *f) override;
   FOR_ALL_WASM_VM_EXPORTS(_DECLARE_OVERRIDE)
 #undef _DECLARE_OVERRIDE
 
@@ -107,7 +107,7 @@ class NullPlugin : public NullVmPlugin {
   uint64_t onDone(uint64_t context_id);
   void onDelete(uint64_t context_id);
 
-  null_plugin::RootContext *getRoot(absl::string_view root_id);
+  null_plugin::RootContext *getRoot(string_view root_id);
 
   void error(string_view message) { wasm_vm_->error(message); }
 

include/proxy-wasm/null_plugin.h

@@ -32,29 +32,29 @@ struct NullVm : public WasmVm {
   NullVm(const NullVm &other) : plugin_name_(other.plugin_name_) {}
 
   // WasmVm
-  absl::string_view runtime() override { return "null"; }
+  string_view runtime() override { return "null"; }
   Cloneable cloneable() override { return Cloneable::InstantiatedModule; };
   std::unique_ptr<WasmVm> clone() override;
   bool load(const std::string &code, bool allow_precompiled) override;
-  void link(absl::string_view debug_name) override;
+  void link(string_view debug_name) override;
   uint64_t getMemorySize() override;
-  absl::optional<absl::string_view> getMemory(uint64_t pointer, uint64_t size) override;
+  optional<string_view> getMemory(uint64_t pointer, uint64_t size) override;
   bool setMemory(uint64_t pointer, uint64_t size, const void *data) override;
   bool setWord(uint64_t pointer, Word data) override;
   bool getWord(uint64_t pointer, Word *data) override;
-  string_view getCustomSection(absl::string_view name) override;
+  string_view getCustomSection(string_view name) override;
   string_view getPrecompiledSectionName() override;
 
 #define _FORWARD_GET_FUNCTION(_T)                                                                  \
-  void getFunction(absl::string_view function_name, _T *f) override {                              \
+  void getFunction(string_view function_name, _T *f) override {                                    \
     plugin_->getFunction(function_name, f);                                                        \
   }
   FOR_ALL_WASM_VM_EXPORTS(_FORWARD_GET_FUNCTION)
 #undef _FORWARD_GET_FUNCTION
 
   // These are not needed for NullVm which invokes the handlers directly.
 #define _REGISTER_CALLBACK(_T)                                                                     \
-  void registerCallback(absl::string_view, absl::string_view, _T,                                  \
+  void registerCallback(string_view, string_view, _T,                                              \
                         typename ConvertFunctionTypeWordToUint32<_T>::type) override{};
   FOR_ALL_WASM_VM_IMPORTS(_REGISTER_CALLBACK)
 #undef _REGISTER_CALLBACK

include/proxy-wasm/null_vm.h

@@ -28,7 +28,7 @@ class NullVmPlugin {
   // NB: These are defined rather than declared PURE because gmock uses __LINE__ internally for
   // uniqueness, making it impossible to use FOR_ALL_WASM_VM_EXPORTS with MOCK_METHOD.
 #define _DEFINE_GET_FUNCTION(_T)                                                                   \
-  virtual void getFunction(absl::string_view, _T *f) { *f = nullptr; }
+  virtual void getFunction(string_view, _T *f) { *f = nullptr; }
   FOR_ALL_WASM_VM_EXPORTS(_DEFINE_GET_FUNCTION)
 #undef _DEFIN_GET_FUNCTIONE
 

include/proxy-wasm/null_vm_plugin.h

@@ -15,6 +15,8 @@
 
 #pragma once
 
+#include <string.h>
+
 #include <atomic>
 #include <deque>
 #include <map>
@@ -252,8 +254,7 @@ class WasmHandle : public std::enable_shared_from_this<WasmHandle> {
   std::shared_ptr<WasmBase> wasm_;
 };
 
-std::string makeVmKey(absl::string_view vm_id, absl::string_view configuration,
-                      absl::string_view code);
+std::string makeVmKey(string_view vm_id, string_view configuration, string_view code);
 
 using WasmHandleFactory = std::function<std::shared_ptr<WasmHandle>(string_view vm_id)>;
 using WasmHandleCloneFactory =

include/proxy-wasm/wasm.h

@@ -15,12 +15,14 @@
 
 #pragma once
 
+#include "include/proxy-wasm/compat.h"
+
 namespace proxy_wasm {
 namespace null_plugin {
 class RootContext;
 } // namespace null_plugin
 
-null_plugin::RootContext *nullVmGetRoot(absl::string_view root_id);
+null_plugin::RootContext *nullVmGetRoot(string_view root_id);
 
 namespace null_plugin {
 

include/proxy-wasm/wasm_api_impl.h

@@ -267,7 +267,4 @@ struct SaveRestoreContext {
   uint32_t saved_effective_context_id_;
 };
 
-// Create a new low-level WASM VM using runtime of the given type (e.g. "v8").
-std::unique_ptr<WasmVm> createWasmVm(string_view runtime);
-
 } // namespace proxy_wasm