Refactor the Task struct to reduce lock contention

applications/bm/src/lib.rs

@@ -1555,8 +1555,7 @@ fn get_prog_name() -> String {
         }
     };
 
-    let locked_task = taskref.lock();
-    locked_task.name.clone()
+    taskref.name.clone()
 }
 
 /// Helper function to get the PID of current task
@@ -1569,8 +1568,7 @@ fn getpid() -> usize {
         }
     };
 
-    let locked_task = taskref.lock();
-    locked_task.id
+    taskref.id
 }
 
 
@@ -1589,13 +1587,9 @@ fn hpet_2_time(msg_header: &str, hpet: u64) -> u64 {
 
 /// Helper function to get current working directory
 fn get_cwd() -> Option<DirRef> {
-	if let Some(taskref) = task::get_my_current_task() {
-        let locked_task = &taskref.lock();
-        let curr_env = locked_task.env.lock();
-        return Some(Arc::clone(&curr_env.working_dir));
-    }
-
-    None
+	task::get_my_current_task().map(|t| 
+		Arc::clone(&t.get_env().lock().working_dir)
+	)
 }
 
 /// Helper function to make a temporary file to be used to measure read open latencies

applications/cat/src/lib.rs

@@ -53,11 +53,7 @@ pub fn main(args: Vec<String>) -> isize {
     };
 
     // grabs the current working directory pointer; this is scoped so that we drop the lock on the task as soon as we get the working directory pointer
-    let curr_wr = {
-        let locked_task = taskref.lock();
-        let curr_env = locked_task.env.lock();
-        Arc::clone(&curr_env.working_dir)
-    };
+    let curr_wr = Arc::clone(&taskref.get_env().lock().working_dir);
     let path = Path::new(matches.free[0].to_string());
 
     // navigate to the filepath specified by first argument

applications/cd/src/lib.rs

@@ -38,18 +38,8 @@ pub fn main(args: Vec<String>) -> isize {
             return -1;
         }
     };
