vinzenz/redox
0
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Minimize locking in schemes. Reenable pcid and ion launch in init. WIP: Userspace schemes

Browse source
This commit is contained in:
Jeremy Soller 2016-09-19 18:29:28 -06:00
parent 94ad63de11
commit abdbadfea3
9 changed files with 367 additions and 113 deletions
Download patch file Download diff file Expand all files Collapse all files

12
kernel/scheme/irq.rs
View file

@ -7,7 +7,7 @@ use super::Scheme;
pub struct IrqScheme;
impl Scheme for IrqScheme {
fn open(&mut self, path: &[u8], _flags: usize) -> Result<usize> {
fn open(&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))?;
@ -19,11 +19,11 @@ impl Scheme for IrqScheme {
}
}
fn dup(&mut self, file: usize) -> Result<usize> {
fn dup(&self, file: usize) -> Result<usize> {
Ok(file)
}
fn read(&mut self, file: usize, buffer: &mut [u8]) -> Result<usize> {
fn read(&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 ack = ACKS.lock()[file];
@ -41,7 +41,7 @@ impl Scheme for IrqScheme {
}
}
fn write(&mut self, file: usize, buffer: &[u8]) -> Result<usize> {
fn write(&self, file: usize, buffer: &[u8]) -> Result<usize> {
if buffer.len() >= mem::size_of::<usize>() {
assert!(buffer.len() >= mem::size_of::<usize>());
let ack = unsafe { *(buffer.as_ptr() as *const usize) };
@ -58,11 +58,11 @@ impl Scheme for IrqScheme {
}
}
fn fsync(&mut self, _file: usize) -> Result<()> {
fn fsync(&self, _file: usize) -> Result<()> {
Ok(())
}
fn close(&mut self, _file: usize) -> Result<()> {
fn close(&self, _file: usize) -> Result<()> {
Ok(())
}
}