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

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

Author: q82419

.github/workflows/cpp.yml

@@ -79,6 +79,9 @@ jobs:
         - name: 'WAMR on macOS'
           runtime: 'wamr'
           os: macos-11
+        - name: 'WasmEdge on Linux'
+          runtime: 'wasmedge'
+          os: ubuntu-20.04
         - name: 'Wasmtime on Linux'
           runtime: 'wasmtime'
           os: ubuntu-20.04

BUILD

@@ -3,6 +3,7 @@ load(
     "@proxy_wasm_cpp_host//bazel:select.bzl",
     "proxy_wasm_select_runtime_v8",
     "proxy_wasm_select_runtime_wamr",
+    "proxy_wasm_select_runtime_wasmedge",
     "proxy_wasm_select_runtime_wasmtime",
     "proxy_wasm_select_runtime_wavm",
 )
@@ -118,6 +119,25 @@ 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"],
+    defines = ["PROXY_WASM_HAS_RUNTIME_WASMEDGE"],
+    linkopts = [
+        "-lrt",
+        "-ldl",
+    ],
+    deps = [
+        ":wasm_vm_headers",
+        "//external:wasmedge",
+    ],
+)
+
 cc_library(
     name = "wasmtime_lib",
     srcs = [
@@ -160,6 +180,8 @@ cc_library(
         [":v8_lib"],
     ) + proxy_wasm_select_runtime_wamr(
         [":wamr_lib"],
+    ) + proxy_wasm_select_runtime_wasmedge(
+        [":wasmedge_lib"],
     ) + proxy_wasm_select_runtime_wasmtime(
         [":wasmtime_lib"],
     ) + proxy_wasm_select_runtime_wavm(

bazel/BUILD

@@ -10,6 +10,11 @@ config_setting(
     values = {"define": "runtime=wamr"},
 )
 
+config_setting(
+    name = "runtime_wasmedge",
+    values = {"define": "runtime=wasmedge"},
+)
+
 config_setting(
     name = "runtime_wasmtime",
     values = {"define": "runtime=wasmtime"},

bazel/external/wasmedge.BUILD

@@ -0,0 +1,12 @@
+load("@rules_cc//cc:defs.bzl", "cc_library")
+
+licenses(["notice"])  # Apache 2
+
+package(default_visibility = ["//visibility:public"])
+
+cc_library(
+    name = "wasmedge_lib",
+    srcs = ["lib64/libwasmedge_c.so"],
+    hdrs = ["include/wasmedge.h"],
+    strip_include_prefix = "include/",
+)

bazel/repositories.bzl

@@ -184,3 +184,16 @@ def proxy_wasm_cpp_host_repositories():
         ],
         sha256 = "c6966ec828da198c5d9adbaa94c05e3a1c7f21bd012a0b29ba8ddbccb2c93b0d",
     )
+
+    http_archive(
+        name = "com_github_wasmedge_wasmedge",
+        build_file = "@proxy_wasm_cpp_host//bazel/external:wasmedge.BUILD",
+        sha256 = "48c15893f036b86b0f28d96e6269a4ac75d9697a30c44b171e254c83409afb30",
+        strip_prefix = "WasmEdge-0.8.2-Linux",
+        url = "https://github.com/WasmEdge/WasmEdge/releases/download/0.8.2/WasmEdge-0.8.2-manylinux2014_x86_64.tar.gz",
+    )
+
+    native.bind(
+        name = "wasmedge",
+        actual = "@com_github_wasmedge_wasmedge//:wasmedge_lib",
+    )

bazel/select.bzl

@@ -24,6 +24,12 @@ def proxy_wasm_select_runtime_wamr(xs):
         "//conditions:default": [],
     })
 
+def proxy_wasm_select_runtime_wasmedge(xs):
+    return select({
+        "@proxy_wasm_cpp_host//bazel:runtime_wasmedge": xs,
+        "//conditions:default": [],
+    })
+
 def proxy_wasm_select_runtime_wasmtime(xs):
     return select({
         "@proxy_wasm_cpp_host//bazel:runtime_wasmtime": xs,

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,30 @@
+// 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