Ej 5 V2 mas varios cambios

Author: SergiMS-exe

V2/Clock.c

@@ -5,17 +5,12 @@
 #include "OperatingSystem.h"
 
 int tics=0;
-int numberOfClockInterrupts = 0; //V2 Ej 4
+
 
 void Clock_Update() {
 	tics++;
 	if (tics>=intervalBetweenInterrupts && tics%intervalBetweenInterrupts==0){
-		numberOfClockInterrupts++;
-		//V2 Ej4
-		OperatingSystem_ShowTime(INTERRUPT); 
-    	ComputerSystem_DebugMessage(120,INTERRUPT,numberOfClockInterrupts);
-		
-		OperatingSystem_InterruptLogic(CLOCKINT_BIT); //V2 Ej 2
+		Processor_RaiseInterrupt(CLOCKINT_BIT); //V2 Ej 2
 	}
 }
 

V2/OperatingSystem.c

@@ -28,6 +28,7 @@ void OperatingSystem_HandleSystemCall();
 void OperatingSystem_PrintReadyToRunQueue();
 void OperatingSystem_GiveControl();
 void OperatingSystem_HandleClockInterrupt();
+void OperatingSystem_MoveToTheBLOCKEDState();
 
 // The process table
 PCB processTable[PROCESSTABLEMAXSIZE];
@@ -38,6 +39,9 @@ int OS_address_base = PROCESSTABLEMAXSIZE * MAINMEMORYSECTIONSIZE;
 // Identifier of the current executing process
 int executingProcessID=NOPROCESS;
 
+// Variable containing the number of interruption clocks (V2 Ej 4)
+int numberOfClockInterrupts = 0; 
+
 // Identifier of the System Idle Process
 int sipID;
 
@@ -60,6 +64,10 @@ heapItem readyToRunQueue [NUMBEROFQUEUES][PROCESSTABLEMAXSIZE];
 int numberOfReadyToRunProcesses[NUMBEROFQUEUES]={0,0};
 char * queueNames [NUMBEROFQUEUES]={"USER","DAEMONS"};
 
+// Exercise 5-b of V2 
+// Heap with blocked processes sort by when to wakeup 
+heapItem sleepingProcessesQueue[PROCESSTABLEMAXSIZE]; 
+int numberOfSleepingProcesses=0;
 
 // Initial set of tasks of the OS
 void OperatingSystem_Initialize(int daemonsIndex) {
@@ -447,9 +455,14 @@ void OperatingSystem_HandleSystemCall() {
 			break;
 
 		//V1 Ej 12
-		case SYSCALL_YIELD: ;
+		case SYSCALL_YIELD: 
 			OperatingSystem_GiveControl();
 			break;
+		
+		//V2 Ej 5
+		case SYSCALL_SLEEP:
+			OperatingSystem_MoveToTheBLOCKEDState();
+			break;
 	}
 }
 
@@ -506,5 +519,21 @@ void OperatingSystem_GiveControl() {
 
 // Exercise 2-b of V2
 void OperatingSystem_HandleClockInterrupt() {
+	numberOfClockInterrupts++;
+
+	//V2 Ej4
+	OperatingSystem_ShowTime(INTERRUPT); 
+	ComputerSystem_DebugMessage(120,INTERRUPT,numberOfClockInterrupts);
+
 	return;
+}
+
+// V2 Ej5
+void OperatingSystem_MoveToTheBLOCKEDState() {
+	processTable[executingProcessID].whenToWakeUp=abs(processTable[executingProcessID].copyOfAccumulator) + numberOfClockInterrupts + 1;
+	if (Heap_add(executingProcessID, sleepingProcessesQueue, QUEUE_WAKEUP, numberOfSleepingProcesses, PROCESSTABLEMAXSIZE)>=0){
+		processTable[executingProcessID].state=BLOCKED;
+		OperatingSystem_SaveContext(PID);
+		OperatingSystem_PrintStatus();
+	}
 }

V2/OperatingSystem.h

@@ -19,6 +19,9 @@
 
 #define NOPROCESS -1
 
+// V2 Ej 5c
+#define SLEEPINGQUEUE
+
 // Contains the possible type of programs
 enum ProgramTypes { USERPROGRAM, DAEMONPROGRAM }; 
 
@@ -46,6 +49,7 @@ typedef struct {
 	unsigned int copyOfPSWRegister;
 	int programListIndex;
 	int queueID;
+	int whenToWakeUp;  // Exercise 5-a of V2
 } PCB;
 
 // These "extern" declaration enables other source code files to gain access

V2/OperatingSystemCode

@@ -6,4 +6,5 @@ OS 2 // SysCall Interrupt
 IRET
 OS 6 // Exception Interrupt
 IRET
-
+OS 9 // Clock interrupt
+IRET

V2/Processor.c

@@ -250,8 +250,9 @@ void Processor_DecodeAndExecuteInstruction() {
 
 // Hardware interrupt processing
 void Processor_ManageInterrupts() {
-  
-	int i;
+	
+	if(!Processor_PSW_BitState(INTERRUPT_MASKED_BIT)){
+		int i;
 
 		for (i=0;i<INTERRUPTTYPES;i++)
 			// If an 'i'-type interrupt is pending
@@ -260,14 +261,16 @@ void Processor_ManageInterrupts() {
 				Processor_ACKInterrupt(i);
 				// Copy PC and PSW registers in the system stack
 				Processor_CopyInSystemStack(MAINMEMORYSIZE-1, registerPC_CPU);
-				Processor_CopyInSystemStack(MAINMEMORYSIZE-2, registerPSW_CPU);	
+				Processor_CopyInSystemStack(MAINMEMORYSIZE-2, registerPSW_CPU);    
+				Processor_CopyInSystemStack(MAINMEMORYSIZE-3, registerAccumulator_CPU);    
 				// Activate protected excution mode
 				Processor_ActivatePSW_Bit(EXECUTION_MODE_BIT);
 				Processor_ActivatePSW_Bit(INTERRUPT_MASKED_BIT); //V2 Ej 3
 				// Call the appropriate OS interrupt-handling routine setting PC register
 				registerPC_CPU=interruptVectorTable[i];
 				break; // Don't process another interrupt
 			}
+	}
 }
 
 char * Processor_ShowPSW(){

V2/Processor.h

@@ -14,7 +14,7 @@ enum PSW_BITS {POWEROFF_BIT=0, ZERO_BIT=1, NEGATIVE_BIT=2, OVERFLOW_BIT=3, EXECU
 
 // Enumerated type that connects bit positions in the interruptLines with
 // interrupt types 
-enum INT_BITS {SYSCALL_BIT=2, EXCEPTION_BIT=6, CLOCKINT_BIT=9}; //CLOCKINT_BIT=9 V2 Ej 2a
+enum INT_BITS {SYSCALL_BIT=2, EXCEPTION_BIT=6, SYSCALL_SLEEP=7, CLOCKINT_BIT=9}; //CLOCKINT_BIT=9 V2 Ej 2a - SYSCALL_SLEEP=7 V2 Ej 5
 
 // Functions prototypes
 void Processor_InitializeInterruptVectorTable();