Ejs 12 y 13

SergiMS-exe · SergiMS-exe · commit 81fcfca888da · 2021-03-19T18:50:30.000+01:00
diff --git a/V1/.vscode/launch.json b/V1/.vscode/launch.json
@@ -10,7 +10,7 @@
             "type": "cppdbg",
             "request": "launch",
             "program": "${workspaceFolder}/Simulator",
-            "args": ["programVerySimple"],
+            "args": ["prog-V1-E12"],
             "stopAtEntry": false,
             "cwd": "${workspaceFolder}",
             "environment": [],
diff --git a/V1/OperatingSystem.c b/V1/OperatingSystem.c
@@ -25,6 +25,7 @@ int OperatingSystem_ExtractFromReadyToRun();
 void OperatingSystem_HandleException();
 void OperatingSystem_HandleSystemCall();
 void OperatingSystem_PrintReadyToRunQueue();
+void OperatingSystem_GiveControl();
 
 // The process table
 PCB processTable[PROCESSTABLEMAXSIZE];
@@ -415,6 +416,15 @@ void OperatingSystem_HandleSystemCall() {
 			ComputerSystem_DebugMessage(73,SYSPROC,executingProcessID,programList[processTable[executingProcessID].programListIndex]->executableName);
 			OperatingSystem_TerminateProcess();
 			break;
+
+		case SYSCALL_YIELD: ;
+			int previousPID, currentPID;
+			previousPID=executingProcessID;
+			OperatingSystem_GiveControl();
+			currentPID=executingProcessID;
+			if (previousPID!=currentPID)
+				ComputerSystem_DebugMessage(115, SHORTTERMSCHEDULE, previousPID, programList[processTable[previousPID].programListIndex]->executableName, currentPID, programList[processTable[currentPID].programListIndex]->executableName);
+			break;
 	}
 }
 	
