Skip to content

Commit 5970898

Browse files
bhatvineethbhatvineeth
committed
Earliest dead changed to deadline.
Alert message change.
1 parent 839f5a2 commit 5970898

File tree

4 files changed

+29
-145
lines changed

4 files changed

+29
-145
lines changed

‎SchedulingSimulator/Main/static/js/controller.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -344,7 +344,7 @@
344344
var period=document.getElementById("period").value;
345345
var deadline=document.getElementById("deadline").value;
346346
if (arrival_time == '' || exec_time == '' || period == '' || deadline == '') {
347-
alert("Invaid Input")
347+
alert("Empty row is not considered for scheduling")
348348
return false;
349349
}
350350

‎SchedulingSimulator/Main/templates/index.html

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -192,11 +192,11 @@ <h2 class="card-title">Rate Monotonic</h2> </div>
192192
<h2 class="card-title">Earliest Deadline First</h2> </div>
193193
<div class="col-sm-6">
194194
<div class="btn-group btn-group-toggle float-right" data-toggle="buttons">
195-
<label class="btn btn-sm btn-primary btn-simple active" id="2" onclick="chooseGraph('myChart2', 'edfChartArea');createGraph('myChart2', 'Earliest Dead First', edfArray, algorithmInputArray)">
195+
<label class="btn btn-sm btn-primary btn-simple active" id="2" onclick="chooseGraph('myChart2', 'edfChartArea');createGraph('myChart2', 'Earliest DeadLine First', edfArray, algorithmInputArray)">
196196
<input type="radio" name="options" checked> <span class="d-none d-sm-block d-md-block d-lg-block d-xl-block">Bar Graph</span> <span class="d-block d-sm-none">
197197
<i class="tim-icons icon-single-02"></i>
198198
</span> </label>
199-
<label class="btn btn-sm btn-primary btn-simple" id="3" onclick="chooseGraph('myChart2Line', 'edfChartArea');createLineGraph('myChart2Line', 'Earliest Dead First', edfArray, algorithmInputArray)">
199+
<label class="btn btn-sm btn-primary btn-simple" id="3" onclick="chooseGraph('myChart2Line', 'edfChartArea');createLineGraph('myChart2Line', 'Earliest DeadLine First', edfArray, algorithmInputArray)">
200200
<input type="radio" class="d-none d-sm-none" name="options"> <span class="d-none d-sm-block d-md-block d-lg-block d-xl-block">Line Graph</span> <span class="d-block d-sm-none">
201201
<i class="tim-icons icon-gift-2"></i>
202202
</span> </label>
@@ -272,7 +272,7 @@ <h2 class="card-title">Earliest Deadline First</h2> </div>
272272
<script>
273273
createTable(algorithmInputArray);
274274
createGraph('myChart', 'Rate Monotonic', rmsArray, algorithmInputArray);
275-
createGraph('myChart2', 'Earliest Dead First', edfArray, algorithmInputArray);
275+
createGraph('myChart2', 'Earliest DeadLine First', edfArray, algorithmInputArray);
276276
</script>
277277
<script>
278278
$(document).ready(function() {

‎SchedulingSimulator/log/EDF.log

Lines changed: 19 additions & 59 deletions
Original file line numberDiff line numberDiff line change
@@ -1,70 +1,30 @@
11
EARLIEST DEADLINE FIRST: START
22

3-
Utilization: 0.3977272727272727
4-
[8, 22]
5-
LCM: 88
6-
[[1, 1, 8, 8, 0], 8]
7-
[[1, 1, 8, 8, 0], 16]
8-
[[1, 1, 8, 8, 0], 24]
9-
[[1, 1, 8, 8, 0], 32]
10-
[[1, 1, 8, 8, 0], 40]
11-
[[1, 1, 8, 8, 0], 48]
12-
[[1, 1, 8, 8, 0], 56]
13-
[[1, 1, 8, 8, 0], 64]
14-
[[1, 1, 8, 8, 0], 72]
15-
[[1, 1, 8, 8, 0], 80]
16-
[[1, 1, 8, 8, 0], 88]
17-
[[2, 6, 22, 22, 0], 22]
18-
[[2, 6, 22, 22, 0], 44]
19-
[[2, 6, 22, 22, 0], 66]
20-
[[2, 6, 22, 22, 0], 88]
3+
Utilization: 0.5833333333333333
4+
[4, 6]
5+
LCM: 12
6+
[[1, 1, 4, 4, 0], 4]
7+
[[1, 1, 4, 4, 0], 8]
8+
[[1, 1, 4, 4, 0], 12]
9+
[[2, 2, 6, 6, 0], 6]
10+
[[2, 2, 6, 6, 0], 12]
2111

2212

23-
[[1, 1, 8, 8, 0], 8]
24-
[[1, 1, 8, 8, 0], 16]
25-
[[2, 6, 22, 22, 0], 22]
26-
[[1, 1, 8, 8, 0], 24]
27-
[[1, 1, 8, 8, 0], 32]
28-
[[1, 1, 8, 8, 0], 40]
29-
[[2, 6, 22, 22, 0], 44]
30-
[[1, 1, 8, 8, 0], 48]
31-
[[1, 1, 8, 8, 0], 56]
32-
[[1, 1, 8, 8, 0], 64]
33-
[[2, 6, 22, 22, 0], 66]
34-
[[1, 1, 8, 8, 0], 72]
35-
[[1, 1, 8, 8, 0], 80]
36-
[[1, 1, 8, 8, 0], 88]
37-
[[2, 6, 22, 22, 0], 88]
13+
[[1, 1, 4, 4, 0], 4]
14+
[[2, 2, 6, 6, 0], 6]
15+
[[1, 1, 4, 4, 0], 8]
16+
[[1, 1, 4, 4, 0], 12]
17+
[[2, 2, 6, 6, 0], 12]
3818

3919

4020
0 1 [1]
41-
1 7 [2]
42-
7 8 [0]
21+
1 3 [2]
22+
3 4 [0]
23+
4 5 [1]
24+
5 6 [0]
25+
6 8 [2]
4326
8 9 [1]
44-
9 16 [0]
45-
16 17 [1]
46-
17 22 [0]
47-
22 24 [2]
48-
24 25 [1]
49-
25 29 [2]
50-
29 32 [0]
51-
32 33 [1]
52-
33 40 [0]
53-
40 41 [1]
54-
41 44 [0]
55-
44 48 [2]
56-
48 49 [1]
57-
49 51 [2]
58-
51 56 [0]
59-
56 57 [1]
60-
57 64 [0]
61-
64 65 [1]
62-
65 66 [0]
63-
66 72 [2]
64-
72 73 [1]
65-
73 80 [0]
66-
80 81 [1]
67-
81 88 [0]
27+
9 12 [0]
6828
EARLIEST DEADLINE FIRST: END
6929

7030

‎SchedulingSimulator/log/RMS.log

Lines changed: 6 additions & 82 deletions
Original file line numberDiff line numberDiff line change
@@ -1,96 +1,20 @@
11
RATE MONOTONIC SCHEDULING: START
22

3-
[[1, 8], [6, 22]]
4-
Utilization: 0.397727
3+
[[1, 4], [2, 6]]
4+
Utilization: 0.583333
55
processes are schedulable
66
From 0 to 1: p 1
77
From 1 to 2: p 2
88
From 2 to 3: p 2
9-
From 3 to 4: p 2
10-
From 4 to 5: p 2
11-
From 5 to 6: p 2
9+
From 3 to 4: Empty slot
10+
From 4 to 5: p 1
11+
From 5 to 6: Empty slot
1212
From 6 to 7: p 2
13-
From 7 to 8: Empty slot
13+
From 7 to 8: p 2
1414
From 8 to 9: p 1
1515
From 9 to 10: Empty slot
1616
From 10 to 11: Empty slot
1717
From 11 to 12: Empty slot
18-
From 12 to 13: Empty slot
19-
From 13 to 14: Empty slot
20-
From 14 to 15: Empty slot
21-
From 15 to 16: Empty slot
22-
From 16 to 17: p 1
23-
From 17 to 18: Empty slot
24-
From 18 to 19: Empty slot
25-
From 19 to 20: Empty slot
26-
From 20 to 21: Empty slot
27-
From 21 to 22: Empty slot
28-
From 22 to 23: p 2
29-
From 23 to 24: p 2
30-
From 24 to 25: p 1
31-
From 25 to 26: p 2
32-
From 26 to 27: p 2
33-
From 27 to 28: p 2
34-
From 28 to 29: p 2
35-
From 29 to 30: Empty slot
36-
From 30 to 31: Empty slot
37-
From 31 to 32: Empty slot
38-
From 32 to 33: p 1
39-
From 33 to 34: Empty slot
40-
From 34 to 35: Empty slot
41-
From 35 to 36: Empty slot
42-
From 36 to 37: Empty slot
43-
From 37 to 38: Empty slot
44-
From 38 to 39: Empty slot
45-
From 39 to 40: Empty slot
46-
From 40 to 41: p 1
47-
From 41 to 42: Empty slot
48-
From 42 to 43: Empty slot
49-
From 43 to 44: Empty slot
50-
From 44 to 45: p 2
51-
From 45 to 46: p 2
52-
From 46 to 47: p 2
53-
From 47 to 48: p 2
54-
From 48 to 49: p 1
55-
From 49 to 50: p 2
56-
From 50 to 51: p 2
57-
From 51 to 52: Empty slot
58-
From 52 to 53: Empty slot
59-
From 53 to 54: Empty slot
60-
From 54 to 55: Empty slot
61-
From 55 to 56: Empty slot
62-
From 56 to 57: p 1
63-
From 57 to 58: Empty slot
64-
From 58 to 59: Empty slot
65-
From 59 to 60: Empty slot
66-
From 60 to 61: Empty slot
67-
From 61 to 62: Empty slot
68-
From 62 to 63: Empty slot
69-
From 63 to 64: Empty slot
70-
From 64 to 65: p 1
71-
From 65 to 66: Empty slot
72-
From 66 to 67: p 2
73-
From 67 to 68: p 2
74-
From 68 to 69: p 2
75-
From 69 to 70: p 2
76-
From 70 to 71: p 2
77-
From 71 to 72: p 2
78-
From 72 to 73: p 1
79-
From 73 to 74: Empty slot
80-
From 74 to 75: Empty slot
81-
From 75 to 76: Empty slot
82-
From 76 to 77: Empty slot
83-
From 77 to 78: Empty slot
84-
From 78 to 79: Empty slot
85-
From 79 to 80: Empty slot
86-
From 80 to 81: p 1
87-
From 81 to 82: Empty slot
88-
From 82 to 83: Empty slot
89-
From 83 to 84: Empty slot
90-
From 84 to 85: Empty slot
91-
From 85 to 86: Empty slot
92-
From 86 to 87: Empty slot
93-
From 87 to 88: Empty slot
9418
RATE MONOTONIC SCHEDULING: ENDn
9519

9620

0 commit comments

Comments
 (0)