todo roto

sched_mfq.cpp

@@ -29,13 +29,15 @@ void SchedMFQ::unblock(int pid) {
 	v_cola[p_q][pid].state = READY;
 	v_cola[p_q][pid].quantum_count = 0;
 
+	/*
 	if(p_q > 0) { //Hay una cola "mejor" para ir; lo llevo
 		v_cola[p_q-1][pid]=v_cola[p_q][pid];
 		v_cola[p_q].erase(pid);
 	}
+	*/
 }
 
-uint SchedMFQ::pid_queue(uint pid){
+uint SchedMFQ::pid_queue(int pid){
 	for( uint i = 0; i < n_colas; i++ )
 		if ( v_cola[i].count(pid) == 1) //Solo hay 0/1 key en un map
 			return i;
@@ -51,9 +53,9 @@ int SchedMFQ::ready_at(uint qn){
 		return -1;
 
 	for (it_type it = v_cola[qn].begin(); it != v_cola[qn].end(); it++) {
-		//cout << "Mirando al pid " << it->first << endl;
+		cout << "Mirando al pid " << it->first << endl;
 		if (it->second.state == READY){
-			//cout << "Me gusta " << it->first << endl;
+			cout << "Me gusta " << it->first << endl;
 			return it->first;
 		}
 	}
@@ -62,7 +64,7 @@ int SchedMFQ::ready_at(uint qn){
 }
 uint SchedMFQ::next_pid(){
 	for( uint q = 0; q < n_colas; q++ ){
-		//cout << "Mirando en la pila " << q << endl;
+		cout << "Mirando en la pila " << q << endl;
 		int p = ready_at(q);
 		if (p != -1)
 			return p; //Algun proceso listo
@@ -72,8 +74,12 @@ uint SchedMFQ::next_pid(){
 }
 
 void SchedMFQ::mostrar_estados(){
+	cout << "RDY: " << READY << ", RNING: " << RUNNING << ", BLK: " << BLOCKED << endl;
 	for( uint q = 0; q < n_colas; q++ ){
 		cout << "Cola " << q << ", size: " << v_cola[q].size() << endl;
+		for (it_type it = v_cola[q].begin(); it != v_cola[q].end(); it++) {
+			cout << "PID: " << it->first << ", STATE: " << it->second.state << endl;
+		}
 	}
 }
 int SchedMFQ::tick(int core, const enum Motivo m) {
@@ -94,10 +100,13 @@ int SchedMFQ::tick(int core, const enum Motivo m) {
 			switch_process = 1;
 			cur_process->state = READY;
 			cur_process->quantum_count = 0;
+			cout << "Marcando a cur_pid("<< cur_pid<<") como READY (>quantum)" << endl;
+			/*
 			if(p_q < n_colas - 1) { //Hay una cola "peor" para ir; lo llevo
 				v_cola[p_q+1][cur_pid]=*cur_process;
 				v_cola[p_q].erase(cur_pid);
 			}
+			*/
 		}
 		break;
 	case BLOCK:
@@ -116,6 +125,11 @@ int SchedMFQ::tick(int core, const enum Motivo m) {
 
 	if (switch_process) {
 		cur_pid = next_pid();
+		if (cur_pid == IDLE_TASK){
+			cout << "SWITCHING -1 ??? " << endl;
+			return IDLE_TASK;
+		}
+		p_q = pid_queue(cur_pid);
 		process* next_process=&(v_cola[p_q][cur_pid]);
 		next_process->state = RUNNING;
 		return cur_pid;

sched_mfq.h

@@ -26,7 +26,7 @@ class SchedMFQ : public SchedBase {
 		int ready_at(uint);
 		void mostrar_estados();
 		uint next_pid();
-		uint pid_queue(uint);
+		uint pid_queue(int);
 		uint n_colas;
 		uint* q_cola;
 		std::vector< std::map<int, process> > v_cola;