@@ -437,11 +447,11 @@ void OperatingSystem_PrintReadyToRunQueue() {
 	ComputerSystem_DebugMessage(112,SHORTTERMSCHEDULE);
 	for(i=0;i<2;i++){
 		if(i==0 && numberOfReadyToRunProcesses[i]>0) 
-			ComputerSystem_DebugMessage(113,SHORTTERMSCHEDULE,"");
+			ComputerSystem_DebugMessage(114,SHORTTERMSCHEDULE,"");
 		else if(i==1 && numberOfReadyToRunProcesses[i]>0)
 			ComputerSystem_DebugMessage(114,SHORTTERMSCHEDULE,"");
 		else if(i==0)
-			ComputerSystem_DebugMessage(113,SHORTTERMSCHEDULE,"\n");
+			ComputerSystem_DebugMessage(114,SHORTTERMSCHEDULE,"\n");
 		else
 			ComputerSystem_DebugMessage(114,SHORTTERMSCHEDULE,"\n");
 			
@@ -461,3 +471,15 @@ void OperatingSystem_PrintReadyToRunQueue() {
 	}
 }
 
+void OperatingSystem_GiveControl() {
+	int i,j,PID;
+	for(i=0;i<2;i++){
+		for(j=0;j<numberOfReadyToRunProcesses[i];j++){
+			PID=readyToRunQueue[i][j].info;
+			if (processTable[PID].priority==processTable[executingProcessID].priority){
+				OperatingSystem_PreemptRunningProcess();
+				return;
+			}
+		}
+	}
+}
diff --git a/V1/OperatingSystem.h b/V1/OperatingSystem.h
@@ -26,7 +26,8 @@ enum ProgramTypes { USERPROGRAM, DAEMONPROGRAM };
 enum ProcessStates { NEW, READY, EXECUTING, BLOCKED, EXIT};
 
 // Enumerated type containing the list of system calls and their numeric identifiers
-enum SystemCallIdentifiers { SYSCALL_END=3, SYSCALL_PRINTEXECPID=5};
+//V1 Ej 12: adding SYSCALL_YIELD
+enum SystemCallIdentifiers { SYSCALL_END=3, SYSCALL_YIELD=4, SYSCALL_PRINTEXECPID=5};
 
 // Data structures for multiple queuing
 // V1 Ej 11
diff --git a/V1/Simulator b/V1/Simulator
diff --git a/V1/V1-2-output.log b/V1/V1-2-output.log
@@ -0,0 +1,33 @@
+29 messages loaded from file messagesTCH.txt
+13 messages loaded from file messagesSTD.txt
+0 Asserts Loaded
+User program list:
+	Program[[1;36mprog-V1-E6[0m] with arrival time [[1;36m0[0m]
+[0m	Program[[1;36mprog-V1-E7[0m] with arrival time [[1;36m0[0m]
+[0m	Program[[1;36mprogramMEMADD[0m] with arrival time [[1;36m0[0m]
+[0mNew process [[1;32m3 - SystemIdleProcess[0m] moving to the [[1;32mNEW[0m] state
+[0m[1;32mProcess [3] created from program [SystemIdleProcess][0m
+[0mProcess [[1;32m3 - SystemIdleProcess[0m] moving from the [[1;32mNEW[0m] state to the [[1;32mREADY[0m] state
+[0mReady-to-run_processes_queues:
+USERS:
+DAEMONS: [[1;32m3[0m,100]
+[0m[1;31mERROR: Program [prog-V1-E6] is too big[0m
+[0m[1;31mERROR: Program [prog-V1-E7] is too big[0m
+[0m[1;31mERROR: Program [programMEMADD] is not valid [--- invalid priority or size ---][0m
+[0mProcess [[1;32m3 - SystemIdleProcess[0m] moving from the [[1;32mREADY[0m] state to the [[1;32mEXECUTING[0m] state
+[0mNew Tick (1)
+{0D 000 000} IRET 0 0 (PC: [1;31m183[0m, Accumulator: [1;31m0[0m, PSW: [1;31m0082[0m [[1;31m--------X-----Z-[0m])
+[0mNew Tick (2)
+{04 003 000} TRAP 3 0 (PC: [1;31m184[0m, Accumulator: [1;31m0[0m, PSW: [1;31m0082[0m [[1;31m--------X-----Z-[0m])
+[0mNew Tick (3)
+{0C 002 000} OS 2 0 (PC: [1;31m242[0m, Accumulator: [1;31m0[0m, PSW: [1;31m0082[0m [[1;31m--------X-----Z-[0m])
+[0mNew Tick (4)
+[1;31mProcess [3 - SystemIdleProcess] has requested to terminate[0m
+[0mProcess [[1;32m3 - SystemIdleProcess[0m] moving from the [[1;32mEXECUTING[0m] state to the [[1;32mEXIT[0m] state
+[0m[1;31mThe system will shut down now...
+[0m[0mNew Tick (5)
+{0D 000 000} IRET 0 0 (PC: [1;31m241[0m, Accumulator: [1;31m0[0m, PSW: [1;31m0082[0m [[1;31m--------X-----Z-[0m])
+[0mNew Tick (6)
+{0B 000 000} HALT 0 0 (PC: [1;31m241[0m, Accumulator: [1;31m0[0m, PSW: [1;31m0083[0m [[1;31m--------X-----ZS[0m])
+[0m[1;31mEND of the simulation
+[0m[0m
diff --git a/V1/messagesSTD.txt b/V1/messagesSTD.txt
@@ -15,4 +15,5 @@
 111,Process [@G%d - %s@@] moving from the [@G%s@@] state to the [@G%s@@] state\n
 112,Ready-to-run_processes_queues:\n
 113,USERS:%s
-114,DAEMONS:%s
+114,DAEMONS:%s
+115,Process [@G%d - %s@@] will transfer the control of the processor to process [@G%d - %s@@]\n
diff --git a/V1/prog-V1-E12 b/V1/prog-V1-E12
@@ -0,0 +1,7 @@
+55
+5
+MEMADD 3 20
+WRITE 20
+DIV 20 20
+TRAP 4
+HALT
diff --git a/V1/programVerySimple b/V1/programVerySimple
@@ -1,7 +1,6 @@
 30
 5
 NOP
-TRAP 5
 ADD 10 -13
 WRITE 15
 HALT
diff --git a/V1/readme.txt b/V1/readme.txt
@@ -19,4 +19,11 @@ Ejercicio 6: Se ha modificado OperatingSystem_CreateProcess para que devuelva TO
 Ejercicio 7: Se ha cambiado la funcion OperatingSystem_CreateProcess para que, en la llamada a OperatingSystem_LoadProgram retorne TOOBIDPROCESS si el tamaño del programa es menor que el programa en si
 Ejercicio 8: Modificado el initialPID a PROCESSTABLEMAXSIZE-1 que es el tamaño de la tabla de procesos. Por lo que el PID de los siguientes programas empezara en 0. Pero esto no afecta a la opcion de ejecucion --initialPID
 Ejercicio 9: Creada la funcion OperatingSystem_PrintReadyToRunQueue que imprime la lista de procesos en estado LISTO. Además se le ha llamado en OperatingSystem_MoveToTheREADYState
-Ejercicio 10: Creada la estructura de datos con los nombres de los estados de los procesos (char * statesNames). Ahora se imprime un mensaje cada vez que se cambia de estado a un proceso 
+Ejercicio 10: Creada la estructura de datos con los nombres de los estados de los procesos (char * statesNames). Ahora se imprime un mensaje cada vez que se cambia de estado a un proceso 
+Ejercicio 11: Modificados todos los metodos necewsarios y funciona bien, pero error en la impresion de la cola de programas de usuario
+Ejercicio 12: Creada la funcion OperatingSystem_GiveControl para dar control al siguiente proceso que tenga su la misma prioridad. Añadido en el enum corresponiente SYSCALL_YIELD y su case para el tratamiento de la llamada, la cual se ejecuta con la orden TRAP 4 
+Ejercicio 13:
+    a. Se deben guardar los estados de esos registros para que, después de una interrupción, el proceso vuela al estado en el que estaba.
+    b. También se deberia guardar el registro de acumulador
+    c. Habría que añadir el guardado del registro acumulador en la función
+    d. Afectaria al PCB

-Original file line number
+Diff line change
 +29 messages loaded from file messagesTCH.txt
 +13 messages loaded from file messagesSTD.txt
 +0 Asserts Loaded
 +User program list:
 +	Program[[1;36mprog-V1-E6[0m] with arrival time [[1;36m0[0m]
 +[0m	Program[[1;36mprog-V1-E7[0m] with arrival time [[1;36m0[0m]
 +[0m	Program[[1;36mprogramMEMADD[0m] with arrival time [[1;36m0[0m]
 +[0mNew process [[1;32m3 - SystemIdleProcess[0m] moving to the [[1;32mNEW[0m] state
 +[0m[1;32mProcess [3] created from program [SystemIdleProcess][0m
 +[0mProcess [[1;32m3 - SystemIdleProcess[0m] moving from the [[1;32mNEW[0m] state to the [[1;32mREADY[0m] state
 +[0mReady-to-run_processes_queues:
 +USERS:
 +DAEMONS: [[1;32m3[0m,100]
 +[0m[1;31mERROR: Program [prog-V1-E6] is too big[0m
 +[0m[1;31mERROR: Program [prog-V1-E7] is too big[0m
 +[0m[1;31mERROR: Program [programMEMADD] is not valid [--- invalid priority or size ---][0m
 +[0mProcess [[1;32m3 - SystemIdleProcess[0m] moving from the [[1;32mREADY[0m] state to the [[1;32mEXECUTING[0m] state
 +[0mNew Tick (1)
 +{0D 000 000} IRET 0 0 (PC: [1;31m183[0m, Accumulator: [1;31m0[0m, PSW: [1;31m0082[0m [[1;31m--------X-----Z-[0m])
 +[0mNew Tick (2)
 +{04 003 000} TRAP 3 0 (PC: [1;31m184[0m, Accumulator: [1;31m0[0m, PSW: [1;31m0082[0m [[1;31m--------X-----Z-[0m])
 +[0mNew Tick (3)
 +{0C 002 000} OS 2 0 (PC: [1;31m242[0m, Accumulator: [1;31m0[0m, PSW: [1;31m0082[0m [[1;31m--------X-----Z-[0m])
 +[0mNew Tick (4)
 +[1;31mProcess [3 - SystemIdleProcess] has requested to terminate[0m
 +[0mProcess [[1;32m3 - SystemIdleProcess[0m] moving from the [[1;32mEXECUTING[0m] state to the [[1;32mEXIT[0m] state
 +[0m[1;31mThe system will shut down now...
 +[0m[0mNew Tick (5)
 +{0D 000 000} IRET 0 0 (PC: [1;31m241[0m, Accumulator: [1;31m0[0m, PSW: [1;31m0082[0m [[1;31m--------X-----Z-[0m])
 +[0mNew Tick (6)
 +{0B 000 000} HALT 0 0 (PC: [1;31m241[0m, Accumulator: [1;31m0[0m, PSW: [1;31m0083[0m [[1;31m--------X-----ZS[0m])
 +[0m[1;31mEND of the simulation
 +[0m[0m
Original file line number	Diff line number	Diff line change
`@@ -1,7 +1,6 @@`
`1`	`1`	`30`
`2`	`2`	`5`
`3`	`3`	`NOP`
`4`		`-TRAP 5`
`5`	`4`	`ADD 10 -13`
`6`	`5`	`WRITE 15`
`7`	`6`	`HALT`