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

Context list class, static context ID magic

Browse source
This commit is contained in:
Jeremy Soller 2016-08-20 13:43:35 -06:00
parent 9cd48a36a5
commit 3b8f396229
5 changed files with 87 additions and 58 deletions
Download patch file Download diff file Expand all files Collapse all files

6
kernel/syscall/fs.rs
View file

@ -8,7 +8,7 @@ use super::{Error, Result};
/// Read syscall
pub fn read(fd: usize, buf: &mut [u8]) -> Result<usize> {
println!("Read {}: {}", fd, buf.len());
if let Some(context_lock) = context::contexts().get(&0) {
if let Some(context_lock) = context::contexts().current() {
let context = context_lock.read();
if let Some(file) = context.files.get(fd) {
println!("{:?}", file);
@ -24,7 +24,7 @@ pub fn read(fd: usize, buf: &mut [u8]) -> Result<usize> {
/// Write syscall
pub fn write(fd: usize, buf: &[u8]) -> Result<usize> {
println!("Write {}: {}", fd, buf.len());
if let Some(context_lock) = context::contexts().get(&0) {
if let Some(context_lock) = context::contexts().current() {
let context = context_lock.read();
if let Some(file) = context.files.get(fd) {
println!("{:?}: {:?}", file, ::core::str::from_utf8(buf));
@ -57,7 +57,7 @@ pub fn open(path: &[u8], flags: usize) -> Result<usize> {
}
}?;
if let Some(context_lock) = context::contexts().get(&0) {
if let Some(context_lock) = context::contexts().current() {
let mut context = context_lock.write();
if let Some(fd) = context.add_file(::context::file::File {
scheme: 0,