This repository has been archived by the owner on Nov 15, 2023. It is now read-only.
Fix timer panics in the wasm light client #4561
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
… ashley-polkadot-wasm
tomaka
reviewed
Feb 4, 2020
tomaka
reviewed
Feb 4, 2020
|
On ice as we're waiting for libp2p/rust-libp2p#1414. |
expenses
removed
the
A3-in_progress
|
Why not merge this? It's basically ready. |
amaury1093
approved these changes
Feb 6, 2020
…:Instant doesnt impl it so just revert the transaction pool to master
|
@tomaka it say that you've still got requested changes apparently. |
tomaka
reviewed
Feb 7, 2020
client/informant/Cargo.toml
Outdated
| @@ -16,3 +16,4 @@ sc-network = { version = "0.8", path = "../network" } | |||
| sc-service = { version = "0.8", default-features = false, path = "../service" } | |||
| sp-blockchain = { version = "2.0.0", path = "../../primitives/blockchain" } | |||
| sp-runtime = { version = "2.0.0", path = "../../primitives/runtime" } | |||
| parity-util-mem = { version = "0.5.1", default-features = false, features = ["primitive-types"] } | |||
There was a problem hiding this comment.
Nit: could you order alphabetically?
tomaka
approved these changes
Feb 7, 2020
…m_timer::Instant doesnt impl it so just revert the transaction pool to master" This reverts commit baa4ffc.
tomaka
reviewed
Feb 10, 2020
| @@ -982,6 +983,10 @@ ServiceBuilder< | |||
| "disk_read_per_sec" => info.usage.as_ref().map(|usage| usage.io.bytes_read).unwrap_or(0), | |||
| "disk_write_per_sec" => info.usage.as_ref().map(|usage| usage.io.bytes_written).unwrap_or(0), | |||
| ); | |||
| #[cfg(not(target_os = "unknown"))] | |||
There was a problem hiding this comment.
Why is that now needed?
Also, why not merge the PR when I approved it, instead of sneaking in more and more amendments that need a re-review?
There was a problem hiding this comment.
Because if I did that, it would have panicked when you started the light client. We now need to do it this way because you can't call parity_util_mem::malloc_size on wasm because wasm_timer::wasm::Instant doesn't impl MallocSizeOf.
tomaka
approved these changes
Feb 10, 2020
Sign up for free
to subscribe to this conversation on GitHub.
Already have an account?
Sign in.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Last change to get light clients to work 🎉! This PR relies on @tomaka 's wasm-timer crate, but only for replacements for
std::time::Instantandstd::time::SystemTime.Waiting on async-rs/futures-timer#51.