Cleaned prints

Author: Akter8

README.txt

@@ -59,9 +59,11 @@ For a given in-phase input task set consisting of periodic tasks [Read the input
 * utilityFunctions.c - Some utility functions.
 * printInfo.c - Prints the data in the ADTs and the scheduling information onto the output file.
 * scheduler.c - The module associated with the scheduling of periodic + non-periodic jobs
+
 #### Once the program is compiled
 * executableName (variable in the Makefile) - The final executable.
 * .o files for all .c files 
+
 #### Once the program is run
 * outputFile (variable in the Makefile) - The output file.
 * periodicSchedule.txt - The file containing the information about every frame and the periodic tasks in them.
@@ -96,6 +98,7 @@ For a given in-phase input task set consisting of periodic tasks [Read the input
 10	3.5	10
 20	0.9	20
 We could get away with splitting jobs of T2 into 4. But the INF algorithm might choose to split T2 into 3 and T3 into 2.
+13. This simulation does not consider any I/O operations or any voluntary suspensions by any jobs which is not the norm in the real world systems.
 
 
 
@@ -112,7 +115,4 @@ Please change the input files according to convenience and in the right format.
 ## Inputs required
 1. periodicTasks.txt (CLI argument): First line should have the number of tasks in the task set. Subsequent lines should have 3 integers- period, wcet and relative deadline respectively.
 2. APERIODIC_JOB_FILE: First line should have the number of tasks in the task set. Subsequent lines should have 2 integers- arrival time and execution time respectively.
-3. SPORADIC_JOB_FILE: First line should have the number of tasks in the task set. Subsequent lines should have 3 integers- arrival time, execution time and absolute deadline respectively.
-
-
-### Known bugs
+3. SPORADIC_JOB_FILE: First line should have the number of tasks in the task set. Subsequent lines should have 3 integers- arrival time, execution time and absolute deadline respectively.

periodicTasks.txt

@@ -1,8 +1,9 @@
 4
-414
-5	1	5
+517
+6	2	12
 10	1	10
-20	2	20
+15	1	15
+
 
 -----------------------------------------------------
 How to write input:

printInfo.c

@@ -264,7 +264,7 @@ printRunTimeSchedulingInfo(ScheduleFrame *framesData, int numFrames, int frameSi
 
 avg = avg + tasks[i].responseTimes[j];
 }
-fprintf(outputFile, "; Max: %0.1f, Min: %0.1f, Avg: %0.1f\n", max, min, avg / tasks[i].numInstances);
+fprintf(outputFile, "\n\t(Max: %0.1f, Min: %0.1f, Avg: %0.1f)\n", max, min, avg / tasks[i].numInstances);
 }
 fprintf(outputFile, "\n");
 
@@ -288,7 +288,7 @@ printRunTimeSchedulingInfo(ScheduleFrame *framesData, int numFrames, int frameSi
 
 avg = avg + tasks[i].executionTimes[j];
 }
-fprintf(outputFile, "; Max: %0.1f, Min: %0.1f, Avg: %0.1f\n", max, min, avg / tasks[i].numInstances);
+fprintf(outputFile, "\n\t(Max: %0.1f, Min: %0.1f, Avg: %0.1f)\n", max, min, avg / tasks[i].numInstances);
 }
 fprintf(outputFile, "\n");
 
@@ -312,7 +312,7 @@ printRunTimeSchedulingInfo(ScheduleFrame *framesData, int numFrames, int frameSi
 
 avg = avg + tasks[i].responseTimes[j] - tasks[i].executionTimes[j];
 }
-fprintf(outputFile, "; Max: %0.1f, Min: %0.1f, Avg: %0.1f\n", max, min, avg / tasks[i].numInstances);
+fprintf(outputFile, "\n\t(Max: %0.1f, Min: %0.1f, Avg: %0.1f)\n", max, min, avg / tasks[i].numInstances);
 }
 fprintf(outputFile, "\n");
 

scheduler.c

@@ -218,7 +218,7 @@ SporadicJob
 {
 if (sporadicJobs[i].alive && sporadicJobs[i].accepted && !sporadicJobs[i].rejected && sporadicJobs[i].startFrame <= frameNum && sporadicJobs[i].maxFrame > frameNum)
 {
-fprintf(outputFile, "Adding sporadic job: S%d\n", sporadicJobs[i].jobNum);
+fprintf(outputFile, "Sporadic Job: Adding sporadic job: S%d\n", sporadicJobs[i].jobNum);
 sporadicJobsThisFrame[index++] = sporadicJobs[i];
 *reduceSlackBy += ((sporadicJobs[i].timeLeft < slack - *reduceSlackBy) ? sporadicJobs[i].timeLeft : slack -*reduceSlackBy);
 jobsThisFrame++;
@@ -246,7 +246,7 @@ SporadicJob
 
 if (countSlack < sporadicJobs[i].wcet)// Rejecting after condition-1.
 {
-fprintf(outputFile, "Rejected Sporadic job %d\n", sporadicJobs[i].jobNum);
+fprintf(outputFile, "Sporadic Job: Rejected Sporadic job S%d\n", sporadicJobs[i].jobNum);
 sporadicJobs[i].rejected = true;
 sporadicJobs[i].accepted = false;
 continue;
@@ -269,14 +269,14 @@ SporadicJob
 
 if (countSlack - acceptedTime < sporadicJobs[i].wcet) // If rejected after condition-2.
 {
-fprintf(outputFile, "Rejected Sporadic job %d\n", sporadicJobs[i].jobNum);
+fprintf(outputFile, "Sporadic Job: Rejected Sporadic job S%d\n", sporadicJobs[i].jobNum);
 sporadicJobs[i].rejected = true;
 sporadicJobs[i].accepted = false;
 continue;
 }
 else // Else if accepted after both condition checks.
 {
-fprintf(outputFile, "Accepted Sporadic job: S%d\n", sporadicJobs[i].jobNum);
+fprintf(outputFile, "Sporadic Job: Accepted Sporadic job: S%d\n", sporadicJobs[i].jobNum);
 sporadicJobs[i].accepted = true;
 sporadicJobs[i].rejected = false;
 *reduceSlackBy += ((sporadicJobs[i].timeLeft < slack - *reduceSlackBy) ? sporadicJobs[i].timeLeft : slack -*reduceSlackBy);
@@ -291,8 +291,8 @@ SporadicJob
 if (jobsThisFrame == 0)
 *reduceSlackBy = 0;
 
-fprintf(outputFile, "Sporadic jobsThisFrame: %d\n", jobsThisFrame);
-fprintf(outputFile, "Reducing slack by: %0.1f\n", *reduceSlackBy);
+fprintf(outputFile, "Sporadic Job: Number of Sporadic Job this frame: %d\n", jobsThisFrame);
+fprintf(outputFile, "Reducing slack by (due to acceptance of SJ): %0.1f\n", *reduceSlackBy);
 *numJobsThisFrame = jobsThisFrame;
 sporadicJobsThisFrame = realloc(sporadicJobsThisFrame, sizeof(SporadicJob) * jobsThisFrame);