David 10 anni fa
parent
commit
273d1f53d0

+ 29 - 29
Makefile

@@ -69,35 +69,35 @@ ejercicio7: all makedir
 	./simusched ejer7-rsjf.tsk 2 2 4 SchedRSJF 2 4 4 20 4 5 | ./graphsched.py > informe/imagenes/ejercicio7_RSJF_2core.png
 
 ejercicio8: all makedir
-	./simusched ejer8-A.tsk 1 2 4 SchedRR 1 2 | ./graphsched.py > informe/imagenes/ejercicio8A_RR_1core.png
-	./simusched ejer8-A.tsk 1 2 4 SchedFCFS | ./graphsched.py > informe/imagenes/ejercicio8A_FIFO_1core.png
-	./simusched ejer8-A.tsk 1 2 4 SchedSJF 1 4 4 4 4 4 4 | ./graphsched.py > informe/imagenes/ejercicio8A_SJF_1core.png
-	./simusched ejer8-A.tsk 1 2 4 SchedRSJF 1 2 4 4 4 4 4 4 | ./graphsched.py > informe/imagenes/ejercicio8A_RSJF_1core.png
-
-	./simusched ejer8-A.tsk 2 2 4 SchedRR 1 2 2 | ./graphsched.py > informe/imagenes/ejercicio8A_RR_2core.png
-	./simusched ejer8-A.tsk 2 2 4 SchedFCFS | ./graphsched.py > informe/imagenes/ejercicio8A_FIFO_2core.png
-	./simusched ejer8-A.tsk 2 2 4 SchedSJF 2 4 4 4 4 4 4 | ./graphsched.py > informe/imagenes/ejercicio8A_SJF_2core.png
-	./simusched ejer8-A.tsk 2 2 4 SchedRSJF 2 2 2 4 4 4 4 4 4 | ./graphsched.py > informe/imagenes/ejercicio8A_RSJF_2core.png
-
-	./simusched ejer8-B.tsk 1 2 4 SchedRR 1 2 | ./graphsched.py > informe/imagenes/ejercicio8B_RR_1core.png
-	./simusched ejer8-B.tsk 1 2 4 SchedFCFS | ./graphsched.py > informe/imagenes/ejercicio8B_FIFO_1core.png
-	./simusched ejer8-B.tsk 1 2 4 SchedSJF 1 10 10 10 10 10 10  | ./graphsched.py > informe/imagenes/ejercicio8B_SJF_1core.png
-	./simusched ejer8-B.tsk 1 2 4 SchedRSJF 1 2 10 10 10 10 10 10 | ./graphsched.py > informe/imagenes/ejercicio8B_RSJF_1core.png
-
-	./simusched ejer8-B.tsk 2 2 4 SchedRR 1 2 2 | ./graphsched.py > informe/imagenes/ejercicio8B_RR_2core.png
-	./simusched ejer8-B.tsk 2 2 4 SchedFCFS | ./graphsched.py > informe/imagenes/ejercicio8B_FIFO_2core.png
-	./simusched ejer8-B.tsk 2 2 4 SchedSJF 2 10 10 10 10 10 10  | ./graphsched.py > informe/imagenes/ejercicio8B_SJF_2core.png
-	./simusched ejer8-B.tsk 2 2 4 SchedRSJF 2 2 2 10 10 10 10 10 10 | ./graphsched.py > informe/imagenes/ejercicio8B_RSJF_2core.png
-
-	./simusched ejer8-C.tsk 1 2 4 SchedRR 1 2 | ./graphsched.py > informe/imagenes/ejercicio8C_RR_1core.png
-	./simusched ejer8-C.tsk 1 2 4 SchedFCFS | ./graphsched.py > informe/imagenes/ejercicio8C_FIFO_1core.png
-	./simusched ejer8-C.tsk 1 2 4 SchedSJF 1 4 10 4 10 4 10  | ./graphsched.py > informe/imagenes/ejercicio8C_SJF_1core.png
-	./simusched ejer8-C.tsk 1 2 4 SchedRSJF 1 2 4 10 4 10 4 10 | ./graphsched.py > informe/imagenes/ejercicio8C_RSJF_1core.png
-
-	./simusched ejer8-C.tsk 2 2 4 SchedFCFS | ./graphsched.py > informe/imagenes/ejercicio8C_FIFO_2core.png
-	./simusched ejer8-C.tsk 2 2 4 SchedRR 1 2 2 | ./graphsched.py > informe/imagenes/ejercicio8C_RR_2core.png
-	./simusched ejer8-C.tsk 2 2 4 SchedSJF 2 4 10 4 10 4 10  | ./graphsched.py > informe/imagenes/ejercicio8C_SJF_2core.png
-	./simusched ejer8-C.tsk 2 2 4 SchedRSJF 2 2 2 4 10 4 10 4 10 | ./graphsched.py > informe/imagenes/ejercicio8C_RSJF_2core.png
+	./simusched ejer8-A.tsk 1 2 0 SchedRR 1 4 | ./graphsched.py > informe/imagenes/ejercicio8A_RR_1core.png
+	./simusched ejer8-A.tsk 1 2 0 SchedFCFS | ./graphsched.py > informe/imagenes/ejercicio8A_FIFO_1core.png
+	./simusched ejer8-A.tsk 1 2 0 SchedSJF 1 13 8 3 13 8 3 | ./graphsched.py > informe/imagenes/ejercicio8A_SJF_1core.png
+	./simusched ejer8-A.tsk 1 2 0 SchedRSJF 1 4 13 8 3 13 8 3 | ./graphsched.py > informe/imagenes/ejercicio8A_RSJF_1core.png
+
+	./simusched ejer8-A.tsk 2 2 8 SchedRR 2 4 4 | ./graphsched.py > informe/imagenes/ejercicio8A_RR_2core.png
+	./simusched ejer8-A.tsk 2 2 8 SchedFCFS | ./graphsched.py > informe/imagenes/ejercicio8A_FIFO_2core.png
+	./simusched ejer8-A.tsk 2 2 8 SchedSJF 2 13 8 3 13 8 3 | ./graphsched.py > informe/imagenes/ejercicio8A_SJF_2core.png
+	./simusched ejer8-A.tsk 2 2 8 SchedRSJF 2 4 4 13 8 3 13 8 3 | ./graphsched.py > informe/imagenes/ejercicio8A_RSJF_2core.png
+
+	./simusched ejer8-B.tsk 1 2 0 SchedRR 1 4 | ./graphsched.py > informe/imagenes/ejercicio8B_RR_1core.png
+	./simusched ejer8-B.tsk 1 2 0 SchedFCFS | ./graphsched.py > informe/imagenes/ejercicio8B_FIFO_1core.png
+	./simusched ejer8-B.tsk 1 2 0 SchedSJF 1 30 20 10 30 20 10  | ./graphsched.py > informe/imagenes/ejercicio8B_SJF_1core.png
+	./simusched ejer8-B.tsk 1 2 0 SchedRSJF 1 4 30 20 10 30 20 10 | ./graphsched.py > informe/imagenes/ejercicio8B_RSJF_1core.png
+
+	./simusched ejer8-B.tsk 2 2 8 SchedRR 2 4 4 | ./graphsched.py > informe/imagenes/ejercicio8B_RR_2core.png
+	./simusched ejer8-B.tsk 2 2 8 SchedFCFS | ./graphsched.py > informe/imagenes/ejercicio8B_FIFO_2core.png
+	./simusched ejer8-B.tsk 2 2 8 SchedSJF 2 30 20 10 30 20 10  | ./graphsched.py > informe/imagenes/ejercicio8B_SJF_2core.png
+	./simusched ejer8-B.tsk 2 2 8 SchedRSJF 2 4 4 30 20 10 30 20 10 | ./graphsched.py > informe/imagenes/ejercicio8B_RSJF_2core.png
+
+	./simusched ejer8-C.tsk 1 2 0 SchedRR 1 4 | ./graphsched.py > informe/imagenes/ejercicio8C_RR_1core.png
+	./simusched ejer8-C.tsk 1 2 0 SchedFCFS | ./graphsched.py > informe/imagenes/ejercicio8C_FIFO_1core.png
+	./simusched ejer8-C.tsk 1 2 0 SchedSJF 1    25 14 3 25 14 3 | ./graphsched.py > informe/imagenes/ejercicio8C_SJF_1core.png
+	./simusched ejer8-C.tsk 1 2 0 SchedRSJF 1 4 25 14 3 25 14 3 | ./graphsched.py > informe/imagenes/ejercicio8C_RSJF_1core.png
+
+	./simusched ejer8-C.tsk 2 2 8 SchedRR 2 4 4 | ./graphsched.py > informe/imagenes/ejercicio8C_RR_2core.png
+	./simusched ejer8-C.tsk 2 2 8 SchedFCFS | ./graphsched.py > informe/imagenes/ejercicio8C_FIFO_2core.png
+	./simusched ejer8-C.tsk 2 2 8 SchedSJF 2      25 14 3 25 14 3 | ./graphsched.py > informe/imagenes/ejercicio8C_SJF_2core.png
+	./simusched ejer8-C.tsk 2 2 8 SchedRSJF 2 4 4 25 14 3 25 14 3 | ./graphsched.py > informe/imagenes/ejercicio8C_RSJF_2core.png
 
 
 ejercicio9: all makedir

