Switch STS to SJN

Author: Tarek

StudentOS/Memory.cpp

@@ -16,6 +16,9 @@ bool Memory::sortByAddress(pair<int, int> left, pair<int, int> right) {
 	return left.first < right.first;
 }
 
+bool Memory::sortByMaxCPUTime(PCB* left, PCB* right) {
+	return left->getMaxCPUTime() > right->getMaxCPUTime();
+}
 
 bool Memory::insertNewJob(PCB *newJob) {
 	if (findSpot(newJob->getJobSize()) != -1) {
@@ -29,7 +32,8 @@ bool Memory::insertNewJob(PCB *newJob) {
 		else
 			FST.erase(FST.begin() + i);
 		newJob->setMemoryPos(oldSpace.first);
-		jobs.push(newJob);
+		jobs.push_back(newJob);
+		std::sort(jobs.begin(), jobs.end(), sortByMaxCPUTime);
 	}
 	else 
 		return false;
@@ -88,28 +92,29 @@ void Memory::printFST() {
 PCB * Memory::getNextJob() {
 	if (jobs.empty())
 		NULL;
-	return jobs.front();
+	return jobs.back();
 }
 
 bool Memory::isEmpty() {
 	return jobs.empty();
 }
 
 void Memory::pop() {
-	jobs.pop();
+	jobs.pop_back();
 }
 
 void Memory::push(PCB* p) {
-	jobs.push(p);
+	jobs.push_back(p);
+	std::sort(jobs.begin(), jobs.end(), sortByMaxCPUTime);
 }
 
 int Memory::getCount() {
 	return jobs.size();
 }
 
 void Memory::blockJob() {
-	jobs.front()->setBlocked(true);
-	jobs.pop();
+	jobs.back()->setBlocked(true);
+	jobs.pop_back();
 }
 
 void Memory::killAfterIO(PCB* p) {

StudentOS/Memory.h

@@ -9,7 +9,7 @@ class Memory
 private:
 	vector<pair<int,int> > FST;
 	int findSpot(int);
-	queue<PCB*> jobs;
+	vector<PCB*> jobs;
 	PCB* jobDoingIO;
 public:
 	Memory();
@@ -18,6 +18,7 @@ class Memory
 	bool deleteFromMemory(PCB *);
 	static bool sortBySize(pair<int, int>, pair<int, int>);
 	static bool sortByAddress(pair<int, int>, pair<int, int>);
+	static bool sortByMaxCPUTime(PCB*, PCB*);
 	void printFST();
 	PCB* getNextJob();
 	bool isEmpty();

StudentOS/OS.cpp

@@ -3,7 +3,7 @@
 #include "Memory.h"
 #include <iostream>
 #include <queue>
-
+#include <vector>
 
 Memory memory;
 PCB* beingSwapped;
@@ -29,7 +29,7 @@ void swapOut(int &, int[], PCB *);
 
 void startup()
 {
-	//ontrace();
+	ontrace();
 	// Allows initialization of static system variables declared above.
 	// Called once at start of the simulation.
 }
@@ -40,6 +40,8 @@ void startup()
 // See RUNNING A JOB, below, for additional information
 void Crint(int &a, int p[])
 {
+	if (memory.getCount() + LTS.size() > 48)
+		return;
 	cout << "new job #" << p[1]<< endl;
 	// Indicates the arrival of a new job on the drum.
 	// At call: p [1] = job number
@@ -103,7 +105,7 @@ void Tro(int &a, int p[])
 		runCurrentJob(a,p);
 	}
 	else
-		a = 2;
+		runCurrentJob(a,p);
 }
 void Svc(int &a, int p[])
 {