Skip to content
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.

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

Preparatory commits from #801 #836

Merged
merged 6 commits into from
Apr 15, 2020
Merged

Preparatory commits from #801 #836

merged 6 commits into from
Apr 15, 2020

Conversation

daviddrysdale
Copy link
Contributor

This PR has the preparatory commits of #801 to reduce the (large) amount of merging that's going to be needed for that PR.

Checklist

  • Pull request affects core Oak functionality (e.g. runtime, SDK, ABI)
    • I have written tests that cover the code changes.
    • I have checked that these tests are run by Cloudbuild
    • I have updated documentation accordingly.
    • I have raised an issue to
      cover any TODOs and/or unfinished work.
  • Pull request includes prototype/experimental work that is under
    construction.

If any kind of failure occurs when proxying a gRPC method invocation,
ensure that an error response is sent on the invocation's response
channel to prevent the caller blocking forever.
@@ -37,39 +37,40 @@ std::string DataFrom(const std::string& filename) {

TEST(WasmNode, MalformedFailure) {
// No magic.
ASSERT_EQ(nullptr, WasmNode::Create(nullptr, "test", "", "oak_main"));
ASSERT_EQ(nullptr, WasmNode::Create(nullptr, "test", 0, "", "oak_main"));
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Maybe create a constant to avoid this magic number.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Left as-is as it's due to be deleted soon.

@@ -831,12 +890,15 @@ impl super::Node for WasmNode {
.name(self.to_string())
.spawn(move || {
let pretty_name = pretty_name_for_thread(&thread::current());
let wasi_stub = WasiStub {};
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Suggested change
let wasi_stub = WasiStub {};
let wasi_stub = WasiStub;

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Done.

Equivalent to the C++ placeholders in oak/server/wasm_node.cc
added in #529.
@daviddrysdale daviddrysdale merged commit c66093d into project-oak:master Apr 15, 2020
@daviddrysdale daviddrysdale deleted the rust-link-prep branch April 15, 2020 06:33
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants