From 011466ceb5191006af630efe554c621cb5e331d3 Mon Sep 17 00:00:00 2001 From: bunnie Date: Sun, 26 Sep 2021 00:01:59 +0800 Subject: [PATCH] start on a minimal test stub for the heap allocation problem --- Cargo.lock | 15 +++++ Cargo.toml | 2 + services/test-stub2/Cargo.toml | 25 +++++++ services/test-stub2/src/main.rs | 115 ++++++++++++++++++++++++++++++++ xtask/src/main.rs | 4 +- 5 files changed, 158 insertions(+), 3 deletions(-) create mode 100644 services/test-stub2/Cargo.toml create mode 100644 services/test-stub2/src/main.rs diff --git a/Cargo.lock b/Cargo.lock index b0e847d6d..8574890b1 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -2133,6 +2133,21 @@ dependencies = [ "xous-names", ] +[[package]] +name = "test-stub2" +version = "0.1.0" +dependencies = [ + "log", + "log-server", + "num-derive", + "num-traits", + "rkyv 0.4.3", + "ticktimer-server", + "utralib", + "xous", + "xous-ipc", +] + [[package]] name = "textwrap" version = "0.11.0" diff --git a/Cargo.toml b/Cargo.toml index d231a6233..e8e0f6fa4 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -33,6 +33,7 @@ default-members = [ "services/root-keys", "services/jtag", "services/oqc-test", + "services/test-stub2" ] members = [ "xous-ipc", @@ -80,6 +81,7 @@ members = [ "services/jtag", "tools/wycheproof-import", "services/oqc-test", + "services/test-stub2" ] resolver = "2" diff --git a/services/test-stub2/Cargo.toml b/services/test-stub2/Cargo.toml new file mode 100644 index 000000000..233684bb2 --- /dev/null +++ b/services/test-stub2/Cargo.toml @@ -0,0 +1,25 @@ +[package] +name = "test-stub2" +version = "0.1.0" +authors = ["bunnie "] +edition = "2018" +description = "Test stub 2" + +[dependencies] +xous = { path = "../../xous-rs" } +ticktimer-server = { path = "../ticktimer-server" } +log-server = { path = "../log-server" } +log = "0.4" + +xous-ipc = {path = "../../xous-ipc"} +num-derive = {version = "0.3", default-features = false} +num-traits = {version = "0.2", default-features = false} +rkyv = {version = "0.4.3", default-features = false, features = ["const_generics"]} + +[target.'cfg(not(any(windows,unix)))'.dependencies] +utralib = {path = "../../utralib"} + +[target.'cfg(any(windows,unix))'.dependencies] + +[features] +default = [] diff --git a/services/test-stub2/src/main.rs b/services/test-stub2/src/main.rs new file mode 100644 index 000000000..e5212b9e5 --- /dev/null +++ b/services/test-stub2/src/main.rs @@ -0,0 +1,115 @@ +#![cfg_attr(target_os = "none", no_std)] +#![cfg_attr(target_os = "none", no_main)] + +use num_traits::*; +use std::collections::HashMap; +use xous_ipc::{Buffer, String}; +use std::sync::{Arc, Mutex}; +use std::thread; + +#[derive(num_derive::FromPrimitive, num_derive::ToPrimitive)] +pub(crate) enum Op1 { + Test1, + Test2, + Test3, + Quit, +} + +#[xous::xous_main] +fn shell_main() -> ! { + log_server::init_wait().unwrap(); + log::set_max_level(log::LevelFilter::Info); + log::info!("my PID is {}", xous::process::id()); + + let server1 = Arc::new(Mutex::new(xous::create_server_with_address(b"test-fooo-server") + .expect("Couldn't create xousnames-server"))); + + let handle = thread::spawn({ + let sid = Arc::clone(&server1); + move || { + let ticktimer = ticktimer_server::Ticktimer::new().unwrap(); + let mut map = HashMap::<&str, i32>::new(); + let mut value = 0; + loop { + let msg = xous::receive_message(*sid.lock().unwrap()).unwrap(); + log::info!("received {:?}", msg); + match FromPrimitive::from_usize(msg.body.id()) { + Some(Op1::Test1) => xous::msg_blocking_scalar_unpack!(msg, token, _, _, _, { + ticktimer.sleep_ms(1000).unwrap(); + value = token + 1; + xous::return_scalar(msg.sender, value); + }), + Some(Op1::Test2) => { + let buffer = unsafe { Buffer::from_memory_message(msg.body.memory_message().unwrap()) }; + let name = buffer.to_original::, _>().unwrap(); + map.insert(name.as_str().unwrap(), value as i32); + }, + Some(Op1::Test3) => { + let buffer = unsafe { Buffer::from_memory_message(msg.body.memory_message().unwrap()) }; + let name = buffer.to_original::, _>().unwrap(); + log::info!("retrieved {:?}", map.get(&name)); + } + Some(Op1::Quit) => break, + None => { + log::info!("couldn't handle message"); + } + } + } + } + + }); + + let server2 = xous::create_server_with_address(b"test-food-server") + .expect("Couldn't create xousnames-server"); + let ticktimer = ticktimer_server::Ticktimer::new().unwrap(); + let test_conn = xous::connect(server1.lock().unwrap()).unwrap(); + let identifier = String::<128>::from_str("test string"); + let mut local_id = 0; + let mut map = HashMap::<&str, i32>::new(); + let mut value = 0; + loop { + let maybe_msg = xous::try_receive_message(server2).unwrap(); + match maybe_msg { + Some(msg) => { + log::info!("received {:?}", msg); + match FromPrimitive::from_usize(msg.body.id()) { + Some(Op1::Test1) => xous::msg_blocking_scalar_unpack!(msg, token, _, _, _, { + ticktimer.sleep_ms(1000).unwrap(); + value = token + 1; + xous::return_scalar(msg.sender, value); + }), + Some(Op1::Test2) => { + let buffer = unsafe { Buffer::from_memory_message(msg.body.memory_message().unwrap()) }; + let name = buffer.to_original::().unwrap(); + map.insert(name.as_str().unwrap(), value); + }, + Some(Op1::Test3) => { + let buffer = unsafe { Buffer::from_memory_message(msg.body.memory_message().unwrap()) }; + let name = buffer.to_original::().unwrap(); + log::info!("retrieved {:?}", map.get(&name)); + } + Some(Op1::Quit) => break, + None => { + log::info!("couldn't handle message"); + } + } + } + None => { + log::info!("test pump"); + ticktimer.sleep_ms(1000).unwrap(); + let response = xous::send_message(test_conn, + xous::Message::new_blocking_scalar(Op1::Test1.to_usize().unwrap(), local_id, 0, 0, 0) + ).unwrap(); + if let xous::Result::Scalar1(result) = response { + local_id = result; + } + let buf = Buffer::into_buf(identifier).unwrap(); + buf.lend(test_conn, Op1::Test2.to_u32().unwrap()).unwrap(); + let buf2 = Buffer::into_buf(identifier).unwrap(); + buf2.lend(test_conn, Op1::Test3.to_u32().unwrap()).unwrap(); + } + } + } + + xous::terminate_process(0) +} \ No newline at end of file diff --git a/xtask/src/main.rs b/xtask/src/main.rs index 680f7524a..5a619c16a 100644 --- a/xtask/src/main.rs +++ b/xtask/src/main.rs @@ -75,15 +75,13 @@ fn main() -> Result<(), Box> { "xous-names", "trng", "llio", - // "rkyv-test-client", - // "rkyv-test-server", "test-stub", "susres", "com", ]; // A base set of packages. This is all you need for a normal // operating system that can run libstd - let base_pkgs = ["ticktimer-server", "log-server"]; + let base_pkgs = ["ticktimer-server", "log-server", "test-stub2"]; let cbtest_pkgs = [ "ticktimer-server", "log-server",