Skip to content

Commit c5513c0

Browse files
jplevyakjplevyak
authored
Small changes for upstreaming. (#1)
Signed-off-by: John Plevyak <[email protected]>
1 parent a30aaee commit c5513c0

10 files changed

+318
-318
lines changed

‎.clang-format

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ Language: Cpp
33
ColumnLimit: 100
44
AccessModifierOffset: -2
55
DerivePointerAlignment: false
6-
PointerAlignment: Left
6+
PointerAlignment: Right
77
SortIncludes: false
88
...
99

‎BUILD

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,16 @@
11
licenses(["notice"]) # Apache 2
22

3+
package(default_visibility = ["//visibility:public"])
4+
35
cc_library(
46
name = "api_lib",
57
hdrs = ["proxy_wasm_api.h"],
6-
visibility = ["//visibility:public"],
78
)
89

910
cc_library(
1011
name = "common_lib",
11-
hdrs = ["proxy_wasm_common.h"],
12-
visibility = ["//visibility:public"],
12+
hdrs = [
13+
"proxy_wasm_common.h",
14+
"proxy_wasm_enums.h",
15+
],
1316
)

‎Makefile.base

Lines changed: 3 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,11 @@
1-
ifdef DOCKER_SDK
2-
CPP_API:=${DOCKER_SDK}
3-
else
4-
CPP_API:=$(shell git rev-parse --show-toplevel)/api/wasm/cpp
5-
endif
6-
71
ifdef NO_CONTEXT
82
CPP_CONTEXT_LIB =
93
else
10-
CPP_CONTEXT_LIB = ${CPP_API}/proxy_wasm_intrinsics.cc
4+
CPP_CONTEXT_LIB = ${PROXY_WASM_CPP_SDK}/proxy_wasm_intrinsics.cc
115
endif
126

13-
%.wasm %.wat: %.cc ${CPP_API}/proxy_wasm_intrinsics.h ${CPP_API}/proxy_wasm_enums.h ${CPP_API}/proxy_wasm_externs.h ${CPP_API}/proxy_wasm_api.h ${CPP_API}/proxy_wasm_intrinsics.js ${CPP_CONTEXT_LIB}
14-
em++ -s STANDALONE_WASM=1 -s EMIT_EMSCRIPTEN_METADATA=1 -s EXPORTED_FUNCTIONS=['_malloc'] --std=c++17 -O3 -flto -s WASM_OBJECT_FILES=0 --llvm-lto 1 -I${CPP_API} -I/usr/local/include --js-library ${CPP_API}/proxy_wasm_intrinsics.js $*.cc ${CPP_API}/proxy_wasm_intrinsics.pb.cc ${CPP_CONTEXT_LIB} ${CPP_API}/libprotobuf.a -o $*.wasm
7+
%.wasm: %.cc ${PROXY_WASM_CPP_SDK}/proxy_wasm_intrinsics.h ${PROXY_WASM_CPP_SDK}/proxy_wasm_enums.h ${PROXY_WASM_CPP_SDK}/proxy_wasm_externs.h ${PROXY_WASM_CPP_SDK}/proxy_wasm_api.h ${PROXY_WASM_CPP_SDK}/proxy_wasm_intrinsics.js ${CPP_CONTEXT_LIB}
8+
em++ -s STANDALONE_WASM=1 -s EMIT_EMSCRIPTEN_METADATA=1 -s EXPORTED_FUNCTIONS=['_malloc'] --std=c++17 -O3 -flto -s WASM_OBJECT_FILES=0 --llvm-lto 1 -I${PROXY_WASM_CPP_SDK} -I/usr/local/include --js-library ${PROXY_WASM_CPP_SDK}/proxy_wasm_intrinsics.js $*.cc ${PROXY_WASM_CPP_SDK}/proxy_wasm_intrinsics.pb.cc ${CPP_CONTEXT_LIB} ${PROXY_WASM_CPP_SDK}/libprotobuf.a -o $*.wasm
159

1610
clean:
1711
rm *.wasm

‎Makefile.base_lite

Lines changed: 3 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,11 @@
1-
ifdef DOCKER_SDK
2-
CPP_API:=${DOCKER_SDK}
3-
else
4-
CPP_API:=$(shell git rev-parse --show-toplevel)/api/wasm/cpp
5-
endif
6-
71
ifdef NO_CONTEXT
82
CPP_CONTEXT_LIB =
93
else
10-
CPP_CONTEXT_LIB = ${CPP_API}/proxy_wasm_intrinsics.cc
4+
CPP_CONTEXT_LIB = ${PROXY_WASM_CPP_SDK}/proxy_wasm_intrinsics.cc
115
endif
126

13-
%.wasm %.wat: %.cc ${CPP_API}/proxy_wasm_intrinsics.h ${CPP_API}/proxy_wasm_enums.h ${CPP_API}/proxy_wasm_externs.h ${CPP_API}/proxy_wasm_api.h ${CPP_API}/proxy_wasm_intrinsics.js ${CPP_CONTEXT_LIB}
14-
em++ -s STANDALONE_WASM=1 -s EMIT_EMSCRIPTEN_METADATA=1 -s EXPORTED_FUNCTIONS=['_malloc'] --std=c++17 -O3 -flto -s WASM_OBJECT_FILES=0 --llvm-lto 1 -DPROXY_WASM_PROTOBUF_LITE=1 -I${CPP_API} -I/usr/local/include --js-library ${CPP_API}/proxy_wasm_intrinsics.js $*.cc ${CPP_API}/proxy_wasm_intrinsics_lite.pb.cc ${CPP_API}/struct_lite.pb.cc ${CPP_CONTEXT_LIB} ${CPP_API}/libprotobuf-lite.a -o $*.wasm
7+
%.wasm %.wat: %.cc ${PROXY_WASM_CPP_SDK}/proxy_wasm_intrinsics.h ${PROXY_WASM_CPP_SDK}/proxy_wasm_enums.h ${PROXY_WASM_CPP_SDK}/proxy_wasm_externs.h ${PROXY_WASM_CPP_SDK}/proxy_wasm_api.h ${PROXY_WASM_CPP_SDK}/proxy_wasm_intrinsics.js ${CPP_CONTEXT_LIB}
8+
em++ -s STANDALONE_WASM=1 -s EMIT_EMSCRIPTEN_METADATA=1 -s EXPORTED_FUNCTIONS=['_malloc'] --std=c++17 -O3 -flto -s WASM_OBJECT_FILES=0 --llvm-lto 1 -DPROXY_WASM_PROTOBUF_LITE=1 -I${PROXY_WASM_CPP_SDK} -I/usr/local/include --js-library ${PROXY_WASM_CPP_SDK}/proxy_wasm_intrinsics.js $*.cc ${PROXY_WASM_CPP_SDK}/proxy_wasm_intrinsics_lite.pb.cc ${PROXY_WASM_CPP_SDK}/struct_lite.pb.cc ${CPP_CONTEXT_LIB} ${PROXY_WASM_CPP_SDK}/libprotobuf-lite.a -o $*.wasm
159

1610
clean:
1711
rm *.wasm

‎contrib/proxy_expr.h

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -16,14 +16,14 @@
1616
*/
1717

1818
// Create an expression using a foreign function call.
19-
inline WasmResult createExpression(StringView expr, uint32_t* token) {
19+
inline WasmResult createExpression(StringView expr, uint32_t *token) {
2020
std::string function = "expr_create";
21-
char* out = nullptr;
21+
char *out = nullptr;
2222
size_t out_size = 0;
2323
auto result = proxy_call_foreign_function(function.data(), function.size(), expr.data(),
2424
expr.size(), &out, &out_size);
2525
if (result == WasmResult::Ok && out_size == sizeof(uint32_t)) {
26-
*token = *reinterpret_cast<uint32_t*>(out);
26+
*token = *reinterpret_cast<uint32_t *>(out);
2727
}
2828
::free(out);
2929
return result;
@@ -32,11 +32,11 @@ inline WasmResult createExpression(StringView expr, uint32_t* token) {
3232
// Evaluate an expression using an expression token.
3333
inline Optional<WasmDataPtr> exprEvaluate(uint32_t token) {
3434
std::string function = "expr_evaluate";
35-
char* out = nullptr;
35+
char *out = nullptr;
3636
size_t out_size = 0;
3737
auto result = proxy_call_foreign_function(function.data(), function.size(),
38-
reinterpret_cast<const char*>(&token), sizeof(uint32_t),
39-
&out, &out_size);
38+
reinterpret_cast<const char *>(&token),
39+
sizeof(uint32_t), &out, &out_size);
4040
if (result != WasmResult::Ok) {
4141
return {};
4242
}
@@ -46,25 +46,25 @@ inline Optional<WasmDataPtr> exprEvaluate(uint32_t token) {
4646
// Delete an expression using an expression token.
4747
inline WasmResult exprDelete(uint32_t token) {
4848
std::string function = "expr_delete";
49-
char* out = nullptr;
49+
char *out = nullptr;
5050
size_t out_size = 0;
5151
auto result = proxy_call_foreign_function(function.data(), function.size(),
52-
reinterpret_cast<const char*>(&token), sizeof(uint32_t),
53-
&out, &out_size);
52+
reinterpret_cast<const char *>(&token),
53+
sizeof(uint32_t), &out, &out_size);
5454
::free(out);
5555
return result;
5656
}
5757

58-
template <typename T> inline bool evaluateExpression(uint32_t token, T* out) {
58+
template <typename T> inline bool evaluateExpression(uint32_t token, T *out) {
5959
auto buf = exprEvaluate(token);
6060
if (!buf.has_value() || buf.value()->size() != sizeof(T)) {
6161
return false;
6262
}
63-
*out = *reinterpret_cast<const T*>(buf.value()->data());
63+
*out = *reinterpret_cast<const T *>(buf.value()->data());
6464
return true;
6565
}
6666

67-
template <> inline bool evaluateExpression<std::string>(uint32_t token, std::string* out) {
67+
template <> inline bool evaluateExpression<std::string>(uint32_t token, std::string *out) {
6868
auto buf = exprEvaluate(token);
6969
if (!buf.has_value()) {
7070
return false;
@@ -74,7 +74,7 @@ template <> inline bool evaluateExpression<std::string>(uint32_t token, std::str
7474
}
7575

7676
// Specialization for message types (including struct value for lists and maps)
77-
template <typename T> inline bool evaluateMessage(uint32_t token, T* value_ptr) {
77+
template <typename T> inline bool evaluateMessage(uint32_t token, T *value_ptr) {
7878
auto buf = exprEvaluate(token);
7979
if (!buf.has_value()) {
8080
return false;

0 commit comments

Comments
 (0)