From e9b627cab8e8168da5e24d2bcca6f13adab4b953 Mon Sep 17 00:00:00 2001 From: bunnie Date: Fri, 13 May 2022 15:09:45 +0800 Subject: [PATCH] update release notes, clean up Cargo.toml, smoltcp to 0.8.1 smoltcp gave us a patch for our smoltcp issues! thank you @dirbaio! --- Cargo.lock | 15 +++++++++++++-- RELEASE-v0.9.md | 3 ++- services/net/Cargo.toml | 19 ++++++------------- services/net/src/main.rs | 12 ------------ 4 files changed, 21 insertions(+), 28 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index cf43c7481..597a2b327 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -2640,6 +2640,7 @@ dependencies = [ "spectrum-analyzer", "spinor", "susres", + "threadpool", "ticktimer-server", "trng", "tts-frontend", @@ -2670,8 +2671,9 @@ checksum = "fe0f37c9e8f3c5a4a66ad655a93c74daac4ad00c441533bf5c6e7990bb42604e" [[package]] name = "smoltcp" -version = "0.8.0" -source = "git+https://github.com/smoltcp-rs/smoltcp.git?rev=35e833e33dfd3e4efc3eb7d5de06bec17c54b011#35e833e33dfd3e4efc3eb7d5de06bec17c54b011" +version = "0.8.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "72165c4af59f5f19c7fb774b88b95660591b612380305b5f4503157341a9f7ee" dependencies = [ "bitflags", "byteorder", @@ -2949,6 +2951,15 @@ dependencies = [ "once_cell", ] +[[package]] +name = "threadpool" +version = "1.8.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d050e60b33d41c19108b32cea32164033a9013fe3b46cbd4457559bfbf77afaa" +dependencies = [ + "num_cpus", +] + [[package]] name = "ticktimer-server" version = "0.1.0" diff --git a/RELEASE-v0.9.md b/RELEASE-v0.9.md index eb12fd142..3c31b222f 100644 --- a/RELEASE-v0.9.md +++ b/RELEASE-v0.9.md @@ -150,9 +150,10 @@ for examples of idiomatic ways to write code for Xous. - PR #150 & #153: QR codes can now display a separate QR code from the actual text in the box via a Some/None specifier. Thanks to nworbnhoj for the PR & refinements. - PR #151: message forwarding standardized as part of the messaging API. See https://betrusted.io/xous-book/ch07-07-forwarding.html - fixed locking bug in dlmalloc (stdlib version 1.60.0.7) -- update smoltcp to 0.8.0 + latest commits (lates commits necessary as 0.8.0 base includes a rand_core reference that doesn't compile) +- update smoltcp to 0.8.1 - refactor wait threads in net crate - use statically allocated pool of waiters + better filtering of requests for less churn - defer Drop on TcpStream until all written packets have been transmitted +- scheduler quantum is now a tuning parameter in xous definitions.rs (`BASE_QUANTA_MS`). it is now set to 10ms, down from 20ms. ## Roadmap to 1.0 diff --git a/services/net/Cargo.toml b/services/net/Cargo.toml index f402e0da7..5ab5f7230 100644 --- a/services/net/Cargo.toml +++ b/services/net/Cargo.toml @@ -30,16 +30,13 @@ locales = {path = "../../locales"} pddb = {path = "../pddb"} [dependencies.smoltcp] -# smoltcp 0.8.0 mainline has a bug in ICMPv4. This git rev patches over it until the maintainers can -# confirm a proper patch for the issue. -#git = "https://github.com/smoltcp-rs/smoltcp.git" -git = "https://github.com/betrusted-io/smoltcp.git" -rev = "35c8ec3d30c846442a1faae01fb0537641aef898" - -# note: maintainer suggests maybe we should use commit d05ebdd88f7f2b87a2ffe3256a42f67809d2d7e4 on mainline -# see https://github.com/smoltcp-rs/smoltcp/issues/613 - +# some historical notes for development on branches in the future # path = "../../../smoltcp" +#git = "https://github.com/smoltcp-rs/smoltcp.git" +#git = "https://github.com/betrusted-io/smoltcp.git" +#rev = "35c8ec3d30c846442a1faae01fb0537641aef898" +# 0.8.1 drops the rand_core dep and doesn't have the breaking IPv4 change (see issue #613) +version = "0.8.1" default-features = false features = [ "std", "log", # needed for `cargo test --no-default-features --features default` :/ @@ -48,10 +45,6 @@ features = [ "proto-ipv4", "proto-ipv6", "socket-raw", "socket-icmp", "socket-udp", "socket-tcp", ] -#features = ["verbose"] -#version = "0.7.5" -#features = ["proto-ipv4"] - [target.'cfg(not(any(windows,unix)))'.dependencies] utralib = { path = "../../utralib"} diff --git a/services/net/src/main.rs b/services/net/src/main.rs index ea8a55de1..0ff545c00 100644 --- a/services/net/src/main.rs +++ b/services/net/src/main.rs @@ -380,16 +380,6 @@ fn xmain() -> ! { Buffer::from_memory_message_mut(msg.body.memory_message_mut().unwrap()) }; let mut pkt = buf.to_original::().unwrap(); - // this will eventually go away once https://github.com/smoltcp-rs/smoltcp/issues/613 is fixed - let local_addr = match iface.ipv4_addr() { - Some(addr) => addr, - None => { // can't send a packet if we don't ourselves have an IP address - pkt.sent_ok = Some(false); - buf.replace(pkt) - .expect("Xous couldn't issue response to Ping request"); - continue; - } - }; let socket = iface.get_socket::(icmp_handle); if socket.can_send() { log::debug!("sending ping to {:?}", pkt.endpoint); @@ -448,8 +438,6 @@ fn xmain() -> ! { seq_no: seq, data: &echo_payload, }; - // this will eventually go away once https://github.com/smoltcp-rs/smoltcp/issues/613 is fixed - socket.set_src_ipv4addr(local_addr); let icmp_payload = socket.send(icmp_repr.buffer_len(), remote).unwrap(); let mut icmp_packet = Icmpv4Packet::new_unchecked(icmp_payload); icmp_repr.emit(&mut icmp_packet, &device_caps.checksum);