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

40
kernel/scheme/env.rs
View file

@ -1,4 +1,6 @@
use collections::BTreeMap;
use core::sync::atomic::{AtomicUsize, Ordering};
use spin::RwLock;
use syscall::{Error, Result};
use super::Scheme;
@ -9,9 +11,9 @@ struct Handle {
}
pub struct EnvScheme {
next_id: usize,
next_id: AtomicUsize,
files: BTreeMap<&'static [u8], &'static [u8]>,
handles: BTreeMap<usize, Handle>
handles: RwLock<BTreeMap<usize, Handle>>
}
impl EnvScheme {
@ -24,20 +26,19 @@ impl EnvScheme {
files.insert(b"LINES", b"30");
EnvScheme {
next_id: 0,
next_id: AtomicUsize::new(0),
files: files,
handles: BTreeMap::new()
handles: RwLock::new(BTreeMap::new())
}
}
}
impl Scheme for EnvScheme {
fn open(&mut self, path: &[u8], _flags: usize) -> Result<usize> {
fn open(&self, path: &[u8], _flags: usize) -> Result<usize> {
let data = self.files.get(path).ok_or(Error::NoEntry)?;
let id = self.next_id;
self.next_id += 1;
self.handles.insert(id, Handle {
let id = self.next_id.fetch_add(1, Ordering::SeqCst);
self.handles.write().insert(id, Handle {
data: data,
seek: 0
});
@ -45,15 +46,15 @@ impl Scheme for EnvScheme {
Ok(id)
}
fn dup(&mut self, file: usize) -> Result<usize> {
fn dup(&self, file: usize) -> Result<usize> {
let (data, seek) = {
let handle = self.handles.get(&file).ok_or(Error::BadFile)?;
let handles = self.handles.read();
let handle = handles.get(&file).ok_or(Error::BadFile)?;
(handle.data, handle.seek)
};
let id = self.next_id;
self.next_id += 1;
self.handles.insert(id, Handle {
let id = self.next_id.fetch_add(1, Ordering::SeqCst);
self.handles.write().insert(id, Handle {
data: data,
seek: seek
});
@ -61,8 +62,9 @@ impl Scheme for EnvScheme {
Ok(id)
}
fn read(&mut self, file: usize, buffer: &mut [u8]) -> Result<usize> {
let mut handle = self.handles.get_mut(&file).ok_or(Error::BadFile)?;
fn read(&self, file: usize, buffer: &mut [u8]) -> Result<usize> {
let mut handles = self.handles.write();
let mut handle = handles.get_mut(&file).ok_or(Error::BadFile)?;
let mut i = 0;
while i < buffer.len() && handle.seek < handle.data.len() {
@ -74,15 +76,15 @@ impl Scheme for EnvScheme {
Ok(i)
}
fn write(&mut self, _file: usize, _buffer: &[u8]) -> Result<usize> {
fn write(&self, _file: usize, _buffer: &[u8]) -> Result<usize> {
Err(Error::NotPermitted)
}
fn fsync(&mut self, _file: usize) -> Result<()> {
fn fsync(&self, _file: usize) -> Result<()> {
Ok(())
}
fn close(&mut self, file: usize) -> Result<()> {
self.handles.remove(&file).ok_or(Error::BadFile).and(Ok(()))
fn close(&self, file: usize) -> Result<()> {
self.handles.write().remove(&file).ok_or(Error::BadFile).and(Ok(()))
}
}