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

Remove debugging messages, launch elf on APs

Browse source
This commit is contained in:
Jeremy Soller 2016-09-10 19:03:31 -06:00
parent 0faa82609d
commit bd7bca30fa
7 changed files with 22 additions and 30 deletions
Download patch file Download diff file Expand all files Collapse all files

23
kernel/syscall/fs.rs
View file

@ -7,8 +7,6 @@ use super::{Error, Result};
/// Read syscall
pub fn read(fd: usize, buf: &mut [u8]) -> Result<usize> {
println!("Read {}: {:X} {}", fd, buf.as_ptr() as usize, buf.len());
let file = {
let contexts = context::contexts();
let context_lock = contexts.current().ok_or(Error::NoProcess)?;
@ -17,8 +15,6 @@ pub fn read(fd: usize, buf: &mut [u8]) -> Result<usize> {
file
};
println!("{:?}", file);
let schemes = scheme::schemes();
let scheme_mutex = schemes.get(file.scheme).ok_or(Error::BadFile)?;
let result = scheme_mutex.lock().read(file.number, buf);
@ -27,8 +23,6 @@ pub fn read(fd: usize, buf: &mut [u8]) -> Result<usize> {
/// Write syscall
pub fn write(fd: usize, buf: &[u8]) -> Result<usize> {
println!("Write {}: {:X} {}", fd, buf.as_ptr() as usize, buf.len());
let file = {
let contexts = context::contexts();
let context_lock = contexts.current().ok_or(Error::NoProcess)?;
@ -37,8 +31,6 @@ pub fn write(fd: usize, buf: &[u8]) -> Result<usize> {
file
};
println!("{:?}: {:?}", file, ::core::str::from_utf8(buf));
let schemes = scheme::schemes();
let scheme_mutex = schemes.get(file.scheme).ok_or(Error::BadFile)?;
let result = scheme_mutex.lock().write(file.number, buf);
@ -50,7 +42,6 @@ pub fn open(path: &[u8], flags: usize) -> Result<usize> {
let mut parts = path.splitn(2, |&b| b == b':');
let namespace_opt = parts.next();
let reference_opt = parts.next();
println!("Open namespace {:?} reference {:?}: {:X}", namespace_opt.map(::core::str::from_utf8), reference_opt.map(::core::str::from_utf8), flags);
let (scheme_id, file_id) = {
let namespace = namespace_opt.ok_or(Error::NoEntry)?;
@ -71,6 +62,16 @@ pub fn open(path: &[u8], flags: usize) -> Result<usize> {
/// Close syscall
pub fn close(fd: usize) -> Result<usize> {
println!("Close {}", fd);
Ok(0)
let file = {
let contexts = context::contexts();
let context_lock = contexts.current().ok_or(Error::NoProcess)?;
let context = context_lock.read();
let file = context.files.get(fd).ok_or(Error::BadFile)?.ok_or(Error::BadFile)?;
file
};
let schemes = scheme::schemes();
let scheme_mutex = schemes.get(file.scheme).ok_or(Error::BadFile)?;
let result = scheme_mutex.lock().close(file.number).and(Ok(0));
result
}