mirror of
https://github.com/saymrwulf/xous-core.git
synced 2026-11-18 08:52:45 +00:00
add some facilities for testing net in libstd
This commit is contained in:
parent
e7efb14bdf
commit
526bc959af
7 changed files with 95 additions and 6 deletions
16
Cargo.lock
generated
16
Cargo.lock
generated
|
|
@ -1206,6 +1206,22 @@ version = "0.2.1"
|
||||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||||
checksum = "c7d73b3f436185384286bd8098d17ec07c9a7d2388a6599f824d8502b529702a"
|
checksum = "c7d73b3f436185384286bd8098d17ec07c9a7d2388a6599f824d8502b529702a"
|
||||||
|
|
||||||
|
[[package]]
|
||||||
|
name = "libstd-test"
|
||||||
|
version = "0.1.0"
|
||||||
|
dependencies = [
|
||||||
|
"dns",
|
||||||
|
"log",
|
||||||
|
"log-server",
|
||||||
|
"net",
|
||||||
|
"num-derive",
|
||||||
|
"num-traits",
|
||||||
|
"ticktimer-server",
|
||||||
|
"utralib",
|
||||||
|
"xous",
|
||||||
|
"xous-names",
|
||||||
|
]
|
||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
name = "libz-sys"
|
name = "libz-sys"
|
||||||
version = "1.1.3"
|
version = "1.1.3"
|
||||||
|
|
|
||||||
|
|
@ -88,6 +88,7 @@ members = [
|
||||||
"services/modals",
|
"services/modals",
|
||||||
"apps/ball",
|
"apps/ball",
|
||||||
"apps/repl",
|
"apps/repl",
|
||||||
|
"services/libstd-test",
|
||||||
"kernel",
|
"kernel",
|
||||||
]
|
]
|
||||||
resolver = "2"
|
resolver = "2"
|
||||||
|
|
|
||||||
24
services/libstd-test/Cargo.toml
Normal file
24
services/libstd-test/Cargo.toml
Normal file
|
|
@ -0,0 +1,24 @@
|
||||||
|
[package]
|
||||||
|
name = "libstd-test"
|
||||||
|
version = "0.1.0"
|
||||||
|
authors = ["bunnie <bunnie@kosagi.com>"]
|
||||||
|
edition = "2018"
|
||||||
|
description = "libstd test stub"
|
||||||
|
|
||||||
|
# Dependency policy: fully specify dependencies to the minor version number
|
||||||
|
[dependencies]
|
||||||
|
xous = { path = "../../xous-rs" }
|
||||||
|
log-server = { path = "../log-server" }
|
||||||
|
ticktimer-server = { path = "../ticktimer-server" }
|
||||||
|
xous-names = { path = "../xous-names" }
|
||||||
|
log = "0.4.14"
|
||||||
|
num-derive = {version = "0.3.3", default-features = false}
|
||||||
|
num-traits = {version = "0.2.14", default-features = false}
|
||||||
|
net = {path = "../net"}
|
||||||
|
dns = {path = "../dns"}
|
||||||
|
|
||||||
|
[target.'cfg(not(any(windows,unix)))'.dependencies]
|
||||||
|
utralib = { path = "../../utralib"}
|
||||||
|
|
||||||
|
[features]
|
||||||
|
default = []
|
||||||
25
services/libstd-test/src/main.rs
Normal file
25
services/libstd-test/src/main.rs
Normal file
|
|
@ -0,0 +1,25 @@
|
||||||
|
#[xous::xous_main]
|
||||||
|
fn test_main() -> ! {
|
||||||
|
log_server::init_wait().unwrap();
|
||||||
|
log::set_max_level(log::LevelFilter::Info);
|
||||||
|
log::info!("my PID is {}", xous::process::id());
|
||||||
|
|
||||||
|
let tt = ticktimer_server::Ticktimer::new().unwrap();
|
||||||
|
log::info!("waiting for others to boot");
|
||||||
|
tt.sleep_ms(5000).unwrap();
|
||||||
|
let host = "bunniefoo.com";
|
||||||
|
log::info!("attempting to resolve {}", host);
|
||||||
|
|
||||||
|
let xns = xous_names::XousNames::new().unwrap();
|
||||||
|
let dns = dns::Dns::new(&xns).unwrap();
|
||||||
|
match dns.lookup(host) {
|
||||||
|
Ok(ipaddr) => {
|
||||||
|
log::info!("resolved {} to {:?}", host, ipaddr);
|
||||||
|
}
|
||||||
|
_ => {
|
||||||
|
log::info!("couldn't resolve {}", host);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
xous::terminate_process(0)
|
||||||
|
}
|
||||||
|
|
@ -46,4 +46,5 @@ rev = "35e833e33dfd3e4efc3eb7d5de06bec17c54b011"
|
||||||
utralib = { path = "../../utralib"}
|
utralib = { path = "../../utralib"}
|
||||||
|
|
||||||
[features]
|
[features]
|
||||||
|
renode-minimal = []
|
||||||
default = []
|
default = []
|
||||||
|
|
|
||||||
|
|
@ -218,6 +218,7 @@ fn xmain() -> ! {
|
||||||
let cm_sid = xous::create_server().expect("couldn't create connection manager server");
|
let cm_sid = xous::create_server().expect("couldn't create connection manager server");
|
||||||
let cm_cid = xous::connect(cm_sid).unwrap();
|
let cm_cid = xous::connect(cm_sid).unwrap();
|
||||||
let activity_interval = Arc::new(AtomicU32::new(0));
|
let activity_interval = Arc::new(AtomicU32::new(0));
|
||||||
|
#[cfg(not(feature="renode-minimal"))]
|
||||||
thread::spawn({
|
thread::spawn({
|
||||||
let activity_interval = activity_interval.clone();
|
let activity_interval = activity_interval.clone();
|
||||||
move || {
|
move || {
|
||||||
|
|
|
||||||
|
|
@ -179,7 +179,8 @@ fn main() -> Result<(), Box<dyn std::error::Error>> {
|
||||||
pkgs.push(app);
|
pkgs.push(app);
|
||||||
}
|
}
|
||||||
generate_app_menus(&apps);
|
generate_app_menus(&apps);
|
||||||
renode_image(false, &hw_pkgs, &[], None)?
|
renode_image(false, &hw_pkgs, &[],
|
||||||
|
None, Some(&["--features", "renode-bypass"]))?
|
||||||
},
|
},
|
||||||
Some("renode-test") => {
|
Some("renode-test") => {
|
||||||
let mut args = env::args();
|
let mut args = env::args();
|
||||||
|
|
@ -195,7 +196,7 @@ fn main() -> Result<(), Box<dyn std::error::Error>> {
|
||||||
pkgs.push(app);
|
pkgs.push(app);
|
||||||
}
|
}
|
||||||
generate_app_menus(&apps);
|
generate_app_menus(&apps);
|
||||||
renode_image(false, &cbtest_pkgs, &[], None)?
|
renode_image(false, &cbtest_pkgs, &[], None, None)?
|
||||||
},
|
},
|
||||||
Some("libstd-test") => {
|
Some("libstd-test") => {
|
||||||
let mut args = env::args();
|
let mut args = env::args();
|
||||||
|
|
@ -207,15 +208,33 @@ fn main() -> Result<(), Box<dyn std::error::Error>> {
|
||||||
extra_packages.push(program.as_str());
|
extra_packages.push(program.as_str());
|
||||||
}
|
}
|
||||||
renode_image(false, &pkgs, extra_packages.as_slice(),
|
renode_image(false, &pkgs, extra_packages.as_slice(),
|
||||||
|
None, Some(&["--features", "renode-bypass"]))?;
|
||||||
|
}
|
||||||
|
Some("libstd-net") => {
|
||||||
|
let mut args = env::args();
|
||||||
|
args.nth(1);
|
||||||
|
let mut pkgs = base_pkgs.to_vec();
|
||||||
|
pkgs.push("net");
|
||||||
|
pkgs.push("com");
|
||||||
|
pkgs.push("llio");
|
||||||
|
pkgs.push("dns");
|
||||||
|
pkgs.push("libstd-test");
|
||||||
|
let args: Vec<String> = args.collect();
|
||||||
|
let mut extra_packages = vec![];
|
||||||
|
for program in &args {
|
||||||
|
extra_packages.push(program.as_str());
|
||||||
|
}
|
||||||
|
renode_image(false, &pkgs, extra_packages.as_slice(),
|
||||||
|
Some(&["--features", "renode-minimal"]),
|
||||||
Some(&["--features", "renode-bypass"]))?;
|
Some(&["--features", "renode-bypass"]))?;
|
||||||
}
|
}
|
||||||
Some("renode-aes-test") => {
|
Some("renode-aes-test") => {
|
||||||
generate_app_menus(&Vec::<String>::new());
|
generate_app_menus(&Vec::<String>::new());
|
||||||
renode_image(false, &aestest_pkgs, &[], None)?
|
renode_image(false, &aestest_pkgs, &[], None, None)?
|
||||||
},
|
},
|
||||||
Some("renode-image-debug") => {
|
Some("renode-image-debug") => {
|
||||||
generate_app_menus(&vec!["ball".to_string()]);
|
generate_app_menus(&vec!["ball".to_string()]);
|
||||||
renode_image(true, &hw_pkgs, &[], None)?
|
renode_image(true, &hw_pkgs, &[], None, None)?
|
||||||
},
|
},
|
||||||
Some("pddb-ci") => {
|
Some("pddb-ci") => {
|
||||||
generate_app_menus(&Vec::<String>::new());
|
generate_app_menus(&Vec::<String>::new());
|
||||||
|
|
@ -389,7 +408,8 @@ Renode emulation:
|
||||||
renode-test builds a test image for renode
|
renode-test builds a test image for renode
|
||||||
renode-image-debug builds a test image for renode in debug mode
|
renode-image-debug builds a test image for renode in debug mode
|
||||||
libstd-test [pkg1] [..] builds a test image that includes the minimum packages, plus those
|
libstd-test [pkg1] [..] builds a test image that includes the minimum packages, plus those
|
||||||
specified on the command line (e.g. built externally)
|
specified on the command line (e.g. built externally). Bypasses sig checks, keys locked out.
|
||||||
|
libstd-net [pkg1] [..] builds a test image for testing network functions. Bypasses sig checks, keys locked out.
|
||||||
|
|
||||||
Locale (re-)generation:
|
Locale (re-)generation:
|
||||||
generate-locales (re)generate the locales include for the language selected in xous-rs/src/locale.rs
|
generate-locales (re)generate the locales include for the language selected in xous-rs/src/locale.rs
|
||||||
|
|
@ -694,6 +714,7 @@ fn renode_image(
|
||||||
debug: bool,
|
debug: bool,
|
||||||
packages: &[&str],
|
packages: &[&str],
|
||||||
extra_packages: &[&str],
|
extra_packages: &[&str],
|
||||||
|
xous_features: Option<&[&str]>,
|
||||||
loader_features: Option<&[&str]>,
|
loader_features: Option<&[&str]>,
|
||||||
) -> Result<(), DynError> {
|
) -> Result<(), DynError> {
|
||||||
// Regenerate the Platform file
|
// Regenerate the Platform file
|
||||||
|
|
@ -719,7 +740,7 @@ fn renode_image(
|
||||||
packages,
|
packages,
|
||||||
None,
|
None,
|
||||||
None,
|
None,
|
||||||
None,
|
xous_features,
|
||||||
extra_packages,
|
extra_packages,
|
||||||
loader_features,
|
loader_features,
|
||||||
)
|
)
|
||||||
|
|
|
||||||
Loading…
Reference in a new issue