Bugfix: RR will now always check if swap is needed when the active task ran (another) 2 CPU cycles.

src/RR.java

@@ -13,7 +13,7 @@ public class RR {
 	
 	private boolean enabled = true;
 	
-	private Queue<Task> waitingQueue = new ArrayDeque<>(); //inactive tasks
+	private ArrayDeque<Task> waitingQueue = new ArrayDeque<>(); //inactive tasks
 	private Task activeTask = null; //the active task; null if there are none
 	
 	public RR(Global global) {
@@ -27,12 +27,12 @@ public class RR {
 	public void stop() {
 		enabled = false;
 		runningFor = 0;
-		if (activeTask != null) waitingQueue.add(activeTask);
+		if (activeTask != null) waitingQueue.addLast(activeTask);
 		activeTask = null;
 	}
 	
 	public void add(Task t) {
-		waitingQueue.add(t);
+		waitingQueue.addLast(t);
 	}
 	
 	/**
@@ -51,14 +51,16 @@ public class RR {
 		//swapping
 		if(waitingQueue.size() > 0 && (runningFor == timeSlice || activeTask == null)) { //we swap if we can and if we need to; we need to when the running period is over or the current task is not running anymore
 			
-			if (activeTask != null) waitingQueue.add(activeTask);
-			activeTask = waitingQueue.remove();
+			if (activeTask != null) waitingQueue.addLast(activeTask);
+			activeTask = waitingQueue.removeFirst();
 			
 			global.changeRunning(activeTask);
 			
 			runningFor = 0;
 		}
 		
+		if (runningFor == timeSlice) runningFor = 0;
+		
 		//System.out.println("Running RR: " + ((activeTask == null) ? "null" : activeTask.name));
 		
 		//registering time flow
@@ -74,4 +76,10 @@ public class RR {
 		return activeTask==null && waitingQueue.size()==0;
 	}
 	
+	private String wqs() {
+		String ret = "";
+		for(Task t : waitingQueue) ret += t.name;
+		return ret;
+	}
+	
 }