add wasmtime runtime

Signed-off-by: mathetake <[email protected]>

Author: mathetake

BUILD

@@ -1,18 +1,9 @@
+load("//:variables.bzl", "COPTS", "LINKOPTS")
+
 licenses(["notice"])  # Apache 2
 
 package(default_visibility = ["//visibility:public"])
 
-COPTS = select({
-    "@bazel_tools//src/conditions:windows": [
-        "/std:c++17",
-        "-DWITHOUT_ZLIB",
-    ],
-    "//conditions:default": [
-        "-std=c++17",
-        "-DWITHOUT_ZLIB",
-    ],
-})
-
 cc_library(
     name = "include",
     hdrs = glob(["include/proxy-wasm/**/*.h"]),
@@ -28,6 +19,7 @@ cc_library(
         exclude = [
             "src/**/wavm*",
             "src/**/v8*",
+            "src/**/wasmtime*",
         ],
     ) + glob(["src/**/*.h"]),
     copts = COPTS,
@@ -39,24 +31,23 @@ cc_library(
     ],
 )
 
-cc_test(
-    name = "wasm_vm_test",
-    srcs = ["wasm_vm_test.cc"],
-    copts = COPTS,
-    deps = [
-        ":lib",
-        "@com_google_googletest//:gtest",
-        "@com_google_googletest//:gtest_main",
-    ],
-)
-
-cc_test(
-    name = "context_test",
-    srcs = ["context_test.cc"],
+cc_library(
+    name = "lib_test",
+    srcs = glob(
+        ["src/**/*.cc"],
+        exclude = [
+            # TODO: test WAVM, v8 here
+            "src/**/wavm*",
+            "src/**/v8*",
+        ],
+    ) + glob(["src/**/*.h"]),
     copts = COPTS,
+    linkopts = LINKOPTS,
     deps = [
         ":include",
-        "@com_google_googletest//:gtest",
-        "@com_google_googletest//:gtest_main",
+        "@boringssl//:crypto",
+        "@com_google_protobuf//:protobuf_lite",
+        "@proxy_wasm_cpp_sdk//:api_lib",
+        "@wasmtime//:c_api",
     ],
 )

WORKSPACE

@@ -51,3 +51,12 @@ http_archive(
     strip_prefix = "googletest-release-1.10.0",
     urls = ["https://github.com/google/googletest/archive/release-1.10.0.tar.gz"],
 )
+
+http_archive(
+    # TODO: use non-prebuild library, or download separate archives for each architecture
+    name = "wasmtime",
+    build_file = "//bazel/external:wasmtime.BUILD",
+    sha256 = "fdbd6dbb58d15b3566abcc2c62ab18c348027e1620bc2ba0219017999504000e",
+    strip_prefix = "wasmtime-v0.20.0-x86_64-linux-c-api",
+    url = "https://github.com/bytecodealliance/wasmtime/releases/download/v0.20.0/wasmtime-v0.20.0-x86_64-linux-c-api.tar.xz",
+)

bazel/external/wasmtime.BUILD

@@ -0,0 +1,17 @@
+licenses(["notice"])  # Apache 2
+
+package(default_visibility = ["//visibility:public"])
+
+cc_library(
+    name = "c_api",
+    srcs = glob([
+        "include/*.h",
+        "lib/*.a",
+    ]),
+    hdrs = [
+        "include/wasm.h",
+        "include/wasmtime.h",
+    ],
+    include_prefix = "wasmtime",
+    includes = ["include/"],
+)

include/proxy-wasm/wasmtime.h

@@ -0,0 +1,24 @@
+// Copyright 2016-2019 Envoy Project Authors
+// Copyright 2020 Google LLC
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//      http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+#pragma once
+
+#include "include/proxy-wasm/wasm_vm.h"
+
+namespace proxy_wasm {
+
+std::unique_ptr<WasmVm> createWasmtimeVm();
+
+} // namespace proxy_wasm

src/common/c_smart_ptr.h

@@ -0,0 +1,31 @@
+// Copyright 2016-2019 Envoy Project Authors
+// Copyright 2020 Google LLC
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//      http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+#pragma once
+
+#include <memory>
+
+namespace proxy_wasm {
+namespace common {
+
+template <typename T, void (*deleter)(T *)>
+class CSmartPtr : public std::unique_ptr<T, void (*)(T *)> {
+public:
+  CSmartPtr() : std::unique_ptr<T, void (*)(T *)>(nullptr, deleter) {}
+  CSmartPtr(T *object) : std::unique_ptr<T, void (*)(T *)>(object, deleter) {}
+};
+
+} // namespace common
+} // namespace proxy_wasm

src/v8/v8.cc

@@ -268,11 +268,10 @@ bool V8::load(const std::string &code, bool allow_precompiled) {
 
 std::unique_ptr<WasmVm> V8::clone() {
   assert(shared_module_ != nullptr);
-
   auto clone = std::make_unique<V8>();
   clone->integration().reset(integration()->clone());
-  clone->store_ = wasm::Store::make(engine());
 
+  clone->store_ = wasm::Store::make(engine());
   clone->module_ = wasm::Module::obtain(clone->store_.get(), shared_module_.get());
 
   return clone;

src/wasmtime/pointers.h

@@ -0,0 +1,37 @@
+
+// Copyright 2016-2019 Envoy Project Authors
+// Copyright 2020 Google LLC
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//      http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+#include "src/common/c_smart_ptr.h"
+#include "wasmtime/include/wasm.h"
+#include "wasmtime/include/wasmtime.h"
+
+namespace proxy_wasm {
+namespace wasmtime {
+
+using WasmEnginePtr = common::CSmartPtr<wasm_engine_t, wasm_engine_delete>;
+using WasmFuncPtr = common::CSmartPtr<wasm_func_t, wasm_func_delete>;
+using WasmStorePtr = common::CSmartPtr<wasm_store_t, wasm_store_delete>;
+using WasmModulePtr = common::CSmartPtr<wasm_module_t, wasm_module_delete>;
+using WasmSharedModulePtr = common::CSmartPtr<wasm_shared_module_t, wasm_shared_module_delete>;
+using WasmMemoryPtr = common::CSmartPtr<wasm_memory_t, wasm_memory_delete>;
+using WasmTablePtr = common::CSmartPtr<wasm_table_t, wasm_table_delete>;
+using WasmInstancePtr = common::CSmartPtr<wasm_instance_t, wasm_instance_delete>;
+using WasmFunctypePtr = common::CSmartPtr<wasm_functype_t, wasm_functype_delete>;
+using WasmTrapPtr = common::CSmartPtr<wasm_trap_t, wasm_trap_delete>;
+
+} // namespace wasmtime
+
+} // namespace proxy_wasm