kernel: testing: move memory profiling into its own test

Signed-off-by: Sean Cross <sean@xobs.io>
This commit is contained in:
Sean Cross 2020-07-15 21:24:18 +08:00
parent bf15ac08f4
commit fb32aab691

View file

@ -14,7 +14,7 @@ use stats_alloc::{Region, Stats, StatsAlloc, INSTRUMENTED_SYSTEM};
#[global_allocator] #[global_allocator]
static GLOBAL: &StatsAlloc<std::alloc::System> = &INSTRUMENTED_SYSTEM; static GLOBAL: &StatsAlloc<std::alloc::System> = &INSTRUMENTED_SYSTEM;
const SERVER_SPEC: &str = "localhost:0"; const SERVER_SPEC: &str = "127.0.0.1:0";
fn start_kernel(server_spec: &str) -> (JoinHandle<()>, SocketAddr) { fn start_kernel(server_spec: &str) -> (JoinHandle<()>, SocketAddr) {
let server_addr = server_spec let server_addr = server_spec
@ -186,12 +186,12 @@ fn send_borrow_message() {
let xous_server = spawn(move || { let xous_server = spawn(move || {
xous::hosted::set_xous_address(server_spec); xous::hosted::set_xous_address(server_spec);
println!("SERVER: Creating server..."); // 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");
server_addr_send.send(sid).unwrap(); server_addr_send.send(sid).unwrap();
println!("SERVER: Receiving message..."); // println!("SERVER: Receiving message...");
let envelope = xous::receive_message(sid).expect("couldn't receive messages"); let envelope = xous::receive_message(sid).expect("couldn't receive messages");
println!("SERVER: Received message from {}", envelope.sender); // println!("SERVER: Received message from {}", envelope.sender);
let message = envelope.message; let message = envelope.message;
if let xous::Message::Borrow(m) = message { if let xous::Message::Borrow(m) = message {
let buf = m.buf; let buf = m.buf;
@ -199,10 +199,10 @@ fn send_borrow_message() {
Box::from_raw(core::slice::from_raw_parts_mut(buf.as_mut_ptr(), buf.len())) Box::from_raw(core::slice::from_raw_parts_mut(buf.as_mut_ptr(), buf.len()))
}; };
assert_eq!(*test_bytes, *bt); assert_eq!(*test_bytes, *bt);
let s = String::from_utf8_lossy(&bt); // let s = String::from_utf8_lossy(&bt);
println!("SERVER: Got message: {:?} -> \"{}\"", bt, s); // println!("SERVER: Got message: {:?} -> \"{}\"", bt, s);
xous::return_memory(envelope.sender, m.buf).unwrap(); xous::return_memory(envelope.sender, m.buf).unwrap();
println!("SERVER: Returned memory"); // println!("SERVER: Returned memory");
} else { } else {
panic!("unexpected message type"); panic!("unexpected message type");
} }
@ -212,19 +212,19 @@ fn send_borrow_message() {
xous::hosted::set_xous_address(server_spec); xous::hosted::set_xous_address(server_spec);
// Get the server address (out of band) so we know what to connect to // Get the server address (out of band) so we know what to connect to
println!("CLIENT: Waiting for server to start..."); // println!("CLIENT: Waiting for server to start...");
let sid = server_addr_recv.recv().unwrap(); let sid = server_addr_recv.recv().unwrap();
// Perform a connection to the server // Perform a connection to the server
println!("CLIENT: Connecting to server..."); // println!("CLIENT: Connecting to server...");
let conn = xous::connect(sid).expect("couldn't connect to server"); let conn = xous::connect(sid).expect("couldn't connect to server");
// Convert the message into a "Carton" that can be shipped as a message // Convert the message into a "Carton" that can be shipped as a message
println!("CLIENT: Creating carton..."); // println!("CLIENT: Creating carton...");
let carton = xous::carton::Carton::from_bytes(test_bytes); let carton = xous::carton::Carton::from_bytes(test_bytes);
// Send the message to the server // Send the message to the server
println!("CLIENT: Lending message..."); // println!("CLIENT: Lending message...");
carton carton
.lend(conn, 0) .lend(conn, 0)
.expect("couldn't lend message to server"); .expect("couldn't lend message to server");
@ -305,12 +305,6 @@ fn send_mutableborrow_message() {
#[test] #[test]
fn send_mutableborrow_message_repeat() { fn send_mutableborrow_message_repeat() {
#[cfg(feature = "report-memory")]
let mut reg = Region::new(&GLOBAL);
#[cfg(feature = "report-memory")]
reg.reset();
{
let (main_thread, server_spec) = start_kernel(SERVER_SPEC); let (main_thread, server_spec) = start_kernel(SERVER_SPEC);
let (server_addr_send, server_addr_recv) = channel(); let (server_addr_send, server_addr_recv) = channel();
let test_str = "Hello, world!"; let test_str = "Hello, world!";
@ -375,10 +369,24 @@ fn send_mutableborrow_message_repeat() {
rsyscall(SysCall::Shutdown).expect("unable to shutdown server"); rsyscall(SysCall::Shutdown).expect("unable to shutdown server");
main_thread.join().expect("couldn't join kernel process"); main_thread.join().expect("couldn't join kernel process");
}
#[cfg(feature = "report-memory")]
#[test]
fn measure_memory_usage() {
// let _server_addr: Vec<SocketAddr> = SERVER_SPEC
// .to_socket_addrs()
// .expect("invalid server address").collect();
// .next()
// .expect("unable to resolve server address");
let mut reg = Region::new(&GLOBAL);
reg.reset();
{
let jh = spawn(|| shutdown());
jh.join().expect("couldn't join message thread");
} }
#[cfg(feature = "report-memory")]
{
fn memory_in_use(start: &Stats) -> usize { fn memory_in_use(start: &Stats) -> usize {
if start.bytes_deallocated > start.bytes_allocated { if start.bytes_deallocated > start.bytes_allocated {
eprintln!("Allocated a negative number of bytes!"); eprintln!("Allocated a negative number of bytes!");
@ -389,12 +397,8 @@ fn send_mutableborrow_message_repeat() {
} }
let after_join = reg.change(); let after_join = reg.change();
println!( let miu = memory_in_use(&after_join);
"After test: {:#?} ({} bytes in use)", println!("After test: {:#?} ({} bytes in use)", after_join, miu);
after_join,
memory_in_use(&after_join)
);
}
} }
// #[test] // #[test]