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

Fix deadlock

Browse source
This commit is contained in:
Jeremy Soller 2016-09-20 09:21:54 -06:00
parent 791dbfa7ad
commit d329f7c7d2
4 changed files with 37 additions and 29 deletions
Download patch file Download diff file Expand all files Collapse all files

2
kernel/syscall/mod.rs
View file

@ -25,6 +25,8 @@ mod validate;
pub extern fn syscall(a: usize, b: usize, c: usize, d: usize, e: usize, f: usize, stack: usize) -> usize {
#[inline(always)]
fn inner(a: usize, b: usize, c: usize, d: usize, e: usize, _f: usize, stack: usize) -> Result<usize> {
//println!("{}: {:?}: {} {} {} {}", ::context::context_id(), Call::from(a), a, b, c, d);
match Call::from(a) {
Some(call) => match call {
Call::Exit => exit(b),

49
kernel/syscall/process.rs
View file

@ -174,31 +174,36 @@ pub fn clone(flags: usize, stack_base: usize) -> Result<usize> {
if flags & CLONE_FILES == CLONE_FILES {
files = context.files.clone();
} else {
let mut files_vec = Vec::new();
for (fd, file_option) in context.files.lock().iter().enumerate() {
if let Some(file) = *file_option {
let result = {
let scheme = {
let schemes = scheme::schemes();
let scheme = schemes.get(file.scheme).ok_or(Error::BadFile)?;
scheme.clone()
};
let result = scheme.dup(file.number);
result
files = Arc::new(Mutex::new(context.files.lock().clone()));
}
}
if flags & CLONE_FILES == 0 {
for (fd, mut file_option) in files.lock().iter_mut().enumerate() {
let new_file_option = if let Some(file) = *file_option {
let result = {
let scheme = {
let schemes = scheme::schemes();
let scheme = schemes.get(file.scheme).ok_or(Error::BadFile)?;
scheme.clone()
};
match result {
Ok(new_number) => {
files_vec.push(Some(context::file::File { scheme: file.scheme, number: new_number }));
},
Err(err) => {
println!("clone: failed to dup {}: {:?}", fd, err);
}
let result = scheme.dup(file.number);
result
};
match result {
Ok(new_number) => {
Some(context::file::File { scheme: file.scheme, number: new_number })
},
Err(err) => {
println!("clone: failed to dup {}: {:?}", fd, err);
None
}
} else {
files_vec.push(None);
}
}
files = Arc::new(Mutex::new(files_vec));
} else {
None
};
*file_option = new_file_option;
}
}