+ 5 - 5
casos/ejercicio8_A1.json

@@ -1,9 +1,9 @@
-{ "title": "Caso A1, 1 core, CS: 2",
+{ "title": "Caso A1, 1 core, Q: 4, CS: 2",
   "filename": "informe/imagenes/caso_8A1.png",
   "list" : [
-	{ "tasks": "ejer8-A.tsk", "args": "1 2 4 SchedRR 1 5" },
-	{ "tasks": "ejer8-A.tsk", "args": "1 2 4 SchedFCFS" },
-	{ "tasks": "ejer8-A.tsk", "args": "1 2 4 SchedSJF 1 4 4 4 4 4 4" },
-	{ "tasks": "ejer8-A.tsk", "args": "1 2 4 SchedRSJF 1 2 4 4 4 4 4 4" }
+	{ "tasks": "ejer8-A.tsk", "args": "1 2 0 SchedRR 1 4" },
+	{ "tasks": "ejer8-A.tsk", "args": "1 2 0 SchedFCFS" },
+	{ "tasks": "ejer8-A.tsk", "args": "1 2 0 SchedSJF 1 13 8 3 13 8 3" },
+	{ "tasks": "ejer8-A.tsk", "args": "1 2 0 SchedRSJF 1 4 13 8 3 13 8 3" }
   ]
 }

+ 5 - 5
casos/ejercicio8_A2.json

@@ -1,9 +1,9 @@
-{ "title": "Caso A2, 2 core, CS: 2",
+{ "title": "Caso A2, 2 core, Q: 4, CS: 2",
   "filename": "informe/imagenes/caso_8A2.png",
   "list" : [
-	{ "tasks": "ejer8-A.tsk", "args": "2 2 4 SchedRR 1 2 2" },
-	{ "tasks": "ejer8-A.tsk", "args": "2 2 4 SchedFCFS" },
-	{ "tasks": "ejer8-A.tsk", "args": "2 2 4 SchedSJF 2 4 4 4 4 4 4" },
-	{ "tasks": "ejer8-A.tsk", "args": "2 2 4 SchedRSJF 2 2 2 4 4 4 4 4 4" }
+	{ "tasks": "ejer8-A.tsk", "args": "2 2 8 SchedRR 2 4 4" },
+	{ "tasks": "ejer8-A.tsk", "args": "2 2 8 SchedFCFS" },
+	{ "tasks": "ejer8-A.tsk", "args": "2 2 8 SchedSJF 2 13 8 3 13 8 3" },
+	{ "tasks": "ejer8-A.tsk", "args": "2 2 8 SchedRSJF 2 4 4 13 8 3 13 8 3" }
   ]
 }

+ 5 - 5
casos/ejercicio8_B1.json

@@ -1,9 +1,9 @@
-{ "title": "Caso B1, 1 core, CS: 2",
+{ "title": "Caso B1, 1 core, Q:4, CS: 2",
   "filename": "informe/imagenes/caso_8B1.png",
   "list" : [
-	{ "tasks": "ejer8-B.tsk", "args": "1 02 4 SchedRR 1 2" },
-	{ "tasks": "ejer8-B.tsk", "args": "1 02 4 SchedFCFS" },
-	{ "tasks": "ejer8-B.tsk", "args": "1 02 4 SchedSJF 1 10 10 10 10 10 10" },
-	{ "tasks": "ejer8-B.tsk", "args": "1 02 4 SchedRSJF 1 2 10 10 10 10 10 10" }
+	{ "tasks": "ejer8-B.tsk", "args": "1 02 0 SchedRR 1 4" },
+	{ "tasks": "ejer8-B.tsk", "args": "1 02 0 SchedFCFS" },
+	{ "tasks": "ejer8-B.tsk", "args": "1 02 0 SchedSJF 1 30 20 10 30 20 10" },
+	{ "tasks": "ejer8-B.tsk", "args": "1 02 0 SchedRSJF 1 4 30 20 10 30 20 10" }
   ]
 }

+ 5 - 5
casos/ejercicio8_B2.json

@@ -1,9 +1,9 @@
-{ "title": "Caso B2, 2 core, CS: 2",
+{ "title": "Caso B2, 2 core, Q:4, CS: 2",
   "filename": "informe/imagenes/caso_8B2.png",
   "list" : [
-	{ "tasks": "ejer8-B.tsk", "args": "2 02 4 SchedRR 1 2 2" },
-	{ "tasks": "ejer8-B.tsk", "args": "2 02 4 SchedFCFS" },
-	{ "tasks": "ejer8-B.tsk", "args": "2 02 4 SchedSJF 2 10 10 10 10 10 10" },
-	{ "tasks": "ejer8-B.tsk", "args": "2 02 4 SchedRSJF 2 2 2 10 10 10 10 10 10" }
+	{ "tasks": "ejer8-B.tsk", "args": "2 02 8 SchedRR 2 4 4" },
+	{ "tasks": "ejer8-B.tsk", "args": "2 02 8 SchedFCFS" },
+	{ "tasks": "ejer8-B.tsk", "args": "2 02 8 SchedSJF 2 30 20 10 30 20 10" },
+	{ "tasks": "ejer8-B.tsk", "args": "2 02 8 SchedRSJF 2 4 4 30 20 10 30 20 10" }
   ]
 }

+ 5 - 5
casos/ejercicio8_C1.json

@@ -1,9 +1,9 @@
-{ "title": "Caso C1, 1 core, CS: 2",
+{ "title": "Caso C1, 1 core, Q: 4, CS: 2",
   "filename": "informe/imagenes/caso_8C1.png",
   "list" : [
-	{ "tasks": "ejer8-C.tsk", "args": "1 02 4 SchedRR 1 2" },
-	{ "tasks": "ejer8-C.tsk", "args": "1 02 4 SchedFCFS" },
-	{ "tasks": "ejer8-C.tsk", "args": "1 02 4 SchedSJF 1 4 10 4 10 4 10" },
-	{ "tasks": "ejer8-C.tsk", "args": "1 02 4 SchedRSJF 1 2 4 10 4 10 4 10" }
+	{ "tasks": "ejer8-C.tsk", "args": "1 02 0 SchedRR 1 4" },
+	{ "tasks": "ejer8-C.tsk", "args": "1 02 0 SchedFCFS" },
+	{ "tasks": "ejer8-C.tsk", "args": "1 02 0 SchedSJF 1 4  25 14 3 25 14 3" },
+	{ "tasks": "ejer8-C.tsk", "args": "1 02 0 SchedRSJF 1 4 25 14 3 25 14 3" }
   ]
 }

+ 5 - 5
casos/ejercicio8_C2.json

@@ -1,9 +1,9 @@
-{ "title": "Caso 8C2, 2 core, CS: 2",
+{ "title": "Caso C2, 2 core, Q: 4, CS: 2",
   "filename": "informe/imagenes/caso_8C2.png",
   "list" : [
-	{ "tasks": "ejer8-C.tsk", "args": "1 02 9 SchedFCFS" },
-	{ "tasks": "ejer8-C.tsk", "args": "1 02 9 SchedRR 1 2 2" },
-	{ "tasks": "ejer8-C.tsk", "args": "1 02 9 SchedSJF 2 4 10 4 10 4 10" },
-	{ "tasks": "ejer8-C.tsk", "args": "1 02 9 SchedRSJF 2 2 2 4 10 4 10 4 10" }
+	{ "tasks": "ejer8-C.tsk", "args": "2 2 8 SchedRR 2 4 4" },
+	{ "tasks": "ejer8-C.tsk", "args": "2 2 8 SchedFCFS" },
+	{ "tasks": "ejer8-C.tsk", "args": "2 2 8 SchedSJF 2 25 14 3 25 14 3" },
+	{ "tasks": "ejer8-C.tsk", "args": "2 2 8 SchedRSJF 2 4 4 25 14 3 25 14 3" }
   ]
 }

+ 6 - 3
ejer8-A.tsk

@@ -1,5 +1,8 @@
-*2 TaskCPU 4
+TaskCPU 13
+TaskCPU 8
 @4:
-*2 TaskCPU 4
+TaskCPU 3
+TaskCPU 13
 @8:
-*2 TaskCPU 4
+TaskCPU 8
+TaskCPU 3

+ 6 - 3
ejer8-B.tsk

@@ -1,5 +1,8 @@
-*2 TaskCPU 10
+TaskCPU 30
+TaskCPU 20
 @4:
-*2 TaskCPU 10
+TaskCPU 10
+TaskCPU 30
 @8:
-*2 TaskCPU 10
+TaskCPU 20
+TaskCPU 10

+ 6 - 8
ejer8-C.tsk

@@ -1,10 +1,8 @@
-TaskCPU 4
-TaskCPU 10
+TaskCPU 25
+TaskCPU 14
 @4:
-TaskCPU 4
-@4:
-TaskCPU 10
-@8:
-TaskCPU 4
+TaskCPU 3
+TaskCPU 25
 @8:
-TaskCPU 10
+TaskCPU 14
+TaskCPU 3