feat(domain): add EndpointTable, IrqRoutingTable, and remaining error variants
This commit is contained in:
@@ -66,6 +66,39 @@ impl Endpoint {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
const MAX_ENDPOINTS: usize = 256;
|
||||||
|
|
||||||
|
pub struct EndpointTable {
|
||||||
|
endpoints: [Option<Endpoint>; MAX_ENDPOINTS],
|
||||||
|
}
|
||||||
|
|
||||||
|
impl EndpointTable {
|
||||||
|
pub fn new() -> Self {
|
||||||
|
Self {
|
||||||
|
endpoints: [const { None }; MAX_ENDPOINTS],
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
pub fn create(&mut self) -> Option<EndpointId> {
|
||||||
|
let idx = self.endpoints.iter().position(|s| s.is_none())?;
|
||||||
|
let id = EndpointId::from_raw(idx as u16);
|
||||||
|
self.endpoints[idx] = Some(Endpoint::new(id));
|
||||||
|
Some(id)
|
||||||
|
}
|
||||||
|
|
||||||
|
pub fn get(&self, id: EndpointId) -> Option<&Endpoint> {
|
||||||
|
self.endpoints.get(id.raw() as usize).and_then(|s| s.as_ref())
|
||||||
|
}
|
||||||
|
|
||||||
|
pub fn get_mut(&mut self, id: EndpointId) -> Option<&mut Endpoint> {
|
||||||
|
self.endpoints.get_mut(id.raw() as usize).and_then(|s| s.as_mut())
|
||||||
|
}
|
||||||
|
|
||||||
|
pub fn destroy(&mut self, id: EndpointId) -> Option<Endpoint> {
|
||||||
|
self.endpoints.get_mut(id.raw() as usize).and_then(|s| s.take())
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
pub trait MessagePassing {
|
pub trait MessagePassing {
|
||||||
fn send(
|
fn send(
|
||||||
&mut self,
|
&mut self,
|
||||||
|
|||||||
@@ -135,3 +135,46 @@ fn rendezvous_receiver_first() {
|
|||||||
let receiver = ep.dequeue_receiver().unwrap();
|
let receiver = ep.dequeue_receiver().unwrap();
|
||||||
assert_eq!(receiver, thread(1));
|
assert_eq!(receiver, thread(1));
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// --- EndpointTable tests ---
|
||||||
|
|
||||||
|
#[test]
|
||||||
|
fn table_create_and_lookup() {
|
||||||
|
let mut table = EndpointTable::new();
|
||||||
|
let id = table.create().unwrap();
|
||||||
|
assert!(table.get(id).is_some());
|
||||||
|
}
|
||||||
|
|
||||||
|
#[test]
|
||||||
|
fn table_create_returns_unique_ids() {
|
||||||
|
let mut table = EndpointTable::new();
|
||||||
|
let a = table.create().unwrap();
|
||||||
|
let b = table.create().unwrap();
|
||||||
|
assert_ne!(a, b);
|
||||||
|
}
|
||||||
|
|
||||||
|
#[test]
|
||||||
|
fn table_destroy_then_get_fails() {
|
||||||
|
let mut table = EndpointTable::new();
|
||||||
|
let id = table.create().unwrap();
|
||||||
|
let removed = table.destroy(id);
|
||||||
|
assert!(removed.is_some());
|
||||||
|
assert!(table.get(id).is_none());
|
||||||
|
}
|
||||||
|
|
||||||
|
#[test]
|
||||||
|
fn table_get_mut_allows_enqueue() {
|
||||||
|
let mut table = EndpointTable::new();
|
||||||
|
let id = table.create().unwrap();
|
||||||
|
table.get_mut(id).unwrap().enqueue_sender(thread(1)).unwrap();
|
||||||
|
assert!(table.get(id).unwrap().has_waiting_sender());
|
||||||
|
}
|
||||||
|
|
||||||
|
#[test]
|
||||||
|
fn table_destroy_reuses_slot() {
|
||||||
|
let mut table = EndpointTable::new();
|
||||||
|
let id = table.create().unwrap();
|
||||||
|
table.destroy(id);
|
||||||
|
let new_id = table.create().unwrap();
|
||||||
|
assert_eq!(id, new_id);
|
||||||
|
}
|
||||||
|
|||||||
@@ -1,6 +1,6 @@
|
|||||||
use types::{
|
use types::{
|
||||||
bounded::CapSlot,
|
bounded::CapSlot,
|
||||||
id::{ProcessId, ThreadId},
|
id::{EndpointId, IrqId, ProcessId, ThreadId},
|
||||||
permission::Permission,
|
permission::Permission,
|
||||||
};
|
};
|
||||||
|
|
||||||
@@ -18,4 +18,9 @@ pub enum KernelError {
|
|||||||
InvalidThread(ThreadId),
|
InvalidThread(ThreadId),
|
||||||
TooManyThreads,
|
TooManyThreads,
|
||||||
OutOfMemory,
|
OutOfMemory,
|
||||||
|
InvalidEndpoint(EndpointId),
|
||||||
|
InvalidIrq(IrqId),
|
||||||
|
EndpointFull,
|
||||||
|
ProcessCreateDenied,
|
||||||
|
IrqAlreadyOwned(IrqId),
|
||||||
}
|
}
|
||||||
|
|||||||
87
crates/domain/src/irq.rs
Normal file
87
crates/domain/src/irq.rs
Normal file
@@ -0,0 +1,87 @@
|
|||||||
|
use types::id::{IrqId, ThreadId};
|
||||||
|
|
||||||
|
use crate::error::KernelError;
|
||||||
|
|
||||||
|
const MAX_IRQS: usize = 256;
|
||||||
|
|
||||||
|
pub struct IrqRoutingTable {
|
||||||
|
owners: [Option<ThreadId>; MAX_IRQS],
|
||||||
|
}
|
||||||
|
|
||||||
|
impl IrqRoutingTable {
|
||||||
|
pub fn new() -> Self {
|
||||||
|
Self {
|
||||||
|
owners: [None; MAX_IRQS],
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
pub fn register(&mut self, irq: IrqId, thread: ThreadId) -> Result<(), KernelError> {
|
||||||
|
let idx = irq.raw() as usize;
|
||||||
|
if self.owners[idx].is_some() {
|
||||||
|
return Err(KernelError::IrqAlreadyOwned(irq));
|
||||||
|
}
|
||||||
|
self.owners[idx] = Some(thread);
|
||||||
|
Ok(())
|
||||||
|
}
|
||||||
|
|
||||||
|
pub fn unregister(&mut self, irq: IrqId) {
|
||||||
|
self.owners[irq.raw() as usize] = None;
|
||||||
|
}
|
||||||
|
|
||||||
|
pub fn owner(&self, irq: IrqId) -> Option<ThreadId> {
|
||||||
|
self.owners[irq.raw() as usize]
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
#[cfg(test)]
|
||||||
|
mod tests {
|
||||||
|
use super::*;
|
||||||
|
|
||||||
|
fn irq(id: u16) -> IrqId {
|
||||||
|
IrqId::from_raw(id)
|
||||||
|
}
|
||||||
|
|
||||||
|
fn thread(id: u16) -> ThreadId {
|
||||||
|
ThreadId::from_raw(id)
|
||||||
|
}
|
||||||
|
|
||||||
|
#[test]
|
||||||
|
fn new_table_has_no_owners() {
|
||||||
|
let table = IrqRoutingTable::new();
|
||||||
|
assert!(table.owner(irq(0)).is_none());
|
||||||
|
assert!(table.owner(irq(10)).is_none());
|
||||||
|
}
|
||||||
|
|
||||||
|
#[test]
|
||||||
|
fn register_and_lookup() {
|
||||||
|
let mut table = IrqRoutingTable::new();
|
||||||
|
table.register(irq(5), thread(1)).unwrap();
|
||||||
|
assert_eq!(table.owner(irq(5)), Some(thread(1)));
|
||||||
|
}
|
||||||
|
|
||||||
|
#[test]
|
||||||
|
fn register_already_owned_fails() {
|
||||||
|
let mut table = IrqRoutingTable::new();
|
||||||
|
table.register(irq(5), thread(1)).unwrap();
|
||||||
|
assert!(table.register(irq(5), thread(2)).is_err());
|
||||||
|
}
|
||||||
|
|
||||||
|
#[test]
|
||||||
|
fn unregister_then_reregister() {
|
||||||
|
let mut table = IrqRoutingTable::new();
|
||||||
|
table.register(irq(5), thread(1)).unwrap();
|
||||||
|
table.unregister(irq(5));
|
||||||
|
assert!(table.owner(irq(5)).is_none());
|
||||||
|
table.register(irq(5), thread(2)).unwrap();
|
||||||
|
assert_eq!(table.owner(irq(5)), Some(thread(2)));
|
||||||
|
}
|
||||||
|
|
||||||
|
#[test]
|
||||||
|
fn different_irqs_independent() {
|
||||||
|
let mut table = IrqRoutingTable::new();
|
||||||
|
table.register(irq(0), thread(10)).unwrap();
|
||||||
|
table.register(irq(1), thread(20)).unwrap();
|
||||||
|
assert_eq!(table.owner(irq(0)), Some(thread(10)));
|
||||||
|
assert_eq!(table.owner(irq(1)), Some(thread(20)));
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -4,6 +4,7 @@ pub mod capability;
|
|||||||
pub mod endpoint;
|
pub mod endpoint;
|
||||||
pub mod error;
|
pub mod error;
|
||||||
pub mod fault;
|
pub mod fault;
|
||||||
|
pub mod irq;
|
||||||
pub mod memory;
|
pub mod memory;
|
||||||
pub mod message;
|
pub mod message;
|
||||||
pub mod process;
|
pub mod process;
|
||||||
|
|||||||
Reference in New Issue
Block a user