Fix dei commit 68ea2a3 #19 1c25def #12

jjak0b · May 20, 2020 · f58378c · f58378c
1 parent 68ea2a3
commit f58378c
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 12 deletions.
diff --git a/src/handler/shared.c b/src/handler/shared.c
@@ -135,22 +135,20 @@ int Sys6_DoIO( word command, word *devregAddr, int subdevice ) {
     int *semKey = device_GetSem( devLine, devNo, subdevice );
     int b_error = semKey == NULL;
     pcb_t *pid = scheduler_GetRunningProcess();
-    if( !b_error ) {
-        b_error = semaphore_P( semKey, pid );
+
     // un semaforo di un device è sempre almeno inizializzato a 0, e quindi è sempre sospeso
-        if( !b_error && *semKey >= 0 ){
-            if( devLine == IL_TERMINAL ) {
-                if( !subdevice ) {
-                    devreg->term.transm_command = command;
-                }
-                else {
-                    devreg->term.recv_command = command;
-                }
+    if( !b_error && *semKey >= 0 && !(b_error = semaphore_P( semKey, pid ) ) ) {
+        if( devLine == IL_TERMINAL ) {
+            if( !subdevice ) {
+                devreg->term.transm_command = command;
             }
             else {
-                devreg->dtp.command = command;
+                devreg->term.recv_command = command;
             }
         }
+        else {
+            devreg->dtp.command = command;
+        }
     }
     return b_error;
 }

diff --git a/src/scheduler/scheduler.c b/src/scheduler/scheduler.c
@@ -234,7 +234,7 @@ int scheduler_RemoveProgeny( pcb_t* p ) {
      * e poi elimina il padre appena elaborato dallo stack per deallocarlo
      */
 
-	if( !scheduler_RemoveProcessFromAnyQ( parent ) ){
+	if( scheduler_RemoveProcessFromAnyQ( parent ) ){
 		return -1;
 	}
 	list_add( &p->p_next, &pcb_stack );

diff --git a/src/utilities/semaphore.c b/src/utilities/semaphore.c
@@ -7,6 +7,7 @@ int semaphore_P( int *semkey, pcb_t * p ) {
     int b_error = 0;
     if( --(*semkey) < 0 ) {
         b_error = scheduler_StateToWaiting( p, semkey );
+        if( b_error ) ++(*semkey);
     }
     return b_error;
 }