mirror of
https://github.com/saymrwulf/xous-core.git
synced 2026-11-17 08:40:52 +00:00
kernel: use crossbeam for tests
Signed-off-by: Sean Cross <sean@xobs.io>
This commit is contained in:
parent
c9cb50b579
commit
a36ceb00c2
2 changed files with 1182 additions and 1181 deletions
|
|
@ -9,12 +9,13 @@ use std::convert::TryInto;
|
||||||
use std::env;
|
use std::env;
|
||||||
use std::io::Read;
|
use std::io::Read;
|
||||||
use std::net::{IpAddr, Ipv4Addr, SocketAddr, TcpListener, TcpStream, ToSocketAddrs};
|
use std::net::{IpAddr, Ipv4Addr, SocketAddr, TcpListener, TcpStream, ToSocketAddrs};
|
||||||
use std::sync::mpsc::{channel, Receiver, Sender};
|
|
||||||
use std::thread_local;
|
use std::thread_local;
|
||||||
|
|
||||||
use crate::arch::process::Process;
|
use crate::arch::process::Process;
|
||||||
use crate::services::SystemServices;
|
use crate::services::SystemServices;
|
||||||
|
|
||||||
|
use crossbeam_channel::{unbounded, Receiver, RecvError, RecvTimeoutError, Sender};
|
||||||
|
|
||||||
use xous_kernel::{MemoryAddress, ProcessInit, ProcessKey, Result, SysCall, ThreadInit, PID, TID};
|
use xous_kernel::{MemoryAddress, ProcessInit, ProcessKey, Result, SysCall, ThreadInit, PID, TID};
|
||||||
|
|
||||||
enum ThreadMessage {
|
enum ThreadMessage {
|
||||||
|
|
@ -138,7 +139,7 @@ fn handle_connection(
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
let (sender, receiver) = channel();
|
let (sender, receiver) = unbounded();
|
||||||
let conn_sender = sender.clone();
|
let conn_sender = sender.clone();
|
||||||
std::thread::Builder::new()
|
std::thread::Builder::new()
|
||||||
.name(format!("PID {}: client connection thread", pid))
|
.name(format!("PID {}: client connection thread", pid))
|
||||||
|
|
@ -349,11 +350,11 @@ fn listen_thread(
|
||||||
NewConnection(TcpStream),
|
NewConnection(TcpStream),
|
||||||
Exit,
|
Exit,
|
||||||
};
|
};
|
||||||
let (sender, receiver) = channel();
|
let (sender, receiver) = unbounded();
|
||||||
let tcp_sender = sender.clone();
|
let tcp_sender = sender.clone();
|
||||||
let exit_sender = sender;
|
let exit_sender = sender;
|
||||||
|
|
||||||
let (shutdown_listener, shutdown_listener_receiver) = channel();
|
let (shutdown_listener, shutdown_listener_receiver) = unbounded();
|
||||||
|
|
||||||
// `listener.accept()` has no way to break, so we must put it in nonblocking mode
|
// `listener.accept()` has no way to break, so we must put it in nonblocking mode
|
||||||
listener.set_nonblocking(true).unwrap();
|
listener.set_nonblocking(true).unwrap();
|
||||||
|
|
@ -370,8 +371,8 @@ fn listen_thread(
|
||||||
match shutdown_listener_receiver
|
match shutdown_listener_receiver
|
||||||
.recv_timeout(std::time::Duration::from_millis(500))
|
.recv_timeout(std::time::Duration::from_millis(500))
|
||||||
{
|
{
|
||||||
Err(std::sync::mpsc::RecvTimeoutError::Timeout) => continue,
|
Err(RecvTimeoutError::Timeout) => continue,
|
||||||
Ok(()) | Err(std::sync::mpsc::RecvTimeoutError::Disconnected) => {
|
Ok(()) | Err(RecvTimeoutError::Disconnected) => {
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
@ -404,7 +405,7 @@ fn listen_thread(
|
||||||
.name("kernel exit listener".to_owned())
|
.name("kernel exit listener".to_owned())
|
||||||
.spawn(move || match exit_channel.recv() {
|
.spawn(move || match exit_channel.recv() {
|
||||||
Ok(ExitMessage::Exit) => exit_sender.send(ClientMessage::Exit).unwrap(),
|
Ok(ExitMessage::Exit) => exit_sender.send(ClientMessage::Exit).unwrap(),
|
||||||
Err(std::sync::mpsc::RecvError) => eprintln!("error receiving exit command"),
|
Err(RecvError) => eprintln!("error receiving exit command"),
|
||||||
})
|
})
|
||||||
.unwrap();
|
.unwrap();
|
||||||
|
|
||||||
|
|
@ -427,9 +428,9 @@ fn listen_thread(
|
||||||
/// thread that handles network communications, and this function never returns.
|
/// thread that handles network communications, and this function never returns.
|
||||||
pub fn idle() -> bool {
|
pub fn idle() -> bool {
|
||||||
// Start listening.
|
// Start listening.
|
||||||
let (sender, message_receiver) = channel();
|
let (sender, message_receiver) = unbounded();
|
||||||
let (new_pid_sender, new_pid_receiver) = channel();
|
let (new_pid_sender, new_pid_receiver) = unbounded();
|
||||||
let (exit_sender, exit_receiver) = channel();
|
let (exit_sender, exit_receiver) = unbounded();
|
||||||
|
|
||||||
// Allocate PID1 with the key we were passed.
|
// Allocate PID1 with the key we were passed.
|
||||||
let pid1_key = PID1_KEY.with(|p1k| *p1k.borrow());
|
let pid1_key = PID1_KEY.with(|p1k| *p1k.borrow());
|
||||||
|
|
@ -450,7 +451,7 @@ pub fn idle() -> bool {
|
||||||
|
|
||||||
#[cfg(not(test))]
|
#[cfg(not(test))]
|
||||||
let address_receiver = {
|
let address_receiver = {
|
||||||
let (sender, receiver) = channel();
|
let (sender, receiver) = unbounded();
|
||||||
set_send_addr(sender);
|
set_send_addr(sender);
|
||||||
receiver
|
receiver
|
||||||
};
|
};
|
||||||
|
|
|
||||||
|
|
@ -2,7 +2,7 @@ use crate::kmain;
|
||||||
use std::thread::JoinHandle;
|
use std::thread::JoinHandle;
|
||||||
|
|
||||||
use std::net::ToSocketAddrs;
|
use std::net::ToSocketAddrs;
|
||||||
use std::sync::mpsc::channel;
|
use crossbeam_channel::unbounded;
|
||||||
use xous_kernel::{rsyscall, SysCall};
|
use xous_kernel::{rsyscall, SysCall};
|
||||||
|
|
||||||
mod shutdown;
|
mod shutdown;
|
||||||
|
|
@ -43,7 +43,7 @@ fn start_kernel(server_spec: &str) -> JoinHandle<()> {
|
||||||
// let server_addr = temp_server.local_addr().unwrap();
|
// let server_addr = temp_server.local_addr().unwrap();
|
||||||
// drop(temp_server);
|
// drop(temp_server);
|
||||||
|
|
||||||
let (send_addr, recv_addr) = channel();
|
let (send_addr, recv_addr) = unbounded();
|
||||||
|
|
||||||
// Launch the main thread. We pass a `send_addr` channel so that the
|
// Launch the main thread. We pass a `send_addr` channel so that the
|
||||||
// server can notify us when it's ready to listen.
|
// server can notify us when it's ready to listen.
|
||||||
|
|
@ -126,8 +126,8 @@ fn connect_for_process() {
|
||||||
let nameserver_addr_bytes = b"nameserver-12345";
|
let nameserver_addr_bytes = b"nameserver-12345";
|
||||||
let nameserver_addr = SID::from_bytes(nameserver_addr_bytes).unwrap();
|
let nameserver_addr = SID::from_bytes(nameserver_addr_bytes).unwrap();
|
||||||
|
|
||||||
let (server_addr_send, server_addr_recv) = channel();
|
let (server_addr_send, server_addr_recv) = unbounded();
|
||||||
let (nameserver_send, nameserver_recv) = channel();
|
let (nameserver_send, nameserver_recv) = unbounded();
|
||||||
|
|
||||||
// Spawn the client "process" and wait for the server address.
|
// Spawn the client "process" and wait for the server address.
|
||||||
let nameserver_process = xous_kernel::create_process_as_thread(
|
let nameserver_process = xous_kernel::create_process_as_thread(
|
||||||
|
|
@ -272,7 +272,7 @@ fn send_scalar_message() {
|
||||||
// Start the server in another thread
|
// Start the server in another thread
|
||||||
let main_thread = start_kernel(SERVER_SPEC);
|
let main_thread = start_kernel(SERVER_SPEC);
|
||||||
|
|
||||||
let (server_addr_send, server_addr_recv) = channel();
|
let (server_addr_send, server_addr_recv) = unbounded();
|
||||||
|
|
||||||
// Spawn the server "process" (which just lives in a separate thread)
|
// Spawn the server "process" (which just lives in a separate thread)
|
||||||
// and receive the message. Note that we need to communicate to the
|
// and receive the message. Note that we need to communicate to the
|
||||||
|
|
@ -332,8 +332,8 @@ fn try_receive_message() {
|
||||||
// Start the server in another thread
|
// Start the server in another thread
|
||||||
let main_thread = start_kernel(SERVER_SPEC);
|
let main_thread = start_kernel(SERVER_SPEC);
|
||||||
|
|
||||||
let (server_addr_send, server_addr_recv) = channel();
|
let (server_addr_send, server_addr_recv) = unbounded();
|
||||||
let (client_sent_send, client_sent_recv) = channel();
|
let (client_sent_send, client_sent_recv) = unbounded();
|
||||||
|
|
||||||
// Spawn the server "process" (which just lives in a separate thread)
|
// Spawn the server "process" (which just lives in a separate thread)
|
||||||
// and receive the message. Note that we need to communicate to the
|
// and receive the message. Note that we need to communicate to the
|
||||||
|
|
@ -402,7 +402,7 @@ fn send_blocking_scalar_message() {
|
||||||
// Start the server in another thread
|
// Start the server in another thread
|
||||||
let main_thread = start_kernel(SERVER_SPEC);
|
let main_thread = start_kernel(SERVER_SPEC);
|
||||||
|
|
||||||
let (server_addr_send, server_addr_recv) = channel();
|
let (server_addr_send, server_addr_recv) = unbounded();
|
||||||
|
|
||||||
// Spawn the server "process" (which just lives in a separate thread)
|
// Spawn the server "process" (which just lives in a separate thread)
|
||||||
// and receive the message. Note that we need to communicate to the
|
// and receive the message. Note that we need to communicate to the
|
||||||
|
|
@ -491,10 +491,10 @@ fn message_ordering() {
|
||||||
// Start the server in another thread
|
// Start the server in another thread
|
||||||
let main_thread = start_kernel(SERVER_SPEC);
|
let main_thread = start_kernel(SERVER_SPEC);
|
||||||
|
|
||||||
let (server_addr_send, server_addr_recv) = channel();
|
let (server_addr_send, server_addr_recv) = unbounded();
|
||||||
let (server_can_start_send, server_can_start_recv) = channel();
|
let (server_can_start_send, server_can_start_recv) = unbounded();
|
||||||
let (client_total_send, client_total_recv) = channel();
|
let (client_total_send, client_total_recv) = unbounded();
|
||||||
let (server_total_send, server_total_recv) = channel();
|
let (server_total_send, server_total_recv) = unbounded();
|
||||||
|
|
||||||
// Spawn the server "process" (which just lives in a separate thread)
|
// Spawn the server "process" (which just lives in a separate thread)
|
||||||
// and receive the message. Note that we need to communicate to the
|
// and receive the message. Note that we need to communicate to the
|
||||||
|
|
@ -608,7 +608,7 @@ fn send_interleved_blocking_scalar_message() {
|
||||||
// Start the server in another thread
|
// Start the server in another thread
|
||||||
let main_thread = start_kernel(SERVER_SPEC);
|
let main_thread = start_kernel(SERVER_SPEC);
|
||||||
|
|
||||||
let (server_addr_send, server_addr_recv) = channel();
|
let (server_addr_send, server_addr_recv) = unbounded();
|
||||||
|
|
||||||
// Spawn the server "process" (which just lives in a separate thread)
|
// Spawn the server "process" (which just lives in a separate thread)
|
||||||
// and receive the message. Note that we need to communicate to the
|
// and receive the message. Note that we need to communicate to the
|
||||||
|
|
@ -700,7 +700,7 @@ fn send_move_message() {
|
||||||
|
|
||||||
let main_thread = start_kernel(SERVER_SPEC);
|
let main_thread = start_kernel(SERVER_SPEC);
|
||||||
|
|
||||||
let (server_addr_send, server_addr_recv) = channel();
|
let (server_addr_send, server_addr_recv) = unbounded();
|
||||||
|
|
||||||
let xous_server = xous_kernel::create_process_as_thread(xous_kernel::ProcessArgsAsThread::new(
|
let xous_server = xous_kernel::create_process_as_thread(xous_kernel::ProcessArgsAsThread::new(
|
||||||
"send_move_message server",
|
"send_move_message server",
|
||||||
|
|
@ -755,7 +755,7 @@ fn send_move_message() {
|
||||||
#[test]
|
#[test]
|
||||||
fn send_borrow_message() {
|
fn send_borrow_message() {
|
||||||
let main_thread = start_kernel(SERVER_SPEC);
|
let main_thread = start_kernel(SERVER_SPEC);
|
||||||
let (server_addr_send, server_addr_recv) = channel();
|
let (server_addr_send, server_addr_recv) = unbounded();
|
||||||
let test_str = "Hello, world!";
|
let test_str = "Hello, world!";
|
||||||
let test_bytes = test_str.as_bytes();
|
let test_bytes = test_str.as_bytes();
|
||||||
|
|
||||||
|
|
@ -834,7 +834,7 @@ fn send_borrow_message() {
|
||||||
#[test]
|
#[test]
|
||||||
fn send_mutableborrow_message() {
|
fn send_mutableborrow_message() {
|
||||||
let main_thread = start_kernel(SERVER_SPEC);
|
let main_thread = start_kernel(SERVER_SPEC);
|
||||||
let (server_addr_send, server_addr_recv) = channel();
|
let (server_addr_send, server_addr_recv) = unbounded();
|
||||||
let test_str = "Hello, world!";
|
let test_str = "Hello, world!";
|
||||||
let test_bytes = test_str.as_bytes();
|
let test_bytes = test_str.as_bytes();
|
||||||
|
|
||||||
|
|
@ -903,7 +903,7 @@ fn send_mutableborrow_message() {
|
||||||
#[test]
|
#[test]
|
||||||
fn send_repeat_mutableborrow_message() {
|
fn send_repeat_mutableborrow_message() {
|
||||||
let main_thread = start_kernel(SERVER_SPEC);
|
let main_thread = start_kernel(SERVER_SPEC);
|
||||||
let (server_addr_send, server_addr_recv) = channel();
|
let (server_addr_send, server_addr_recv) = unbounded();
|
||||||
let test_str = "Hello, world!";
|
let test_str = "Hello, world!";
|
||||||
let test_bytes = test_str.as_bytes();
|
let test_bytes = test_str.as_bytes();
|
||||||
|
|
||||||
|
|
@ -1112,7 +1112,7 @@ fn process_restart_server() {
|
||||||
let main_thread = start_kernel(SERVER_SPEC);
|
let main_thread = start_kernel(SERVER_SPEC);
|
||||||
|
|
||||||
fn create_destroy_server(test_bytes: &'static [u8]) {
|
fn create_destroy_server(test_bytes: &'static [u8]) {
|
||||||
let (server_addr_send, server_addr_recv) = channel();
|
let (server_addr_send, server_addr_recv) = unbounded();
|
||||||
|
|
||||||
let xous_server = xous_kernel::create_process_as_thread(
|
let xous_server = xous_kernel::create_process_as_thread(
|
||||||
xous_kernel::ProcessArgsAsThread::new("process_restart_server server", move || {
|
xous_kernel::ProcessArgsAsThread::new("process_restart_server server", move || {
|
||||||
|
|
|
||||||
Loading…
Reference in a new issue