mirror of
https://github.com/saymrwulf/xous-core.git
synced 2026-11-20 09:03:28 +00:00
kernel: tests: factor out common connect code
Signed-off-by: Sean Cross <sean@xobs.io>
This commit is contained in:
parent
05ccba9450
commit
85c719643a
2 changed files with 71 additions and 85 deletions
|
|
@ -54,10 +54,10 @@ fn handle_connection(mut conn: TcpStream, pid: PID, chn: Sender<ThreadMessage>)
|
||||||
// If the connection has gone away, send a `TerminateProcess` message to the main
|
// If the connection has gone away, send a `TerminateProcess` message to the main
|
||||||
// and then exit this thread.
|
// and then exit this thread.
|
||||||
if e.kind() != std::io::ErrorKind::WouldBlock {
|
if e.kind() != std::io::ErrorKind::WouldBlock {
|
||||||
println!(
|
// println!(
|
||||||
"KERNEL({}): Client disconnected: {}. Shutting down virtual process.",
|
// "KERNEL({}): Client disconnected: {}. Shutting down virtual process.",
|
||||||
pid, e
|
// pid, e
|
||||||
);
|
// );
|
||||||
chn.send(ThreadMessage::SysCall(pid, xous::SysCall::TerminateProcess))
|
chn.send(ThreadMessage::SysCall(pid, xous::SysCall::TerminateProcess))
|
||||||
.unwrap();
|
.unwrap();
|
||||||
return;
|
return;
|
||||||
|
|
|
||||||
|
|
@ -1,49 +1,14 @@
|
||||||
use crate::kmain;
|
use crate::kmain;
|
||||||
use std::thread::spawn;
|
use std::thread::{spawn, JoinHandle};
|
||||||
|
|
||||||
use std::net::{TcpStream, ToSocketAddrs};
|
use std::net::{TcpStream, ToSocketAddrs};
|
||||||
use std::time::Duration;
|
|
||||||
use xous::{SysCall, rsyscall};
|
|
||||||
use std::sync::mpsc::channel;
|
use std::sync::mpsc::channel;
|
||||||
|
use std::time::Duration;
|
||||||
|
use xous::{rsyscall, SysCall};
|
||||||
|
|
||||||
mod shutdown;
|
mod shutdown;
|
||||||
|
|
||||||
#[test]
|
fn start_kernel(server_spec: &str) -> JoinHandle<()> {
|
||||||
fn shutdown() {
|
|
||||||
let server_spec = "localhost:9999";
|
|
||||||
let server_addr = server_spec
|
|
||||||
.to_socket_addrs()
|
|
||||||
.expect("invalid server address")
|
|
||||||
.next()
|
|
||||||
.expect("unable to resolve server address");
|
|
||||||
|
|
||||||
// Launch the main thread
|
|
||||||
let server_spec_server = server_spec.clone();
|
|
||||||
let main_thread = spawn(move || {
|
|
||||||
crate::arch::set_listen_address(&server_spec_server);
|
|
||||||
kmain()
|
|
||||||
});
|
|
||||||
|
|
||||||
// This is now the client.
|
|
||||||
xous::hosted::set_xous_address(&server_spec);
|
|
||||||
|
|
||||||
// Connect to server
|
|
||||||
for i in 1..11 {
|
|
||||||
println!("Retrying connection {}/10", i);
|
|
||||||
let res = TcpStream::connect_timeout(&server_addr, Duration::from_millis(200));
|
|
||||||
if res.is_ok() {
|
|
||||||
let call_result = rsyscall(SysCall::Shutdown);
|
|
||||||
println!("Call result: {:?}", call_result);
|
|
||||||
break;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
main_thread.join().expect("couldn't join main thread");
|
|
||||||
}
|
|
||||||
|
|
||||||
#[test]
|
|
||||||
fn send_scalar_message() {
|
|
||||||
let server_spec = "localhost:9998";
|
|
||||||
xous::hosted::set_xous_address(server_spec);
|
xous::hosted::set_xous_address(server_spec);
|
||||||
let server_addr = server_spec
|
let server_addr = server_spec
|
||||||
.to_socket_addrs()
|
.to_socket_addrs()
|
||||||
|
|
@ -52,7 +17,7 @@ fn send_scalar_message() {
|
||||||
.expect("unable to resolve server address");
|
.expect("unable to resolve server address");
|
||||||
|
|
||||||
// Launch the main thread
|
// Launch the main thread
|
||||||
let server_spec_server = server_spec.clone();
|
let server_spec_server = server_spec.to_owned();
|
||||||
let main_thread = spawn(move || {
|
let main_thread = spawn(move || {
|
||||||
crate::arch::set_listen_address(&server_spec_server);
|
crate::arch::set_listen_address(&server_spec_server);
|
||||||
kmain()
|
kmain()
|
||||||
|
|
@ -71,32 +36,80 @@ fn send_scalar_message() {
|
||||||
}
|
}
|
||||||
// Convert the Option<conn> into conn
|
// Convert the Option<conn> into conn
|
||||||
assert!(connected, "unable to connect to server");
|
assert!(connected, "unable to connect to server");
|
||||||
|
main_thread
|
||||||
|
}
|
||||||
|
|
||||||
|
#[test]
|
||||||
|
fn shutdown() {
|
||||||
|
let server_spec = "localhost:9999";
|
||||||
|
|
||||||
|
// Start the server in another thread.
|
||||||
|
let main_thread = start_kernel(server_spec);
|
||||||
|
|
||||||
|
// This is now the client.
|
||||||
|
xous::hosted::set_xous_address(&server_spec);
|
||||||
|
|
||||||
|
// Send a raw `Shutdown` message to terminate the kernel.
|
||||||
|
let call_result = rsyscall(SysCall::Shutdown);
|
||||||
|
println!("Call result: {:?}", call_result);
|
||||||
|
|
||||||
|
// Wait for the kernel to exit.
|
||||||
|
main_thread.join().expect("couldn't join main thread");
|
||||||
|
}
|
||||||
|
|
||||||
|
#[test]
|
||||||
|
fn send_scalar_message() {
|
||||||
|
let server_spec = "localhost:9998";
|
||||||
|
// Start the server in another thread
|
||||||
|
let main_thread = start_kernel(server_spec);
|
||||||
|
|
||||||
|
xous::hosted::set_xous_address(server_spec);
|
||||||
|
|
||||||
let xous_client_spec = server_spec.to_owned();
|
let xous_client_spec = server_spec.to_owned();
|
||||||
let xous_server_spec = server_spec.to_owned();
|
let xous_server_spec = server_spec.to_owned();
|
||||||
|
|
||||||
let (server_addr_send, server_addr_recv) = channel();
|
let (server_addr_send, server_addr_recv) = channel();
|
||||||
|
|
||||||
|
// Spawn the server "process" (which just lives in a separate thread)
|
||||||
|
// and receive the message. Note that we need to communicate to the
|
||||||
|
// "Client" what our server ID is. Normally this would be done via
|
||||||
|
// an external nameserver.
|
||||||
let xous_server = spawn(move || {
|
let xous_server = spawn(move || {
|
||||||
xous::hosted::set_xous_address(&xous_client_spec);
|
xous::hosted::set_xous_address(&xous_client_spec);
|
||||||
// println!("SERVER: Creating server");
|
|
||||||
let sid = xous::create_server(0x7884_3123).expect("couldn't create test server");
|
let sid = xous::create_server(0x7884_3123).expect("couldn't create test server");
|
||||||
// println!("SERVER: Now listening on {:?}", sid);
|
|
||||||
server_addr_send.send(sid).unwrap();
|
server_addr_send.send(sid).unwrap();
|
||||||
// println!("SERVER: Listening for message...");
|
let envelope = xous::receive_message(sid).expect("couldn't receive messages");
|
||||||
let msg = xous::receive_message(sid).expect("couldn't receive messages");
|
assert_eq!(
|
||||||
// println!("SERVER: Received message: {:?}", msg);
|
envelope.message,
|
||||||
|
xous::Message::Scalar(xous::ScalarMessage {
|
||||||
|
id: 1,
|
||||||
|
arg1: 2,
|
||||||
|
arg2: 3,
|
||||||
|
arg3: 4,
|
||||||
|
arg4: 5
|
||||||
|
})
|
||||||
|
);
|
||||||
});
|
});
|
||||||
|
|
||||||
|
// Spawn the client "process" and wait for the server address.
|
||||||
let xous_client = spawn(move || {
|
let xous_client = spawn(move || {
|
||||||
xous::hosted::set_xous_address(&xous_server_spec);
|
xous::hosted::set_xous_address(&xous_server_spec);
|
||||||
// println!("CLIENT: Waiting for server address...");
|
|
||||||
let sid = server_addr_recv.recv().unwrap();
|
let sid = server_addr_recv.recv().unwrap();
|
||||||
// println!("CLIENT: Connecting to server {:?}", sid);
|
|
||||||
let conn = xous::connect(sid).expect("couldn't connect to server");
|
let conn = xous::connect(sid).expect("couldn't connect to server");
|
||||||
xous::send_message(conn, xous::Message::Scalar(xous::ScalarMessage { id: 1, arg1: 2, arg2: 3, arg3: 4, arg4: 5} )).expect("couldn't send message");
|
xous::send_message(
|
||||||
|
conn,
|
||||||
|
xous::Message::Scalar(xous::ScalarMessage {
|
||||||
|
id: 1,
|
||||||
|
arg1: 2,
|
||||||
|
arg2: 3,
|
||||||
|
arg3: 4,
|
||||||
|
arg4: 5,
|
||||||
|
}),
|
||||||
|
)
|
||||||
|
.expect("couldn't send message");
|
||||||
});
|
});
|
||||||
|
|
||||||
|
// Wait for both processes to finish
|
||||||
xous_server.join().expect("couldn't join server process");
|
xous_server.join().expect("couldn't join server process");
|
||||||
xous_client.join().expect("couldn't join client process");
|
xous_client.join().expect("couldn't join client process");
|
||||||
|
|
||||||
|
|
@ -109,33 +122,8 @@ fn send_scalar_message() {
|
||||||
#[test]
|
#[test]
|
||||||
fn send_move_message() {
|
fn send_move_message() {
|
||||||
let server_spec = "localhost:9997";
|
let server_spec = "localhost:9997";
|
||||||
xous::hosted::set_xous_address(server_spec);
|
|
||||||
let server_addr = server_spec
|
|
||||||
.to_socket_addrs()
|
|
||||||
.expect("invalid server address")
|
|
||||||
.next()
|
|
||||||
.expect("unable to resolve server address");
|
|
||||||
|
|
||||||
// Launch the main thread
|
let main_thread = start_kernel(server_spec);
|
||||||
let server_spec_server = server_spec.clone();
|
|
||||||
let main_thread = spawn(move || {
|
|
||||||
crate::arch::set_listen_address(&server_spec_server);
|
|
||||||
kmain()
|
|
||||||
});
|
|
||||||
|
|
||||||
// Connect to server. This first instance needs to make sure the kernel is listening.
|
|
||||||
// let mut server_conn = None;
|
|
||||||
let mut connected = false;
|
|
||||||
for i in 1..11 {
|
|
||||||
println!("Retrying connection {}/10", i);
|
|
||||||
let res = TcpStream::connect_timeout(&server_addr, Duration::from_millis(200));
|
|
||||||
if res.is_ok() {
|
|
||||||
connected = true;
|
|
||||||
break;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
// Convert the Option<conn> into conn
|
|
||||||
assert!(connected, "unable to connect to server");
|
|
||||||
|
|
||||||
let xous_client_spec = server_spec.to_owned();
|
let xous_client_spec = server_spec.to_owned();
|
||||||
let xous_server_spec = server_spec.to_owned();
|
let xous_server_spec = server_spec.to_owned();
|
||||||
|
|
@ -144,19 +132,16 @@ fn send_move_message() {
|
||||||
|
|
||||||
let xous_server = spawn(move || {
|
let xous_server = spawn(move || {
|
||||||
xous::hosted::set_xous_address(&xous_client_spec);
|
xous::hosted::set_xous_address(&xous_client_spec);
|
||||||
// println!("SERVER: Creating server");
|
|
||||||
let sid = xous::create_server(0x7884_3123).expect("couldn't create test server");
|
let sid = xous::create_server(0x7884_3123).expect("couldn't create test server");
|
||||||
// println!("SERVER: Now listening on {:?}", sid);
|
|
||||||
server_addr_send.send(sid).unwrap();
|
server_addr_send.send(sid).unwrap();
|
||||||
// println!("SERVER: Listening for message...");
|
|
||||||
let envelope = xous::receive_message(sid).expect("couldn't receive messages");
|
let envelope = xous::receive_message(sid).expect("couldn't receive messages");
|
||||||
println!("Received message from {}", envelope.sender);
|
println!("Received message from {}", envelope.sender);
|
||||||
let message = envelope.message;
|
let message = envelope.message;
|
||||||
if let xous::Message::Move(m) = message {
|
if let xous::Message::Move(m) = message {
|
||||||
let buf = m.buf;
|
let buf = m.buf;
|
||||||
// let bt = unsafe { Box::from_raw(buf.as_mut_ptr() as *mut [u8]) };
|
let bt = unsafe {
|
||||||
// let bt = unsafe { core::slice::from_raw_parts(buf.as_ptr(), buf.len())};
|
Box::from_raw(core::slice::from_raw_parts_mut(buf.as_mut_ptr(), buf.len()))
|
||||||
let bt = unsafe { Box::from_raw(core::slice::from_raw_parts_mut(buf.as_mut_ptr(), buf.len())) };
|
};
|
||||||
let s = String::from_utf8_lossy(&bt);
|
let s = String::from_utf8_lossy(&bt);
|
||||||
println!("Got message: {:?} -> \"{}\"", bt, s);
|
println!("Got message: {:?} -> \"{}\"", bt, s);
|
||||||
} else {
|
} else {
|
||||||
|
|
@ -173,7 +158,8 @@ fn send_move_message() {
|
||||||
// println!("CLIENT: Connecting to server {:?}", sid);
|
// println!("CLIENT: Connecting to server {:?}", sid);
|
||||||
let conn = xous::connect(sid).expect("couldn't connect to server");
|
let conn = xous::connect(sid).expect("couldn't connect to server");
|
||||||
let msg = xous::carton::Carton::from_bytes(format!("Hello, world!").as_bytes());
|
let msg = xous::carton::Carton::from_bytes(format!("Hello, world!").as_bytes());
|
||||||
xous::send_message(conn, xous::Message::Move(msg.into_message(0))).expect("couldn't send a message");
|
xous::send_message(conn, xous::Message::Move(msg.into_message(0)))
|
||||||
|
.expect("couldn't send a message");
|
||||||
});
|
});
|
||||||
|
|
||||||
xous_server.join().expect("couldn't join server process");
|
xous_server.join().expect("couldn't join server process");
|
||||||
|
|
|
||||||
Loading…
Reference in a new issue