Skip to content

export pair marshalling #60

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Sep 10, 2020
Merged

export pair marshalling #60

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
fccae2c
export pair marshalling
kyessenov Sep 10, 2020
6e3f7a3
fix?
kyessenov Sep 10, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 5 additions & 0 deletions include/proxy-wasm/exports.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,11 @@ extern thread_local ContextBase *current_context_;

namespace exports {

template <typename Pairs> size_t pairsSize(const Pairs &result);
template <typename Pairs> void marshalPairs(const Pairs &result, char *buffer);
template <typename Pairs>
bool getPairs(ContextBase *context, const Pairs &result, uint64_t ptr_ptr, uint64_t size_ptr);

// ABI functions exported from envoy to wasm.

Word get_configuration(void *raw_context, Word address, Word size);
Expand Down
4 changes: 2 additions & 2 deletions src/exports.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -67,6 +67,8 @@ Pairs toPairs(std::string_view buffer) {
return result;
}

} // namespace

template <typename Pairs> size_t pairsSize(const Pairs &result) {
size_t size = 4; // number of headers
for (auto &p : result) {
Expand Down Expand Up @@ -115,8 +117,6 @@ bool getPairs(ContextBase *context, const Pairs &result, uint64_t ptr_ptr, uint6
return true;
}

} // namespace

// General ABI.

Word set_property(void *raw_context, Word key_ptr, Word key_size, Word value_ptr, Word value_size) {
Expand Down