Popravljen SPF

pfe-rs · Mar 29, 2024 · 0fa0bd1 · 0fa0bd1
1 parent a50c01f
commit 0fa0bd1
Show file tree

Hide file tree

Showing 5 changed files with 5 additions and 4 deletions.
diff --git a/src/__pycache__/algorithmPlanner.cpython-310.pyc b/src/__pycache__/algorithmPlanner.cpython-310.pyc
diff --git a/src/__pycache__/operatingSystem.cpython-310.pyc b/src/__pycache__/operatingSystem.cpython-310.pyc
diff --git a/src/algorithmPlanner.py b/src/algorithmPlanner.py
@@ -36,13 +36,13 @@ def __init__(self):
 
     def getProcess(self):
         if not self.priorityQueue.empty():
-            return self.priorityQueue.get()
+            return self.priorityQueue.get()[1]
         else:
             return None
 
     def putProcess(self, proc):
-        proc.size = field(compare=False)
-        self.priorityQueue.put(proc)
+        #proc.size = field(compare=False)
+        self.priorityQueue.put((-proc.size, proc))
 
     def getNumberOfProcesses(self):
         return self.priorityQueue.qsize()

diff --git a/src/cpu.py b/src/cpu.py
@@ -41,6 +41,7 @@ def run(self):
 
                     proc.remainingIterations -= 1
                     if proc.sleepInterval > 0: #ako je sleepInterval is 0, no need to sleep
+                        print("Process [", proc.id, "] is sleeping.", sep='')
                         self.os.sleep(proc)
                 else:
                     self.os.finishProcess(proc)
diff --git a/src/sanbox.py b/src/sanbox.py
@@ -18,7 +18,7 @@
 #os.createProcess(process3)s
 
 print("--------------------------------")
-os.cpuScheduler.setPrioritizedAlgorithm(fcfs)
+os.cpuScheduler.setPrioritizedAlgorithm(spf)
 
 process4 = Process(5, 50, 1)
 os.createProcess(process4)