-    // grabs the current environment pointer; this is scoped so that we drop the lock on the "cd" task
-    let curr_env = {
-        let locked_task = taskref.lock();
-        Arc::clone(&locked_task.env)
-    };
-
-    // grabs the current working directory pointer; this is scoped so that we drop the lock on the "cd" task
-    let curr_wr = {
-        let locked_task = taskref.lock();
-        let curr_env = locked_task.env.lock();
-        Arc::clone(&curr_env.working_dir)
-    };
+    let curr_env = taskref.get_env();
+    let curr_wr = Arc::clone(&curr_env.lock().working_dir);
 
     // go to root directory 
     if matches.free.is_empty() {

applications/cpu/src/lib.rs

@@ -39,8 +39,7 @@ pub fn main(args: Vec<String>) -> isize {
 
         if let Some(runqueue) = runqueue::get_runqueue(apic_id).map(|rq| rq.read()) {
             let mut runqueue_contents = String::new();
-            for task_ref in runqueue.iter() {
-                let task = task_ref.lock();
+            for task in runqueue.iter() {
                 runqueue_contents.push_str(&format!("{} ({}) {}\n", 
                     task.name, 
                     task.id,

applications/deps/src/lib.rs

@@ -402,7 +402,7 @@ fn find_section(section_name: &str) -> Result<StrongSectionRef, String> {
 
 
 fn get_my_current_namespace() -> Arc<CrateNamespace> {
-    task::get_my_current_task().map(|t| t.get_namespace()).unwrap_or_else(|| 
+    task::get_my_current_task().map(|t| Arc::clone(t.get_namespace())).unwrap_or_else(|| 
         mod_mgmt::get_initial_kernel_namespace().expect("BUG: initial kernel namespace wasn't initialized").clone()
     )
 }

applications/kill/src/lib.rs

@@ -60,7 +60,7 @@ fn kill_task(task_id: usize, reap: bool) -> Result<(), String> {
             .and_then(|_| runqueue::remove_task_from_all(&task_ref))
             .is_ok() 
         {
-            println!("Killed task {}", &*task_ref.lock());
+            println!("Killed task {}", &*task_ref);
             if reap {
                 match task_ref.take_exit_value() {
                     Some(exit_val) => { 

applications/less/src/lib.rs

@@ -49,11 +49,7 @@ fn get_content_string(file_path: String) -> Result<String, String> {
     };
 
     // grabs the current working directory pointer; this is scoped so that we drop the lock on the task as soon as we get the working directory pointer
-    let curr_wr = {
-        let locked_task = taskref.lock();
-        let curr_env = locked_task.env.lock();
-        Arc::clone(&curr_env.working_dir)
-    };
+    let curr_wr = Arc::clone(&taskref.get_env().lock().working_dir);
     let path = Path::new(file_path);
 
     // navigate to the filepath specified by first argument

applications/loadc/src/lib.rs

@@ -64,9 +64,9 @@ pub fn main(args: Vec<String>) -> isize {
 
 fn rmain(matches: Matches) -> Result<c_int, String> {
     let curr_task = task::get_my_current_task().unwrap();
-    let curr_wd   = Arc::clone(&curr_task.lock().env.lock().working_dir);
+    let curr_wd   = Arc::clone(&curr_task.get_env().lock().working_dir);
     let namespace = curr_task.get_namespace();
-    let mmi       = Arc::clone(&curr_task.lock().mmi);
+    let mmi       = &curr_task.mmi;
 
     let path = matches.free.get(0).ok_or_else(|| format!("Missing path to ELF executable"))?;
     let path = Path::new(path.clone());
@@ -84,7 +84,7 @@ fn rmain(matches: Matches) -> Result<c_int, String> {
     // most important of which are static data sections, 
     // as it is logically incorrect to have duplicates of data that are supposed to be global system-wide singletons.
     // We should throw a warning here if there are no relocations in the file, as it was probably built/linked with the wrong arguments.
-    overwrite_relocations(&namespace, &mut segments, &elf_file, &mmi, false)?;
+    overwrite_relocations(&namespace, &mut segments, &elf_file, mmi, false)?;
 
     // Remap each segment's mapped pages using the correct flags; they were previously mapped as always writable.
     {
@@ -272,7 +272,7 @@ fn parse_and_load_elf_executable<'f>(
         // debug!("Adjusted segment vaddr: {:#X}, size: {:#X}, {:?}", start_vaddr, memory_size_in_bytes, this_ap.start_address());
 
         let initial_flags = EntryFlags::from_elf_program_flags(prog_hdr.flags());
-        let mmi = task::get_my_current_task().unwrap().lock().mmi.clone();
+        let mmi = &task::get_my_current_task().unwrap().mmi;
         // Must initially map the memory as writable so we can copy the segment data to it later. 
         let mut mp = mmi.lock().page_table
             .map_allocated_pages(this_ap, initial_flags | EntryFlags::WRITABLE)

applications/ls/src/lib.rs

@@ -42,12 +42,7 @@ pub fn main(args: Vec<String>) -> isize {
         }
     };
 
-    // grabs the current working directory pointer; this is scoped so that we drop the lock on the "cd" task
-    let curr_wd = {
-        let locked_task = taskref.lock();
-        let curr_env = locked_task.env.lock();
-        Arc::clone(&curr_env.working_dir)
-    };
+    let curr_wd = Arc::clone(&taskref.get_env().lock().working_dir);
 
     // print children of working directory if no child is specified
     if matches.free.is_empty() {

applications/mkdir/src/lib.rs

@@ -20,11 +20,7 @@ pub fn main(args: Vec<String>) -> isize {
             // add child dir to current directory
             if let Some(taskref) = task::get_my_current_task() {
                 // grabs a pointer to the current working directory; this is scoped so that we drop the lock on the "mkdir" task as soon as we're finished
-                let curr_dir = {
-                    let locked_task = &taskref.lock();
-                    let curr_env = locked_task.env.lock();
-                    Arc::clone(&curr_env.working_dir)
-                };
+                let curr_dir = Arc::clone(&taskref.get_env().lock().working_dir);
                 let _new_dir = match VFSDirectory::new(dir_name.to_string(), &curr_dir) {
                     Ok(dir) => dir,
                     Err(err) => {println!("{}", err);