From d7ef133e075108e89911695c5fa62ac48c19b820 Mon Sep 17 00:00:00 2001 From: Piotr Sikora Date: Tue, 8 Jun 2021 23:34:39 -0700 Subject: [PATCH 1/5] Add missing includes. Signed-off-by: Piotr Sikora --- bazel/external/proxy-wasm-cpp-sdk.BUILD | 8 +++++++- bazel/repositories.bzl | 6 +++--- include/proxy-wasm/exports.h | 3 ++- include/proxy-wasm/wasm_api_impl.h | 7 +++++++ 4 files changed, 19 insertions(+), 5 deletions(-) diff --git a/bazel/external/proxy-wasm-cpp-sdk.BUILD b/bazel/external/proxy-wasm-cpp-sdk.BUILD index ec99443c..1ac1ba71 100644 --- a/bazel/external/proxy-wasm-cpp-sdk.BUILD +++ b/bazel/external/proxy-wasm-cpp-sdk.BUILD @@ -6,7 +6,13 @@ package(default_visibility = ["//visibility:public"]) cc_library( name = "api_lib", - hdrs = ["proxy_wasm_api.h"], + hdrs = [ + "proxy_wasm_api.h", + "proxy_wasm_externs.h", + ], + deps = [ + ":common_lib", + ], ) cc_library( diff --git a/bazel/repositories.bzl b/bazel/repositories.bzl index 5c6a8b3f..85a3d418 100644 --- a/bazel/repositories.bzl +++ b/bazel/repositories.bzl @@ -17,9 +17,9 @@ load("@bazel_tools//tools/build_defs/repo:http.bzl", "http_archive") def proxy_wasm_cpp_host_repositories(): http_archive( name = "proxy_wasm_cpp_sdk", - sha256 = "b97e3e716b1f38dc601487aa0bde72490bbc82b8f3ad73f1f3e69733984955df", - strip_prefix = "proxy-wasm-cpp-sdk-956f0d500c380cc1656a2d861b7ee12c2515a664", - urls = ["https://github.com/proxy-wasm/proxy-wasm-cpp-sdk/archive/956f0d500c380cc1656a2d861b7ee12c2515a664.tar.gz"], + sha256 = "73460c9c7243ea27babe9db5e8fc646a1ccaae1faeb6e17a4b21fc46d5867a95", + strip_prefix = "proxy-wasm-cpp-sdk-b8321ec4c758e23ed831361daa55c5b88ee7e4cd", + urls = ["https://github.com/proxy-wasm/proxy-wasm-cpp-sdk/archive/b8321ec4c758e23ed831361daa55c5b88ee7e4cd.tar.gz"], ) http_archive( diff --git a/include/proxy-wasm/exports.h b/include/proxy-wasm/exports.h index 5c517176..9c6e1722 100644 --- a/include/proxy-wasm/exports.h +++ b/include/proxy-wasm/exports.h @@ -17,8 +17,9 @@ #include -#include "include/proxy-wasm/word.h" +#include "include/proxy-wasm/context.h" #include "include/proxy-wasm/wasm_vm.h" +#include "include/proxy-wasm/word.h" namespace proxy_wasm { diff --git a/include/proxy-wasm/wasm_api_impl.h b/include/proxy-wasm/wasm_api_impl.h index 78518a7d..7c32487f 100644 --- a/include/proxy-wasm/wasm_api_impl.h +++ b/include/proxy-wasm/wasm_api_impl.h @@ -15,9 +15,14 @@ #pragma once +#include "include/proxy-wasm/exports.h" +#include "include/proxy-wasm/word.h" + namespace proxy_wasm { namespace null_plugin { +#include "proxy_wasm_common.h" + #define WS(_x) Word(static_cast(_x)) #define WR(_x) Word(reinterpret_cast(_x)) @@ -274,7 +279,9 @@ inline WasmResult proxy_call_foreign_function(const char *function_name, size_t #undef WS #undef WR +#define PROXY_WASM_USE_CPP_EXTERNS #include "proxy_wasm_api.h" +#undef PROXY_WASM_USE_CPP_EXTERNS RootContext *getRoot(std::string_view root_id); Context *getContext(uint32_t context_id); From 6c79d48d45e6ed6aef3d55e12043535df8dbecda Mon Sep 17 00:00:00 2001 From: Piotr Sikora Date: Wed, 9 Jun 2021 00:49:56 -0700 Subject: [PATCH 2/5] review: remove unused proxy-wasm-cpp-sdk.BUILD. Signed-off-by: Piotr Sikora --- bazel/external/proxy-wasm-cpp-sdk.BUILD | 24 ------------------------ 1 file changed, 24 deletions(-) delete mode 100644 bazel/external/proxy-wasm-cpp-sdk.BUILD diff --git a/bazel/external/proxy-wasm-cpp-sdk.BUILD b/bazel/external/proxy-wasm-cpp-sdk.BUILD deleted file mode 100644 index ca99cf76..00000000 --- a/bazel/external/proxy-wasm-cpp-sdk.BUILD +++ /dev/null @@ -1,24 +0,0 @@ -load("@rules_cc//cc:defs.bzl", "cc_library") - -licenses(["notice"]) # Apache 2 - -package(default_visibility = ["//visibility:public"]) - -cc_library( - name = "api_lib", - hdrs = [ - "proxy_wasm_api.h", - "proxy_wasm_externs.h", - ], - deps = [ - ":common_lib", - ], -) - -cc_library( - name = "common_lib", - hdrs = [ - "proxy_wasm_common.h", - "proxy_wasm_enums.h", - ], -) From a3b8b293270f63f3e5b37c523095643733baa943 Mon Sep 17 00:00:00 2001 From: Piotr Sikora Date: Wed, 9 Jun 2021 13:22:06 -0700 Subject: [PATCH 3/5] review: backout proxy_wasm_api.h and related changes. Signed-off-by: Piotr Sikora --- bazel/repositories.bzl | 6 +++--- include/proxy-wasm/wasm_api_impl.h | 2 -- 2 files changed, 3 insertions(+), 5 deletions(-) diff --git a/bazel/repositories.bzl b/bazel/repositories.bzl index e3204916..0e46133e 100644 --- a/bazel/repositories.bzl +++ b/bazel/repositories.bzl @@ -17,9 +17,9 @@ load("@bazel_tools//tools/build_defs/repo:http.bzl", "http_archive") def proxy_wasm_cpp_host_repositories(): http_archive( name = "proxy_wasm_cpp_sdk", - sha256 = "73460c9c7243ea27babe9db5e8fc646a1ccaae1faeb6e17a4b21fc46d5867a95", - strip_prefix = "proxy-wasm-cpp-sdk-b8321ec4c758e23ed831361daa55c5b88ee7e4cd", - urls = ["https://github.com/proxy-wasm/proxy-wasm-cpp-sdk/archive/b8321ec4c758e23ed831361daa55c5b88ee7e4cd.tar.gz"], + sha256 = "5bf4568a612af6a54218ad621b456e486528c03f4112182615fd95a67b888a6d", + strip_prefix = "proxy-wasm-cpp-sdk-ea76581a70a3bd9d8a404df9cc5be5bcbe390841", + urls = ["https://github.com/proxy-wasm/proxy-wasm-cpp-sdk/archive/ea76581a70a3bd9d8a404df9cc5be5bcbe390841.tar.gz"], ) http_archive( diff --git a/include/proxy-wasm/wasm_api_impl.h b/include/proxy-wasm/wasm_api_impl.h index c4d5ac87..e7e16759 100644 --- a/include/proxy-wasm/wasm_api_impl.h +++ b/include/proxy-wasm/wasm_api_impl.h @@ -290,9 +290,7 @@ inline WasmResult proxy_call_foreign_function(const char *function_name, size_t #undef WS #undef WR -#define PROXY_WASM_USE_CPP_EXTERNS #include "proxy_wasm_api.h" -#undef PROXY_WASM_USE_CPP_EXTERNS RootContext *getRoot(std::string_view root_id); Context *getContext(uint32_t context_id); From 3318c9750d9faa001d20e5bc0105038821e9b787 Mon Sep 17 00:00:00 2001 From: Piotr Sikora Date: Wed, 9 Jun 2021 13:22:37 -0700 Subject: [PATCH 4/5] review: include proxy_wasm_enums.h in a place where it's needed. Signed-off-by: Piotr Sikora --- include/proxy-wasm/null_plugin.h | 9 +-------- include/proxy-wasm/wasm_api_impl.h | 1 + 2 files changed, 2 insertions(+), 8 deletions(-) diff --git a/include/proxy-wasm/null_plugin.h b/include/proxy-wasm/null_plugin.h index 931417f9..f059c32b 100644 --- a/include/proxy-wasm/null_plugin.h +++ b/include/proxy-wasm/null_plugin.h @@ -17,16 +17,9 @@ #include +#include "include/proxy-wasm/exports.h" #include "include/proxy-wasm/null_vm_plugin.h" #include "include/proxy-wasm/wasm.h" -#include "include/proxy-wasm/exports.h" - -namespace proxy_wasm { -namespace null_plugin { -#include "proxy_wasm_enums.h" -} // namespace null_plugin -} // namespace proxy_wasm - #include "include/proxy-wasm/wasm_api_impl.h" namespace proxy_wasm { diff --git a/include/proxy-wasm/wasm_api_impl.h b/include/proxy-wasm/wasm_api_impl.h index e7e16759..dd318c9a 100644 --- a/include/proxy-wasm/wasm_api_impl.h +++ b/include/proxy-wasm/wasm_api_impl.h @@ -32,6 +32,7 @@ namespace proxy_wasm { namespace null_plugin { +#include "proxy_wasm_enums.h" #include "proxy_wasm_common.h" #define WS(_x) Word(static_cast(_x)) From 87ff4bc11cc51e10766b36e9fc9440b053723e16 Mon Sep 17 00:00:00 2001 From: Piotr Sikora Date: Wed, 9 Jun 2021 15:52:01 -0700 Subject: [PATCH 5/5] review: update to the merged commit. Signed-off-by: Piotr Sikora --- bazel/repositories.bzl | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/bazel/repositories.bzl b/bazel/repositories.bzl index 0e46133e..1e861df7 100644 --- a/bazel/repositories.bzl +++ b/bazel/repositories.bzl @@ -17,9 +17,9 @@ load("@bazel_tools//tools/build_defs/repo:http.bzl", "http_archive") def proxy_wasm_cpp_host_repositories(): http_archive( name = "proxy_wasm_cpp_sdk", - sha256 = "5bf4568a612af6a54218ad621b456e486528c03f4112182615fd95a67b888a6d", - strip_prefix = "proxy-wasm-cpp-sdk-ea76581a70a3bd9d8a404df9cc5be5bcbe390841", - urls = ["https://github.com/proxy-wasm/proxy-wasm-cpp-sdk/archive/ea76581a70a3bd9d8a404df9cc5be5bcbe390841.tar.gz"], + sha256 = "489768fb95ede507543ee5982610b541a2c5b57216695a9e5c2eb8c83c9d20a3", + strip_prefix = "proxy-wasm-cpp-sdk-9af5ac0145a8790f62ca501c43f6fa1ea24d2d93", + urls = ["https://github.com/proxy-wasm/proxy-wasm-cpp-sdk/archive/9af5ac0145a8790f62ca501c43f6fa1ea24d2d93.tar.gz"], ) http_archive(