From 729eba656c065a3de4e86e22e7532eb9debc4422 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fran=C3=A7ois=20Autin?=
 <francois.autin@etudiant.univ-rennes1.fr>
Date: Wed, 12 Apr 2023 13:25:33 +0200
Subject: [PATCH] Added sc_v call

---
 src/kernel/exception.rs | 16 ++++++++++---
 src/utility/objaddr.rs  | 50 ++++++++++++++++++++++++++---------------
 2 files changed, 45 insertions(+), 21 deletions(-)

diff --git a/src/kernel/exception.rs b/src/kernel/exception.rs
index e2774d5..64b7e28 100644
--- a/src/kernel/exception.rs
+++ b/src/kernel/exception.rs
@@ -1,8 +1,10 @@
 use std::{cell::RefCell, rc::Rc};
 
-use crate::simulator::{machine::{ExceptionType, Machine}, error::{MachineOk, MachineError}};
+use crate::{simulator::{machine::{ExceptionType, Machine}, error::{MachineOk, MachineError}}};
 
-use super::{system::System, thread::Thread};
+use super::{system::System, thread::Thread, synch::Semaphore};
+
+type Error = String;
 
 /// The halt system call. Stops Burritos.
 pub const SC_SHUTDOWN: u8 =	0;
@@ -202,7 +204,7 @@ fn syscall(machine: &mut Machine, system: &mut System) -> Result<MachineOk, Mach
         SC_YIELD => todo!(),
         SC_PERROR => todo!(),
         SC_P => todo!(),
-        SC_V => todo!(),
+        SC_V => sc_v(machine, system),
         SC_SEM_CREATE => {
             let addr_name = machine.read_int_register(10) as usize;
             let initial_count = machine.read_int_register(11);
@@ -238,6 +240,14 @@ fn syscall(machine: &mut Machine, system: &mut System) -> Result<MachineOk, Mach
     }
 }
 
+fn sc_v(machine: &mut Machine, system: &mut System) -> Result<(), Error>{
+    let id_sema = machine.int_reg.get_reg(10);
+    match system.get_obj_addrs().search_semaphore(id_sema) {
+        Some(sema) => { sema.v(machine, system.get_thread_manager()); Ok(()) },
+        None => Err(format!("Couldn't find semaphore {}", id_sema))
+    }
+}
+
 fn get_length_param(addr: usize, machine: & Machine) -> usize{
     let mut i = 0;
     let mut c = 1;
diff --git a/src/utility/objaddr.rs b/src/utility/objaddr.rs
index f1896ef..d6e37de 100644
--- a/src/utility/objaddr.rs
+++ b/src/utility/objaddr.rs
@@ -4,12 +4,7 @@
 
 use std::collections::HashMap;
 
-/// This trait allows ObjAddr to hold references to Multiple kinds of structs
-/// 
-///  - Lock
-///  - Condition
-///  - Sémaphore
-pub trait SynchObj { }
+use crate::kernel::synch::{ Semaphore, Lock };
 
 /// Brief Definition of object identifiers:
 /// 
@@ -20,36 +15,55 @@ pub trait SynchObj { }
 /// A method allows to detect of an object corresponding to a given
 /// identifier exists; this is used to check the parameters of system
 /// calls.
-pub struct ObjAddr<'a> {
+pub struct ObjAddr {
     last_id: i32,
-    map: HashMap<i32, &'a dyn SynchObj>
+    semaphores: HashMap<i32, Semaphore>,
+    locks: HashMap<i32, Lock>
 }
 
-impl<'a> ObjAddr<'a> {
+impl ObjAddr {
     
     /// Initializes and returns a ObjAddr struct
     pub fn init() -> Self {
         Self {
             last_id: 3,
-            map: HashMap::<i32, &dyn SynchObj>::new()
+            semaphores: HashMap::<i32, Semaphore>::new(),
+            locks: HashMap::<i32, Lock>::new()
         }
     }
 
-    /// Adds the **obj** SynchObj to self
-    pub fn add_object(&mut self, obj: &'a dyn SynchObj) -> i32 {
+    /// Adds the **obj** Semaphore to self
+    pub fn add_semaphore(&mut self, obj: Semaphore) -> i32 {
         self.last_id = self.last_id + 1;
-        self.map.insert(self.last_id, obj);
+        self.semaphores.insert(self.last_id, obj);
         self.last_id
     }
 
-    /// Searches for an object of id **id** in self
-    pub fn search_object(&self, id: i32) -> Option<&& dyn SynchObj> {
-        self.map.get(&id)
+    /// Adds the **obj** Lock to self
+    pub fn add_lock(&mut self, obj: Lock) -> i32 {
+        self.last_id = self.last_id + 1;
+        self.locks.insert(self.last_id, obj);
+        self.last_id
+    }
+
+    /// Searches for a semaphore of id **id** in self
+    pub fn search_semaphore(&self, id: i32) -> Option<&mut Semaphore> {
+        self.semaphores.get(&id)
+    }
+
+    /// Searches for a lock of id **id** in self
+    pub fn search_lock(&self, id:i32) -> Option<&mut Lock> {
+        self.locks.get(&id)
     }
 
     /// Removes the object of id **id** from self if it exists
-    pub fn remove_object_from_key(&mut self, id: i32) {
-        self.map.remove(&id);
+    pub fn remove_semaphore(&mut self, id: i32) {
+        self.semaphores.remove(&id)
     }
 
+    pub fn remove_semaphore(&mut self, id:i32) {
+        self.locks.remove(&id)
+    }
+
+
 }
\ No newline at end of file