Archivos bien de la V3 y ej 0

Author: SergiMS-exe

V3/ComputerSystem.c

@@ -16,6 +16,10 @@ PROGRAMS_DATA *programList[PROGRAMSMAXNUMBER];
 
 // Students messages 
 char STUDENT_MESSAGES_FILE[MAXIMUMLENGTH]="messagesSTD.txt";
+ 
+// V3 Ej 0a
+heapItem arrivalTimeQueue[PROGRAMSMAXNUMBER];
+int numberOfProgramsInArrivalTimeQueue=0;
 
 // Powers on of the Computer System.
 void ComputerSystem_PowerOn(int argc, char *argv[], int paramIndex) {

V3/ComputerSystem.h

@@ -1,6 +1,8 @@
 #ifndef COMPUTERSYSTEM_H
 #define COMPUTERSYSTEM_H
 
+#define ARRIVALQUEUE            // V3 Ej0b
+
 #include "Simulator.h"
 #include "ComputerSystemBase.h"
 
@@ -27,6 +29,8 @@ void ComputerSystem_PrintProgramList();
 #define ERROR 'e'				// Error messages
 #define CLOCK 'c'				// Clock time messages
 
+
+
 // Basic data to collect about every program to be created
 // User programs specified in the command line: name of the file, the time of its arrival time
 // 												to the system (0, by default), and type USERPROGRAM

V3/ComputerSystemBase.c

@@ -29,6 +29,12 @@ int intervalBetweenInterrupts = DEFAULT_INTERVAL_BETWEEN_INTERRUPTS; // Default
 // Only one colour messages. Set to 1 for more colours checking uppercase in debugLevel
 int COLOURED = 0 ;
 
+#ifdef ARRIVALQUEUE
+	char * typeProgramNames []={"USER","DAEMONS"}; 
+	extern heapItem arrivalTimeQueue[];
+	extern int numberOfProgramsInArrivalTimeQueue;
+#endif
+
 // Fill in the array named userProgramsList with the information given
 // by the user in the command line
 // IT IS NOT NECESSARY TO COMPLETELY UNDERSTAND THIS FUNCTION
@@ -205,3 +211,36 @@ void ComputerSystem_DebugMessage(int msgNo, char section, ...) {
 void ComputerSystem_ShowTime(char section) {
       ComputerSystem_DebugMessage(Processor_PSW_BitState(EXECUTION_MODE_BIT)?95:94,section,Clock_GetTime());
 }
+
+// Fill ArrivalTimeQueue heap with user program from parameters and daemons 
+void ComputerSystem_FillInArrivalTimeQueue() {
+#ifdef ARRIVALQUEUE
+
+  int arrivalIndex = 0; 
+
+	while (programList[arrivalIndex]!=NULL && arrivalIndex<PROGRAMSMAXNUMBER) {
+	  Heap_add(arrivalIndex,arrivalTimeQueue,QUEUE_ARRIVAL,&arrivalIndex,PROGRAMSMAXNUMBER);
+	}
+	numberOfProgramsInArrivalTimeQueue=arrivalIndex;
+#endif
+}
+
+// Print arrivalTiemQueue program information
+void ComputerSystem_PrintArrivalTimeQueue(){
+#ifdef ARRIVALQUEUE
+  int i;
+  
+  if (numberOfProgramsInArrivalTimeQueue>0) {
+	OperatingSystem_ShowTime(LONGTERMSCHEDULE);
+	// Show message "Arrival Time Queue: "
+	ComputerSystem_DebugMessage(100,LONGTERMSCHEDULE,"Arrival Time Queue:\n");
+	for (i=0; i< numberOfProgramsInArrivalTimeQueue; i++) {
+	  // Show message [executableName,arrivalTime]
+	  ComputerSystem_DebugMessage(78,LONGTERMSCHEDULE,programList[arrivalTimeQueue[i].info]->executableName,
+			programList[arrivalTimeQueue[i].info]->arrivalTime,
+			typeProgramNames[programList[arrivalTimeQueue[i].info]->type]);
+	}
+  }
+ #endif
+}
+

V3/ComputerSystemBase.h

@@ -2,16 +2,26 @@
 #define COMPUTERSYSTEMBASE_H
 
 #include "ComputerSystem.h"
+#include "Heap.h"
 
 // Functions prototypes
 int ComputerSystem_ObtainProgramList(int , char *[], int);
 void ComputerSystem_DebugMessage(int, char , ...);
 void ComputerSystem_ShowTime(char);
+void ComputerSystem_FillInArrivalTimeQueue();
+void ComputerSystem_PrintArrivalTimeQueue();
 
 // This "extern" declarations enables other source code files to gain access to the variables 
 extern char defaultDebugLevel[];
 extern int intervalBetweenInterrupts;
 
+extern int endSimulationTime; // For end simulation forced by time
+
+#ifdef ARRIVALQUEUE
+extern int numberOfProgramsInArrivalTimeQueue;
+extern heapItem arrivalTimeQueue[];
+#endif
+
 #define DEFAULT_INTERVAL_BETWEEN_INTERRUPTS 5
 
 #endif

V3/Heap.c

@@ -109,6 +109,11 @@ int Heap_compare_wakeup(int value1, int value2) {
 #endif
 }
 
+// Auxiliary for arrival-time comparations
+int Heap_compare_arrival(int value1, int value2) {
+  return programList[value2]->arrivalTime - programList[value1]->arrivalTime;
+}
+
 // Auxiliary for assert-time comparations
 int Heap_compare_assertsTime(int value1, int value2) {
   return asserts[value2].time - asserts[value1].time;
@@ -124,6 +129,9 @@ int Heap_compare(heapItem value1, heapItem value2, int queueType) {
 	case QUEUE_PRIORITY:
 		primaryKey= Heap_compare_priority(value1.info, value2.info);
 		break;
+	case QUEUE_ARRIVAL:
+		primaryKey= Heap_compare_arrival(value1.info, value2.info);
+		break;
 	case QUEUE_ASSERTS:
 		primaryKey= Heap_compare_assertsTime(value1.info, value2.info);
 		break;

V3/Heap.h

@@ -3,6 +3,7 @@
 
 #define QUEUE_WAKEUP 0
 #define QUEUE_PRIORITY 1
+#define QUEUE_ARRIVAL 2
 #define QUEUE_ASSERTS 3
 
 typedef struct  {
@@ -14,7 +15,7 @@ typedef struct  {
 // Implements the extraction operation (the element with the highest priority).
 // Parameters are:
 //    heap: the corresponding queue: readyToRun, asserts, UserProgramList or sleepingQueue
-//    queueType: if sleeping queue, QUEUE_WAKEUP; if ready to run queue, QUEUE_PRIORITY; if asserts QUEUE_ASSERTS;
+//    queueType: if sleeping queue, QUEUE_WAKEUP; if ready to run queue, QUEUE_PRIORITY; if asserts QUEUE_ASSERTS; if userProgramList, QUEUE_ARRIVAL
 //    numElem: number of current elements inside the queue, if successful is decremented by one
 // Returns: the item with the highest priority in the queue, if everything went ok
 int Heap_poll(heapItem[], int, int*);
@@ -23,7 +24,7 @@ int Heap_poll(heapItem[], int, int*);
 // Parameters are:
 //    info: item to be inserted
 //    heap: the corresponding queue: readyToRun, asserts,  UserProgramList or sleepingQueue
-//    queueType: if sleeping queue, QUEUE_WAKEUP; if ready to run queue, QUEUE_PRIORITY; if asserts QUEUE_ASSERTS; 
+//    queueType: if sleeping queue, QUEUE_WAKEUP; if ready to run queue, QUEUE_PRIORITY; if asserts QUEUE_ASSERTS; if userProgramList, QUEUE_ARRIVAL
 //    numElem: number of current elements inside the queue, if successful is increased by one
 //    limit: maximum capacity of the queue
 // return 0/-1  ok/fail
@@ -33,7 +34,7 @@ int Heap_add(int, heapItem[], int , int*, int);
 // Parameters are:
 // 	Position one
 // 	Position two
-//    queueType: if sleeping queue, QUEUE_WAKEUP; if ready to run queue, QUEUE_PRIORITY; if asserts QUEUE_ASSERTS; 
+//    queueType: if sleeping queue, QUEUE_WAKEUP; if ready to run queue, QUEUE_PRIORITY; if asserts QUEUE_ASSERTS; if userProgramList, QUEUE_ARRIVAL
 int Heap_compare(heapItem, heapItem, int);
 
 // Return top value of heap

V3/OperatingSystem.c

@@ -97,6 +97,10 @@ void OperatingSystem_Initialize(int daemonsIndex) {
 	// Include in program list  all system daemon processes
 	OperatingSystem_PrepareDaemons(daemonsIndex);
 
+	ComputerSystem_FillInArrivalTimeQueue(); //V3 Ej 0c
+
+	OperatingSystem_PrintStatus(); //V3 Ej 0d
+
 	// Create all user processes from the information given in the command line
 	int createdProcesses = OperatingSystem_LongTermScheduler();
 	//V1 Ej 15

V3/OperatingSystemBase.c

@@ -35,10 +35,24 @@ int OperatingSystem_ObtainAnEntryInTheProcessTable() {
 
 	while (index<PROCESSTABLEMAXSIZE) {
 		entry = (orig+index)%PROCESSTABLEMAXSIZE;
-		if (processTable[entry].busy==0)
+		if (processTable[entry].busy==0) {
 			return entry;
-		else
-			index++;
+		}
+		else {
+			if (++index==PROCESSTABLEMAXSIZE) { // if no entries free, remove zombie proceses
+				int i;
+				for (i=0;i<PROCESSTABLEMAXSIZE;i++)
+					if (processTable[i].busy && (processTable[i].state==EXIT)) {
+						OperatingSystem_ShowTime(SYSPROC);
+						ComputerSystem_DebugMessage(79,SYSPROC
+							,i,programList[processTable[i].programListIndex]->executableName
+							,processTable[i].processSize
+							,processTable[i].initialPhysicalAddress);
+						processTable[i].busy=0;
+						index=0; // New search after liberation of PCB
+					}
+			}
+		}
 	}
 	return NOFREEENTRY;
 }
@@ -215,13 +229,20 @@ int OperatingSystem_PrepareTeachersDaemons(int programListDaemonsBase){
 
 
 void OperatingSystem_ReadyToShutdown(){
+	int sipIdPCtoShutdown=processTable[sipID].initialPhysicalAddress+processTable[sipID].processSize-1;
 	// Simulation must finish (done by modifying the PC of the System Idle Process so it points to its 'TRAP 3' instruction,
 	// located at the last memory position used by that process, and dispatching sipId (next ShortTermSheduled)
-	processTable[sipID].copyOfPCRegister=processTable[sipID].initialPhysicalAddress+processTable[sipID].processSize-1;
+	if (executingProcessID==sipID)
+		Processor_CopyInSystemStack(MAINMEMORYSIZE-1, sipIdPCtoShutdown);
+	else
+		processTable[sipID].copyOfPCRegister=sipIdPCtoShutdown;
 }
 
 void OperatingSystem_TerminatingSIP() {
-	Processor_CopyInSystemStack(MAINMEMORYSIZE-1,OS_address_base+1);
+	processTable[sipID].copyOfPCRegister=OS_address_base+1; 
+	Processor_CopyInSystemStack(MAINMEMORYSIZE-1,processTable[sipID].copyOfPCRegister);
+	processTable[sipID].copyOfPSWRegister|= ((unsigned int) 1) << INTERRUPT_MASKED_BIT;
+	Processor_CopyInSystemStack(MAINMEMORYSIZE-2,processTable[sipID].copyOfPSWRegister);
 	executingProcessID=NOPROCESS;
 }
 
@@ -237,7 +258,7 @@ void OperatingSystem_PrintStatus(){
 	OperatingSystem_PrintReadyToRunQueue();  // Show Ready to run queues implemented for students
 	OperatingSystem_PrintSleepingProcessQueue(); // Show Sleeping process queue
 	OperatingSystem_PrintProcessTableAssociation(); // Show PID-Program's name association
-
+	ComputerSystem_PrintArrivalTimeQueue(); // Show arrival queue of programs
 }
 
  // Show Executing process information
@@ -267,8 +288,10 @@ void OperatingSystem_PrintSleepingProcessQueue(){
 	if (numberOfSleepingProcesses>0)
 		for (i=0; i< numberOfSleepingProcesses; i++) {
 			// Show message [PID, priority, whenToWakeUp]
-			ComputerSystem_DebugMessage(75,SHORTTERMSCHEDULE,
-			sleepingProcessesQueue[i].info,processTable[sleepingProcessesQueue[i].info].priority,processTable[sleepingProcessesQueue[i].info].whenToWakeUp);
+			ComputerSystem_DebugMessage(75,SHORTTERMSCHEDULE
+				, sleepingProcessesQueue[i].info
+				, processTable[sleepingProcessesQueue[i].info].priority
+				, processTable[sleepingProcessesQueue[i].info].whenToWakeUp);
 			if (i<numberOfSleepingProcesses-1)
 	  			ComputerSystem_DebugMessage(100,SHORTTERMSCHEDULE,", ");
   		}
@@ -292,3 +315,29 @@ void OperatingSystem_PrintProcessTableAssociation() {
   }
 }
 
+// This function returns:
+// 		EMPTYQUEUE (-1) if no programs in arrivalTimeQueue
+//		YES (1) if any program arrivalTime is now
+//		NO (0) else
+// considered by the LTS to create processes at the current time
+int OperatingSystem_IsThereANewProgram() {
+#ifdef ARRIVALQUEUE
+        int currentTime;
+		int programArrivalTime;
+		int indexInProgramList = Heap_getFirst(arrivalTimeQueue,numberOfProgramsInArrivalTimeQueue);
+
+		if (indexInProgramList < 0)
+		  return EMPTYQUEUE;  // No new programs in command line list of programs
+		
+		// Get the current simulation time
+        currentTime = Clock_GetTime();
+		
+		// Get arrivalTime of next program
+		programArrivalTime = programList[indexInProgramList]->arrivalTime; 
+
+		if (programArrivalTime <= currentTime)
+		  return YES;  //  There'is new program to start
+#endif		 
+		return NO;  //  No program in current time
+}
+

V3/OperatingSystemBase.h

@@ -18,15 +18,20 @@ int OperatingSystem_PrepareTeachersDaemons(int);
 void OperatingSystem_ShowTime(char);
 void OperatingSystem_PrintStatus();
 void OperatingSystem_PrintReadyToRunQueue();
-void OperatingSystem_PrepareDaemons(int);
-int OperatingSystem_PrepareTeachersDaemons(int);
+int OperatingSystem_IsThereANewProgram();
+
+#define EMPTYQUEUE -1
+#define NO 0
+#define YES 1
 
 #ifdef SLEEPINGQUEUE
 extern heapItem sleepingProcessesQueue[];
 extern int numberOfSleepingProcesses; 
 #endif
 
-// Begin indes for daemons in programList
-// extern int baseDaemonsInProgramList; 
+#ifdef ARRIVALQUEUE
+extern int numberOfProgramsInArrivalTimeQueue;
+extern heapItem arrivalTimeQueue[];
+#endif
 
 #endif

V3/V1-2-Simulator.UO271563

@@ -20,6 +20,11 @@
 75,[@G%d@@, %d, @R%d@@]
 76,\t\tPID: @G%d@@ -> %s\n
 
+// 77,PID association with program's name:\n
+78,\t\t[@G%s@@, @R%d@@, @G%s@@]\n
+79,Zombie process [@R%d@@ -> @R%s@@], with size [@R%d@@] and initial address [@R%d@@] is removed from system\n
+
+
 // Assert system messages
 81,Using asserts file: %s\nMaximum number of asserts: %d\n
 82,%d Asserts Loaded\n

V3/messagesTCH.txt

@@ -1,26 +1,2 @@
-Ej 1:
-    Se han añadido las llamadas a los metodos que muestran los tics de reloj antes de cada mensaje
-Ej 2:
-    a: añadido el CLOCKINT_BIT=9 al interruptLines_CPU del Processor.h. Además tambien hubo que inicializar el vector de interrupciones
-    b: Creada la funcion de manejo de interrupciones de reloj
-    c: En OperatingSystem_InterruptLogic se ha añadido otro case para CLOCKINT_BIT que llame a OperatingSystem_HandleClockInterrupt
-    d: En Clock_Update se ha añadido un if para controlar si han pasado intervalBetweenInterrupts unidades de tiempo. Por alguna razon, si llamo a Processor_RaiseInterruption, entra en bucle infinito, por lo que de momento he llamado a OperatingSystem_InterruptLogic
-Ej 3:
-    a: Añadido INTERRUPT_MASKED_BIT=15 a PSW_BITS en Processor.h
-    b: Añadidas las lineas que se ordenan en Processor_ShowPSW
-    c/e: En Processor_ManageInterrupts se ha hecho la llamada a Processor_ActivatePSW_Bit(INTERRUPT_MASKED_BIT) para que active tambien el bit de enmascarado
-Ej 4:
-    Añadidas las llamadas a las funciones debugMessage y showTime en OperatingSystem_HandleClockInterrupt()
-Ej 5:
-    Introducida la nueva llamada al sistema de procesos bloqueados
-    Añadidas las variables necesarias en el PCB y en OperatingSystem.c y OperatingSystem.h
-    Añadida la llamada SYSCALL_SLEEP y en su case correspondiente, llamada a la funcion OperatingSystem_MoveToTheBLOCKEDState, donde se calcula whenToWakeUp y se hacen otras operaciones necesarias
-    , ademas de llamar a PintStatus al final del metodo
-Ej 6:
-    Añadido un bucle en la funcion OperatingSystem_HandleClockInterrupt para comprobar qué procesos tienen que ser despertados. Si tienen que despertarse se llama a una funcion que lo hace
-    Tras mostrar el estado del simulador si ha habido algun cambio, se comprueba si el proceso actual es el que mas prioridad tiene. Si no es asi, se echa y se ejecuta el mas prioritario mostrando el mensaje pertinente
-    Si ha habido algun cambio de proceso, se vuelve a imprimir el estado del sistema
-Ej 7:
-    Se llama a PrintStatus en los puntos indicados: Al final del tratamiento de SYSCALL_YIELD si ha habido cambio de proceso; al final del tratamiento de SYSCALL_END; al final del manejador de excepciones y al final de la ejecucion del PLP si se ha creado algun proceso
-Ej 8:
-    Se ha comentado la llamada a la funcion que imprime la cola de listos dentro de la funcion OperatingSystem_MoveToTheREADYState
+Ej 0:
+