Add mechanism to read IRQ count

This commit is contained in:
Jeremy Soller 2016-09-18 18:59:46 -06:00
parent 483d466b1a
commit 4bcee99d9f
5 changed files with 83 additions and 13 deletions

View file

@ -1,6 +1,6 @@
use collections::VecDeque;
use core::str;
use spin::{Mutex, MutexGuard, Once};
use spin::{Mutex, Once};
use context;
use syscall::Result;

57
kernel/scheme/irq.rs Normal file
View file

@ -0,0 +1,57 @@
use core::{mem, str};
use arch::interrupt::irq::COUNTS;
use context;
use syscall::{Error, Result};
use super::Scheme;
pub struct IrqScheme;
impl Scheme for IrqScheme {
fn open(&mut self, path: &[u8], _flags: usize) -> Result<usize> {
let path_str = str::from_utf8(path).or(Err(Error::NoEntry))?;
let id = path_str.parse::<usize>().or(Err(Error::NoEntry))?;
if id < COUNTS.lock().len() {
Ok(id)
} else {
Err(Error::NoEntry)
}
}
fn dup(&mut self, file: usize) -> Result<usize> {
Ok(file)
}
fn read(&mut self, file: usize, buffer: &mut [u8]) -> Result<usize> {
// Ensures that the length of the buffer is larger than the size of a usize
if buffer.len() >= mem::size_of::<usize>() {
let current = COUNTS.lock()[file];
loop {
let next = COUNTS.lock()[file];
if next != current {
// Safe if the length of the buffer is larger than the size of a usize
assert!(buffer.len() >= mem::size_of::<usize>());
unsafe { *(buffer.as_mut_ptr() as *mut usize) = next };
return Ok(mem::size_of::<usize>());
} else {
// Safe if all locks have been dropped
unsafe { context::switch(); }
}
}
} else {
Err(Error::InvalidValue)
}
}
fn write(&mut self, _file: usize, _buffer: &[u8]) -> Result<usize> {
Err(Error::NotPermitted)
}
fn fsync(&mut self, file: usize) -> Result<()> {
Ok(())
}
fn close(&mut self, file: usize) -> Result<()> {
Ok(())
}
}

View file

@ -18,6 +18,7 @@ use syscall::{Error, Result};
use self::debug::DebugScheme;
use self::env::EnvScheme;
use self::initfs::InitFsScheme;
use self::irq::IrqScheme;
/// Debug scheme
pub mod debug;
@ -28,6 +29,9 @@ pub mod env;
/// InitFS scheme
pub mod initfs;
/// IRQ handling
pub mod irq;
/// Limit on number of schemes
pub const SCHEME_MAX_SCHEMES: usize = 65536;
@ -98,6 +102,7 @@ fn init_schemes() -> RwLock<SchemeList> {
list.insert(Box::new(*b"debug"), Arc::new(Mutex::new(Box::new(DebugScheme)))).expect("failed to insert debug: scheme");
list.insert(Box::new(*b"env"), Arc::new(Mutex::new(Box::new(EnvScheme::new())))).expect("failed to insert env: scheme");
list.insert(Box::new(*b"initfs"), Arc::new(Mutex::new(Box::new(InitFsScheme::new())))).expect("failed to insert initfs: scheme");
list.insert(Box::new(*b"irq"), Arc::new(Mutex::new(Box::new(IrqScheme)))).expect("failed to insert irq: scheme");
RwLock::new(list)
}