-
Notifications
You must be signed in to change notification settings - Fork 0
/
Copy pathpart1.patch
3128 lines (2948 loc) · 71.6 KB
/
part1.patch
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
130
131
132
133
134
135
136
137
138
139
140
141
142
143
144
145
146
147
148
149
150
151
152
153
154
155
156
157
158
159
160
161
162
163
164
165
166
167
168
169
170
171
172
173
174
175
176
177
178
179
180
181
182
183
184
185
186
187
188
189
190
191
192
193
194
195
196
197
198
199
200
201
202
203
204
205
206
207
208
209
210
211
212
213
214
215
216
217
218
219
220
221
222
223
224
225
226
227
228
229
230
231
232
233
234
235
236
237
238
239
240
241
242
243
244
245
246
247
248
249
250
251
252
253
254
255
256
257
258
259
260
261
262
263
264
265
266
267
268
269
270
271
272
273
274
275
276
277
278
279
280
281
282
283
284
285
286
287
288
289
290
291
292
293
294
295
296
297
298
299
300
301
302
303
304
305
306
307
308
309
310
311
312
313
314
315
316
317
318
319
320
321
322
323
324
325
326
327
328
329
330
331
332
333
334
335
336
337
338
339
340
341
342
343
344
345
346
347
348
349
350
351
352
353
354
355
356
357
358
359
360
361
362
363
364
365
366
367
368
369
370
371
372
373
374
375
376
377
378
379
380
381
382
383
384
385
386
387
388
389
390
391
392
393
394
395
396
397
398
399
400
401
402
403
404
405
406
407
408
409
410
411
412
413
414
415
416
417
418
419
420
421
422
423
424
425
426
427
428
429
430
431
432
433
434
435
436
437
438
439
440
441
442
443
444
445
446
447
448
449
450
451
452
453
454
455
456
457
458
459
460
461
462
463
464
465
466
467
468
469
470
471
472
473
474
475
476
477
478
479
480
481
482
483
484
485
486
487
488
489
490
491
492
493
494
495
496
497
498
499
500
501
502
503
504
505
506
507
508
509
510
511
512
513
514
515
516
517
518
519
520
521
522
523
524
525
526
527
528
529
530
531
532
533
534
535
536
537
538
539
540
541
542
543
544
545
546
547
548
549
550
551
552
553
554
555
556
557
558
559
560
561
562
563
564
565
566
567
568
569
570
571
572
573
574
575
576
577
578
579
580
581
582
583
584
585
586
587
588
589
590
591
592
593
594
595
596
597
598
599
600
601
602
603
604
605
606
607
608
609
610
611
612
613
614
615
616
617
618
619
620
621
622
623
624
625
626
627
628
629
630
631
632
633
634
635
636
637
638
639
640
641
642
643
644
645
646
647
648
649
650
651
652
653
654
655
656
657
658
659
660
661
662
663
664
665
666
667
668
669
670
671
672
673
674
675
676
677
678
679
680
681
682
683
684
685
686
687
688
689
690
691
692
693
694
695
696
697
698
699
700
701
702
703
704
705
706
707
708
709
710
711
712
713
714
715
716
717
718
719
720
721
722
723
724
725
726
727
728
729
730
731
732
733
734
735
736
737
738
739
740
741
742
743
744
745
746
747
748
749
750
751
752
753
754
755
756
757
758
759
760
761
762
763
764
765
766
767
768
769
770
771
772
773
774
775
776
777
778
779
780
781
782
783
784
785
786
787
788
789
790
791
792
793
794
795
796
797
798
799
800
801
802
803
804
805
806
807
808
809
810
811
812
813
814
815
816
817
818
819
820
821
822
823
824
825
826
827
828
829
830
831
832
833
834
835
836
837
838
839
840
841
842
843
844
845
846
847
848
849
850
851
852
853
854
855
856
857
858
859
860
861
862
863
864
865
866
867
868
869
870
871
872
873
874
875
876
877
878
879
880
881
882
883
884
885
886
887
888
889
890
891
892
893
894
895
896
897
898
899
900
901
902
903
904
905
906
907
908
909
910
911
912
913
914
915
916
917
918
919
920
921
922
923
924
925
926
927
928
929
930
931
932
933
934
935
936
937
938
939
940
941
942
943
944
945
946
947
948
949
950
951
952
953
954
955
956
957
958
959
960
961
962
963
964
965
966
967
968
969
970
971
972
973
974
975
976
977
978
979
980
981
982
983
984
985
986
987
988
989
990
991
992
993
994
995
996
997
998
999
1000
diff --git a/Makefile b/Makefile
index 09d790c..5829f4b 100644
--- a/Makefile
+++ b/Makefile
@@ -168,6 +168,8 @@ mkfs: mkfs.c fs.h
UPROGS=\
_cat\
_echo\
+ _policy\
+ _sanity\
_forktest\
_grep\
_init\
@@ -175,6 +177,8 @@ UPROGS=\
_ln\
_ls\
_mkdir\
+ _helloworld\
+ _memsizetest\
_rm\
_sh\
_stressfs\
diff --git a/cat.c b/cat.c
index 5ddc820..e74de1a 100644
--- a/cat.c
+++ b/cat.c
@@ -12,12 +12,12 @@ cat(int fd)
while((n = read(fd, buf, sizeof(buf))) > 0) {
if (write(1, buf, n) != n) {
printf(1, "cat: write error\n");
- exit();
+ exit(1);
}
}
if(n < 0){
printf(1, "cat: read error\n");
- exit();
+ exit(1);
}
}
@@ -28,16 +28,16 @@ main(int argc, char *argv[])
if(argc <= 1){
cat(0);
- exit();
+ exit(0);
}
for(i = 1; i < argc; i++){
if((fd = open(argv[i], 0)) < 0){
printf(1, "cat: cannot open %s\n", argv[i]);
- exit();
+ exit(1);
}
cat(fd);
close(fd);
}
- exit();
+ exit(0);
}
diff --git a/defs.h b/defs.h
index 82fb982..a79af88 100644
--- a/defs.h
+++ b/defs.h
@@ -9,6 +9,7 @@ struct spinlock;
struct sleeplock;
struct stat;
struct superblock;
+struct perf;
// bio.c
void binit(void);
@@ -104,7 +105,7 @@ int pipewrite(struct pipe*, char*, int);
//PAGEBREAK: 16
// proc.c
int cpuid(void);
-void exit(void);
+void exit(int status);
int fork(void);
int growproc(int);
int kill(int);
@@ -117,9 +118,15 @@ void sched(void);
void setproc(struct proc*);
void sleep(void*, struct spinlock*);
void userinit(void);
-int wait(void);
+int wait(int *status);
void wakeup(void*);
void yield(void);
+int set_ps_priority(int); // task 4
+int set_cfs_priority(int); // task 4
+int policy(int); // task 4.4
+int proc_info(struct perf*); //task4
+void ticksUpdate(); //Task4
+struct proc* processWithminAcc(); //Task4
// swtch.S
void swtch(struct context**, struct context*);
@@ -188,3 +195,5 @@ void clearpteu(pde_t *pgdir, char *uva);
// number of elements in fixed-size array
#define NELEM(x) (sizeof(x)/sizeof((x)[0]))
+
+int sched_type;
diff --git a/echo.c b/echo.c
index 806dee0..eed68a0 100644
--- a/echo.c
+++ b/echo.c
@@ -9,5 +9,5 @@ main(int argc, char *argv[])
for(i = 1; i < argc; i++)
printf(1, "%s%s", argv[i], i+1 < argc ? " " : "\n");
- exit();
+ exit(0);
}
diff --git a/forktest.c b/forktest.c
index 8bc984d..7d7658e 100644
--- a/forktest.c
+++ b/forktest.c
@@ -25,24 +25,26 @@ forktest(void)
if(pid < 0)
break;
if(pid == 0)
- exit();
+ exit(0);
}
if(n == N){
printf(1, "fork claimed to work N times!\n", N);
- exit();
+ exit(0);
}
+ int Cstatus; //child exit's status returning from wait() call, Task 3.2
+
for(; n > 0; n--){
- if(wait() < 0){
+ if(wait(&Cstatus) < 0){
printf(1, "wait stopped early\n");
- exit();
+ exit(1);
}
}
- if(wait() != -1){
+ if(wait(&Cstatus) != -1){
printf(1, "wait got too many\n");
- exit();
+ exit(1);
}
printf(1, "fork test OK\n");
@@ -52,5 +54,5 @@ int
main(void)
{
forktest();
- exit();
+ exit(0);
}
diff --git a/grep.c b/grep.c
index adc4835..d354f2a 100644
--- a/grep.c
+++ b/grep.c
@@ -43,24 +43,24 @@ main(int argc, char *argv[])
if(argc <= 1){
printf(2, "usage: grep pattern [file ...]\n");
- exit();
+ exit(1);
}
pattern = argv[1];
if(argc <= 2){
grep(pattern, 0);
- exit();
+ exit(0);
}
for(i = 2; i < argc; i++){
if((fd = open(argv[i], 0)) < 0){
printf(1, "grep: cannot open %s\n", argv[i]);
- exit();
+ exit(1);
}
grep(pattern, fd);
close(fd);
}
- exit();
+ exit(0);
}
// Regexp matcher from Kernighan & Pike,
diff --git a/helloworld.c b/helloworld.c
new file mode 100644
index 0000000..e6c77e4
--- /dev/null
+++ b/helloworld.c
@@ -0,0 +1,9 @@
+#include "types.h"
+#include "stat.h"
+#include "user.h"
+
+int
+main(int argc, char *argv[]){
+ printf(1,"%s","Hello World XV6\n");
+ exit(0);
+}
diff --git a/init.c b/init.c
index 046b551..bb47bca 100644
--- a/init.c
+++ b/init.c
@@ -24,14 +24,15 @@ main(void)
pid = fork();
if(pid < 0){
printf(1, "init: fork failed\n");
- exit();
+ exit(1);
}
if(pid == 0){
exec("sh", argv);
printf(1, "init: exec sh failed\n");
- exit();
+ exit(1);
}
- while((wpid=wait()) >= 0 && wpid != pid)
+ int Cstatus; //child exit's status returning from wait() call, Task 3.2
+ while((wpid=wait(&Cstatus)) >= 0 && wpid != pid)
printf(1, "zombie!\n");
}
}
diff --git a/kill.c b/kill.c
index 364f6af..875916c 100644
--- a/kill.c
+++ b/kill.c
@@ -9,9 +9,9 @@ main(int argc, char **argv)
if(argc < 2){
printf(2, "usage: kill pid...\n");
- exit();
+ exit(1);
}
for(i=1; i<argc; i++)
kill(atoi(argv[i]));
- exit();
+ exit(0);
}
diff --git a/ln.c b/ln.c
index cf8a64e..b919408 100644
--- a/ln.c
+++ b/ln.c
@@ -7,9 +7,10 @@ main(int argc, char *argv[])
{
if(argc != 3){
printf(2, "Usage: ln old new\n");
- exit();
+ exit(1);
}
- if(link(argv[1], argv[2]) < 0)
+ int x;
+ if((x=link(argv[1], argv[2])) < 0)
printf(2, "link %s %s: failed\n", argv[1], argv[2]);
- exit();
+ exit(x*-1);
}
diff --git a/ls.c b/ls.c
index 2862913..27742c2 100644
--- a/ls.c
+++ b/ls.c
@@ -77,9 +77,9 @@ main(int argc, char *argv[])
if(argc < 2){
ls(".");
- exit();
+ exit(0);
}
for(i=1; i<argc; i++)
ls(argv[i]);
- exit();
+ exit(0);
}
diff --git a/memsizetest.c b/memsizetest.c
new file mode 100644
index 0000000..63a6972
--- /dev/null
+++ b/memsizetest.c
@@ -0,0 +1,28 @@
+
+#include "syscall.h"
+#include "types.h"
+#include "stat.h"
+#include "user.h"
+
+int main(){
+int size;
+size=memsize();
+printf(1,"The process is using: %dB\n",size);
+printf(1,"Allocating more memory\n");
+char* memory;
+memory=(char *)malloc ( 2000 * sizeof(char) );
+strcpy( memory, "hello");
+size =memsize();
+printf(1,"The process is using: %dB\n",size);
+free(memory);
+size=memsize();
+printf(1,"Freeing memory\n");
+printf(1,"The process is using: %dB\n",size);
+exit(0);
+
+}
+
+
+
+
+
diff --git a/mkdir.c b/mkdir.c
index 6e4c954..2d90781 100644
--- a/mkdir.c
+++ b/mkdir.c
@@ -9,7 +9,7 @@ main(int argc, char *argv[])
if(argc < 2){
printf(2, "Usage: mkdir files...\n");
- exit();
+ exit(1);
}
for(i = 1; i < argc; i++){
@@ -19,5 +19,5 @@ main(int argc, char *argv[])
}
}
- exit();
+ exit(0);
}
diff --git a/perfSave.h b/perfSave.h
new file mode 100644
index 0000000..fca90f5
--- /dev/null
+++ b/perfSave.h
@@ -0,0 +1,7 @@
+
+struct perf {
+ int ps_priority;
+ int stime;
+ int retime;
+ int rtime;
+};
\ No newline at end of file
diff --git a/policy.c b/policy.c
new file mode 100644
index 0000000..558cfc2
--- /dev/null
+++ b/policy.c
@@ -0,0 +1,29 @@
+#include "types.h"
+#include "stat.h"
+#include "user.h"
+#include "syscall.h"
+
+int main(int argc, char *argv[])
+{
+ if (argc >= 2)
+ {
+ int numbOfpolicy = atoi(argv[1]);
+ if (numbOfpolicy == 0)
+ printf(1, "Policy has been successfully changed to Default Policy\n");
+ if (numbOfpolicy == 1)
+ printf(1, "Policy has been successfully changed to Priority Policy\n");
+ if (numbOfpolicy == 2)
+ printf(1, "Policy has been successfully changed to CFS Policy\n");
+ if (numbOfpolicy >= 0 && numbOfpolicy <= 2)
+ policy(numbOfpolicy);
+ else
+ printf(1, "Error replacing policy, no such a policy number (%d)");
+ }
+
+ else
+ {
+ printf(1, "few arguments");
+ exit(1);
+ }
+ exit(0);
+}
\ No newline at end of file
diff --git a/proc.c b/proc.c
index 806b1b1..424990f 100644
--- a/proc.c
+++ b/proc.c
@@ -7,7 +7,8 @@
#include "proc.h"
#include "spinlock.h"
-struct {
+struct
+{
struct spinlock lock;
struct proc proc[NPROC];
} ptable;
@@ -18,34 +19,40 @@ int nextpid = 1;
extern void forkret(void);
extern void trapret(void);
-static void wakeup1(void *chan);
+extern int sched_type; //Task4.4,scheduler type (global variable)
-void
-pinit(void)
+double timeRatio(struct proc *process); //Task4.3, timeRatio calculator function
+int minimumAcculamtor(void);
+void ticksUpdate(); //Task4.3, Update time parameters after tick++ (called by trap.c)
+struct proc *processWithminAcc(); //Task4.2, Returns pointer to process with minimum accumlator
+static void wakeup1(void *chan);
+double minimumTimeratio(void); //Task4.3, Returns double minimal time ratio in process table
+void pinit(void)
{
initlock(&ptable.lock, "ptable");
}
// Must be called with interrupts disabled
-int
-cpuid() {
- return mycpu()-cpus;
+int cpuid()
+{
+ return mycpu() - cpus;
}
// Must be called with interrupts disabled to avoid the caller being
// rescheduled between reading lapicid and running through the loop.
-struct cpu*
+struct cpu *
mycpu(void)
{
int apicid, i;
-
- if(readeflags()&FL_IF)
+
+ if (readeflags() & FL_IF)
panic("mycpu called with interrupts enabled\n");
-
+
apicid = lapicid();
// APIC IDs are not guaranteed to be contiguous. Maybe we should have
// a reverse map, or reserve a register to store &cpus[i].
- for (i = 0; i < ncpu; ++i) {
+ for (i = 0; i < ncpu; ++i)
+ {
if (cpus[i].apicid == apicid)
return &cpus[i];
}
@@ -54,8 +61,9 @@ mycpu(void)
// Disable interrupts so that we are not rescheduled
// while reading proc from the cpu structure
-struct proc*
-myproc(void) {
+struct proc *
+myproc(void)
+{
struct cpu *c;
struct proc *p;
pushcli();
@@ -70,7 +78,7 @@ myproc(void) {
// If found, change state to EMBRYO and initialize
// state required to run in the kernel.
// Otherwise return 0.
-static struct proc*
+static struct proc *
allocproc(void)
{
struct proc *p;
@@ -78,8 +86,8 @@ allocproc(void)
acquire(&ptable.lock);
- for(p = ptable.proc; p < &ptable.proc[NPROC]; p++)
- if(p->state == UNUSED)
+ for (p = ptable.proc; p < &ptable.proc[NPROC]; p++)
+ if (p->state == UNUSED)
goto found;
release(&ptable.lock);
@@ -88,11 +96,18 @@ allocproc(void)
found:
p->state = EMBRYO;
p->pid = nextpid++;
+ p->ps_priority = 5; //Task4.2 field
+ p->accumlator = minimumAcculamtor(); //Task4.2 field (initial value minimal acc in PT)
+ p->retime = 0; //Task4.3 field
+ p->rtime = 0; //Task4.3 field
+ p->stime = 0; //Task4.3 field
+ p->cfs_priority=1; //Task4.3 field (initial value 1)
release(&ptable.lock);
// Allocate kernel stack.
- if((p->kstack = kalloc()) == 0){
+ if ((p->kstack = kalloc()) == 0)
+ {
p->state = UNUSED;
return 0;
}
@@ -100,15 +115,15 @@ found:
// Leave room for trap frame.
sp -= sizeof *p->tf;
- p->tf = (struct trapframe*)sp;
+ p->tf = (struct trapframe *)sp;
// Set up new context to start executing at forkret,
// which returns to trapret.
sp -= 4;
- *(uint*)sp = (uint)trapret;
+ *(uint *)sp = (uint)trapret;
sp -= sizeof *p->context;
- p->context = (struct context*)sp;
+ p->context = (struct context *)sp;
memset(p->context, 0, sizeof *p->context);
p->context->eip = (uint)forkret;
@@ -117,16 +132,15 @@ found:
//PAGEBREAK: 32
// Set up first user process.
-void
-userinit(void)
+void userinit(void)
{
struct proc *p;
extern char _binary_initcode_start[], _binary_initcode_size[];
p = allocproc();
-
+
initproc = p;
- if((p->pgdir = setupkvm()) == 0)
+ if ((p->pgdir = setupkvm()) == 0)
panic("userinit: out of memory?");
inituvm(p->pgdir, _binary_initcode_start, (int)_binary_initcode_size);
p->sz = PGSIZE;
@@ -137,7 +151,7 @@ userinit(void)
p->tf->ss = p->tf->ds;
p->tf->eflags = FL_IF;
p->tf->esp = PGSIZE;
- p->tf->eip = 0; // beginning of initcode.S
+ p->tf->eip = 0; // beginning of initcode.S
safestrcpy(p->name, "initcode", sizeof(p->name));
p->cwd = namei("/");
@@ -155,18 +169,20 @@ userinit(void)
// Grow current process's memory by n bytes.
// Return 0 on success, -1 on failure.
-int
-growproc(int n)
+int growproc(int n)
{
uint sz;
struct proc *curproc = myproc();
sz = curproc->sz;
- if(n > 0){
- if((sz = allocuvm(curproc->pgdir, sz, sz + n)) == 0)
+ if (n > 0)
+ {
+ if ((sz = allocuvm(curproc->pgdir, sz, sz + n)) == 0)
return -1;
- } else if(n < 0){
- if((sz = deallocuvm(curproc->pgdir, sz, sz + n)) == 0)
+ }
+ else if (n < 0)
+ {
+ if ((sz = deallocuvm(curproc->pgdir, sz, sz + n)) == 0)
return -1;
}
curproc->sz = sz;
@@ -177,20 +193,21 @@ growproc(int n)
// Create a new process copying p as the parent.
// Sets up stack to return as if from system call.
// Caller must set state of returned proc to RUNNABLE.
-int
-fork(void)
+int fork(void)
{
int i, pid;
struct proc *np;
struct proc *curproc = myproc();
// Allocate process.
- if((np = allocproc()) == 0){
+ if ((np = allocproc()) == 0)
+ {
return -1;
}
// Copy process state from proc.
- if((np->pgdir = copyuvm(curproc->pgdir, curproc->sz)) == 0){
+ if ((np->pgdir = copyuvm(curproc->pgdir, curproc->sz)) == 0)
+ {
kfree(np->kstack);
np->kstack = 0;
np->state = UNUSED;
@@ -198,13 +215,14 @@ fork(void)
}
np->sz = curproc->sz;
np->parent = curproc;
+ np->cfs_priority=curproc->cfs_priority; //Task4.3 field copied into child manually
*np->tf = *curproc->tf;
// Clear %eax so that fork returns 0 in the child.
np->tf->eax = 0;
- for(i = 0; i < NOFILE; i++)
- if(curproc->ofile[i])
+ for (i = 0; i < NOFILE; i++)
+ if (curproc->ofile[i])
np->ofile[i] = filedup(curproc->ofile[i]);
np->cwd = idup(curproc->cwd);
@@ -224,19 +242,20 @@ fork(void)
// Exit the current process. Does not return.
// An exited process remains in the zombie state
// until its parent calls wait() to find out it exited.
-void
-exit(void)
+void exit(int status)
{
struct proc *curproc = myproc();
struct proc *p;
int fd;
- if(curproc == initproc)
+ if (curproc == initproc)
panic("init exiting");
// Close all open files.
- for(fd = 0; fd < NOFILE; fd++){
- if(curproc->ofile[fd]){
+ for (fd = 0; fd < NOFILE; fd++)
+ {
+ if (curproc->ofile[fd])
+ {
fileclose(curproc->ofile[fd]);
curproc->ofile[fd] = 0;
}
@@ -253,14 +272,17 @@ exit(void)
wakeup1(curproc->parent);
// Pass abandoned children to init.
- for(p = ptable.proc; p < &ptable.proc[NPROC]; p++){
- if(p->parent == curproc){
+ for (p = ptable.proc; p < &ptable.proc[NPROC]; p++)
+ {
+ if (p->parent == curproc)
+ {
p->parent = initproc;
- if(p->state == ZOMBIE)
+ if (p->state == ZOMBIE)
wakeup1(initproc);
}
}
+ curproc->exitStatus = status; //added line task 3.1
// Jump into the scheduler, never to return.
curproc->state = ZOMBIE;
sched();
@@ -269,23 +291,27 @@ exit(void)
// Wait for a child process to exit and return its pid.
// Return -1 if this process has no children.
-int
-wait(void)
+int wait(int *status)
{
struct proc *p;
int havekids, pid;
struct proc *curproc = myproc();
-
+
acquire(&ptable.lock);
- for(;;){
+ for (;;)
+ {
// Scan through table looking for exited children.
havekids = 0;
- for(p = ptable.proc; p < &ptable.proc[NPROC]; p++){
- if(p->parent != curproc)
+ for (p = ptable.proc; p < &ptable.proc[NPROC]; p++)
+ {
+ if (p->parent != curproc)
continue;
havekids = 1;
- if(p->state == ZOMBIE){
+ if (p->state == ZOMBIE)
+ {
// Found one.
+ if (status != 0) //Task3, if status isn't null, assign child's exit status
+ *status = p->exitStatus;
pid = p->pid;
kfree(p->kstack);
p->kstack = 0;
@@ -301,13 +327,16 @@ wait(void)
}
// No point waiting if we don't have any children.
- if(!havekids || curproc->killed){
+ if (!havekids || curproc->killed)
+ {
+ if (status != 0)
+ status = null;
release(&ptable.lock);
return -1;
}
// Wait for children to exit. (See wakeup1 call in proc_exit.)
- sleep(curproc, &ptable.lock); //DOC: wait-sleep
+ sleep(curproc, &ptable.lock); //DOC: wait-sleep
}
}
@@ -319,39 +348,84 @@ wait(void)
// - swtch to start running that process
// - eventually that process transfers control
// via swtch back to the scheduler.
-void
-scheduler(void)
+void scheduler(void)
{
struct proc *p;
struct cpu *c = mycpu();
c->proc = 0;
-
- for(;;){
+ double x; //Task4.4, x is a helping variable
+
+ for (;;)
+ {
// Enable interrupts on this processor.
sti();
-
- // Loop over process table looking for process to run.
- acquire(&ptable.lock);
- for(p = ptable.proc; p < &ptable.proc[NPROC]; p++){
- if(p->state != RUNNABLE)
- continue;
-
- // Switch to chosen process. It is the process's job
- // to release ptable.lock and then reacquire it
- // before jumping back to us.
- c->proc = p;
- switchuvm(p);
- p->state = RUNNING;
-
- swtch(&(c->scheduler), p->context);
- switchkvm();
-
- // Process is done running for now.
- // It should have changed its p->state before coming back.
- c->proc = 0;
+ if (sched_type == 1) //scheduler type 1, PS scheduling
+ {
+ acquire(&ptable.lock);
+ x=minimumAcculamtor(); //Task4.2, x has minimum accumlator, we find the first process to match it
+ for (p = ptable.proc; p < &ptable.proc[NPROC]; p++){
+ if(p->state==RUNNABLE && p->accumlator==x){
+ // Switch to chosen process. It is the process's job
+ // to release ptable.lock and then reacquire it
+ // before jumping back to us.
+ c->proc = p;
+ switchuvm(p);
+ p->state = RUNNING;
+
+ swtch(&(c->scheduler), p->context);
+ switchkvm();
+
+ // Process is done running for now.
+ // It should have changed its p->state before coming back.
+ c->proc = 0;
+ break; //Task4, break loop and find a new process with min acc to run
+ }
+ }
+ release(&ptable.lock);
+ continue;
+ }
+ else
+ if (sched_type == 2) //scheduler type 2, CFS scheduling
+ {
+ acquire(&ptable.lock);
+ x=minimumTimeratio(); //Task4.3, x has minimum timeRatio in PT, we find the right process
+ for (p = ptable.proc; p < &ptable.proc[NPROC]; p++){
+ if(p->state==RUNNABLE && timeRatio(p)==x){ //Check if Runnable AND has minimum timeRatio in PT
+ c->proc = p;
+ switchuvm(p);
+ p->state = RUNNING;
+
+ swtch(&(c->scheduler), p->context);
+ switchkvm();
+
+ c->proc = 0;
+ break;
+ }
+ }
+ release(&ptable.lock);
+ continue;
+ }
+ else
+ if (sched_type == 0) //Task4.1, default scheduling (RR)
+ {
+ // Loop over process table looking for process to run.
+ acquire(&ptable.lock);
+ for (p = ptable.proc; p < &ptable.proc[NPROC]; p++)
+ {
+ if (p->state != RUNNABLE)
+ continue;
+
+ c->proc = p;
+ switchuvm(p);
+ p->state = RUNNING;
+
+ swtch(&(c->scheduler), p->context);
+ switchkvm();
+
+ c->proc = 0;
+ }
+ release(&ptable.lock);
}
- release(&ptable.lock);
-
}
}
@@ -362,19 +436,18 @@ scheduler(void)
// be proc->intena and proc->ncli, but that would
// break in the few places where a lock is held but
// there's no process.
-void
-sched(void)
+void sched(void)
{
int intena;
struct proc *p = myproc();
- if(!holding(&ptable.lock))
+ if (!holding(&ptable.lock))
panic("sched ptable.lock");
- if(mycpu()->ncli != 1)
+ if (mycpu()->ncli != 1)
panic("sched locks");
- if(p->state == RUNNING)
+ if (p->state == RUNNING)
panic("sched running");
- if(readeflags()&FL_IF)
+ if (readeflags() & FL_IF)
panic("sched interruptible");
intena = mycpu()->intena;
swtch(&p->context, mycpu()->scheduler);
@@ -382,10 +455,10 @@ sched(void)
}
// Give up the CPU for one scheduling round.
-void
-yield(void)
+void yield(void)
{
- acquire(&ptable.lock); //DOC: yieldlock
+ acquire(&ptable.lock); //DOC: yieldlock
+ myproc()->accumlator=myproc()->accumlator+myproc()->ps_priority; //Task4.2, every time quantum end with yield() (by process itself OR trap.c)
myproc()->state = RUNNABLE;
sched();
release(&ptable.lock);
@@ -393,14 +466,14 @@ yield(void)
// A fork child's very first scheduling by scheduler()
// will swtch here. "Return" to user space.
-void
-forkret(void)
+void forkret(void)
{
static int first = 1;
// Still holding ptable.lock from scheduler.
release(&ptable.lock);
- if (first) {
+ if (first)
+ {
// Some initialization functions must be run in the context
// of a regular process (e.g., they call sleep), and thus cannot
// be run from main().
@@ -414,15 +487,14 @@ forkret(void)
// Atomically release lock and sleep on chan.
// Reacquires lock when awakened.
-void
-sleep(void *chan, struct spinlock *lk)
+void sleep(void *chan, struct spinlock *lk)
{
struct proc *p = myproc();
-
- if(p == 0)
+
+ if (p == 0)
panic("sleep");
- if(lk == 0)
+ if (lk == 0)
panic("sleep without lk");
// Must acquire ptable.lock in order to
@@ -431,8 +503,9 @@ sleep(void *chan, struct spinlock *lk)
// guaranteed that we won't miss any wakeup
// (wakeup runs with ptable.lock locked),
// so it's okay to release lk.
- if(lk != &ptable.lock){ //DOC: sleeplock0
- acquire(&ptable.lock); //DOC: sleeplock1
+ if (lk != &ptable.lock)
+ { //DOC: sleeplock0
+ acquire(&ptable.lock); //DOC: sleeplock1
release(lk);
}
// Go to sleep.
@@ -445,7 +518,8 @@ sleep(void *chan, struct spinlock *lk)
p->chan = 0;
// Reacquire original lock.
- if(lk != &ptable.lock){ //DOC: sleeplock2
+ if (lk != &ptable.lock)
+ { //DOC: sleeplock2
release(&ptable.lock);
acquire(lk);
}
@@ -457,16 +531,19 @@ sleep(void *chan, struct spinlock *lk)
static void
wakeup1(void *chan)
{
+
struct proc *p;
- for(p = ptable.proc; p < &ptable.proc[NPROC]; p++)
- if(p->state == SLEEPING && p->chan == chan)
+ for (p = ptable.proc; p < &ptable.proc[NPROC]; p++)
+ if (p->state == SLEEPING && p->chan == chan)
+ {
p->state = RUNNABLE;
+ p->accumlator = minimumAcculamtor(); //Task4.2, woken process gets highest priority to run
+ }
}
// Wake up all processes sleeping on chan.
-void
-wakeup(void *chan)
+void wakeup(void *chan)
{
acquire(&ptable.lock);
wakeup1(chan);
@@ -476,17 +553,18 @@ wakeup(void *chan)
// Kill the process with the given pid.
// Process won't exit until it returns
// to user space (see trap in trap.c).
-int
-kill(int pid)
+int kill(int pid)
{
struct proc *p;
acquire(&ptable.lock);
- for(p = ptable.proc; p < &ptable.proc[NPROC]; p++){
- if(p->pid == pid){
+ for (p = ptable.proc; p < &ptable.proc[NPROC]; p++)
+ {
+ if (p->pid == pid)
+ {
p->killed = 1;
// Wake process from sleep if necessary.
- if(p->state == SLEEPING)
+ if (p->state == SLEEPING)
p->state = RUNNABLE;
release(&ptable.lock);
return 0;
@@ -500,35 +578,191 @@ kill(int pid)
// Print a process listing to console. For debugging.
// Runs when user types ^P on console.
// No lock to avoid wedging a stuck machine further.
-void
-procdump(void)
+void procdump(void)
{
static char *states[] = {
- [UNUSED] "unused",
- [EMBRYO] "embryo",
- [SLEEPING] "sleep ",
- [RUNNABLE] "runble",
- [RUNNING] "run ",
- [ZOMBIE] "zombie"
- };
+ [UNUSED] "unused",
+ [EMBRYO] "embryo",
+ [SLEEPING] "sleep ",
+ [RUNNABLE] "runble",