WasmEdge: Add the WasmEdge runtime supporting for WasmEdge-0.8.2.

Signed-off-by: YiYing He <[email protected]>

Author: q82419

.github/workflows/cpp.yml

@@ -65,7 +65,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        runtime: ["wamr", "wasmtime", "wavm"]
+        runtime: ["wamr", "wasmtime", "wavm", "WasmEdge"]
 
     steps:
     - uses: actions/checkout@v2

BUILD

@@ -5,6 +5,7 @@ load(
     "proxy_wasm_select_runtime_wamr",
     "proxy_wasm_select_runtime_wasmtime",
     "proxy_wasm_select_runtime_wavm",
+    "proxy_wasm_select_runtime_wasmedge",
 )
 
 licenses(["notice"])  # Apache 2
@@ -145,6 +146,22 @@ cc_library(
     ],
 )
 
+cc_library(
+    name = "wasmedge_lib",
+    srcs = [
+        "src/common/types.h",
+        "src/wasmedge/types.h",
+        "src/wasmedge/wasmedge.cc",
+    ],
+    hdrs = ["include/proxy-wasm/wasmedge.h"],
+    linkopts = ["-lrt", "-ldl"],
+    defines = ["PROXY_WASM_HAS_RUNTIME_WASMEDGE"],
+    deps = [
+        ":wasm_vm_headers",
+        "//external:wasmedge",
+    ],
+)
+
 cc_library(
     name = "lib",
     deps = [
@@ -158,5 +175,7 @@ cc_library(
         [":wasmtime_lib"],
     ) + proxy_wasm_select_runtime_wavm(
         [":wavm_lib"],
+    ) + proxy_wasm_select_runtime_wasmedge(
+        [":wasmedge_lib"],
     ),
 )

bazel/BUILD

@@ -17,3 +17,8 @@ config_setting(
     name = "runtime_wavm",
     values = {"define": "runtime=wavm"},
 )
+
+config_setting(
+    name = "runtime_wasmedge",
+    values = {"define": "runtime=wasmedge"},
+)

bazel/external/wasmedge.BUILD

@@ -0,0 +1,27 @@
+load("@rules_foreign_cc//foreign_cc:defs.bzl", "cmake")
+
+licenses(["notice"])  # Apache 2
+
+package(default_visibility = ["//visibility:public"])
+
+filegroup(
+    name = "srcs",
+    srcs = glob(["**"]),
+)
+
+cmake(
+    name = "wasmedge_lib",
+    cache_entries = {
+        "CMAKE_BUILD_TYPE": "Release",
+        "WASMEDGE_BUILD_AOT_RUNTIME": "OFF",
+        "WASMEDGE_BUILD_SHARED_LIB": "OFF",
+        "WASMEDGE_BUILD_STATIC_LIB": "ON",
+        "WASMEDGE_BUILD_TOOLS": "OFF",
+        "WASMEDGE_FORCE_DISABLE_LTO": "ON",
+    },
+    generate_args = ["-GNinja"],
+    lib_source = ":srcs",
+    out_static_libs = [
+        "libwasmedge_c.a",
+    ],
+)

bazel/repositories.bzl

@@ -107,6 +107,19 @@ def proxy_wasm_cpp_host_repositories():
         url = "https://github.com/WAVM/WAVM/archive/93c3ad73e2938f19c8bb26d4f456b39d6bc4ca01.tar.gz",
     )
 
+    http_archive(
+        name = "com_github_wasmedge_wasmedge",
+        build_file = "@proxy_wasm_cpp_host//bazel/external:wasmedge.BUILD",
+        sha256 = "d21fac6e213b438371d6ba12308bbc3bef5842f8a89d9965874a5785c4f970fc",
+        strip_prefix = "WasmEdge-0.8.2",
+        url = "https://github.com/WasmEdge/WasmEdge/archive/0.8.2.tar.gz",
+    )
+
+    native.bind(
+        name = "wasmedge",
+        actual = "@com_github_wasmedge_wasmedge//:wasmedge_lib",
+    )
+
     native.bind(
         name = "wavm",
         actual = "@com_github_wavm_wavm//:wavm_lib",

bazel/select.bzl

@@ -35,3 +35,9 @@ def proxy_wasm_select_runtime_wavm(xs):
         "@proxy_wasm_cpp_host//bazel:runtime_wavm": xs,
         "//conditions:default": [],
     })
+
+def proxy_wasm_select_runtime_wasmedge(xs):
+    return select({
+        "@proxy_wasm_cpp_host//bazel:runtime_wasmedge": xs,
+        "//conditions:default": [],
+    })

include/proxy-wasm/wasmedge.h

@@ -0,0 +1,26 @@
+// 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>
+
+#include "include/proxy-wasm/wasm_vm.h"
+
+namespace proxy_wasm {
+
+std::unique_ptr<WasmVm> createWasmEdgeVm();
+
+} // namespace proxy_wasm

src/wasmedge/types.h

@@ -0,0 +1,34 @@
+// 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/types.h"
+#include "wasmedge.h"
+
+namespace proxy_wasm {
+namespace WasmEdge {
+
+using WasmEdgeStorePtr =
+    common::CSmartPtr<WasmEdge_StoreContext, WasmEdge_StoreDelete>;
+using WasmEdgeVMPtr = common::CSmartPtr<WasmEdge_VMContext, WasmEdge_VMDelete>;
+using WasmEdgeLoaderPtr =
+    common::CSmartPtr<WasmEdge_LoaderContext, WasmEdge_LoaderDelete>;
+using WasmEdgeValidatorPtr =
+    common::CSmartPtr<WasmEdge_ValidatorContext, WasmEdge_ValidatorDelete>;
+using WasmEdgeInterpreterPtr =
+    common::CSmartPtr<WasmEdge_InterpreterContext, WasmEdge_InterpreterDelete>;
+using WasmEdgeASTModulePtr =
+    common::CSmartPtr<WasmEdge_ASTModuleContext, WasmEdge_ASTModuleDelete>;
+
+} // namespace WasmEdge
+} // namespace proxy_wasm