-
Notifications
You must be signed in to change notification settings - Fork 1
/
submit.patch
6001 lines (5937 loc) · 168 KB
/
submit.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/.cproject b/.cproject
new file mode 100644
index 0000000..91707f3
--- /dev/null
+++ b/.cproject
@@ -0,0 +1,63 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<?fileVersion 4.0.0?><cproject storage_type_id="org.eclipse.cdt.core.XmlProjectDescriptionStorage">
+ <storageModule moduleId="org.eclipse.cdt.core.settings">
+ <cconfiguration id="0.1181601791">
+ <storageModule buildSystemId="org.eclipse.cdt.managedbuilder.core.configurationDataProvider" id="0.1181601791" moduleId="org.eclipse.cdt.core.settings" name="Default">
+ <externalSettings/>
+ <extensions>
+ <extension id="org.eclipse.cdt.core.VCErrorParser" point="org.eclipse.cdt.core.ErrorParser"/>
+ <extension id="org.eclipse.cdt.core.GmakeErrorParser" point="org.eclipse.cdt.core.ErrorParser"/>
+ <extension id="org.eclipse.cdt.core.CWDLocator" point="org.eclipse.cdt.core.ErrorParser"/>
+ <extension id="org.eclipse.cdt.core.GCCErrorParser" point="org.eclipse.cdt.core.ErrorParser"/>
+ <extension id="org.eclipse.cdt.core.GASErrorParser" point="org.eclipse.cdt.core.ErrorParser"/>
+ <extension id="org.eclipse.cdt.core.GLDErrorParser" point="org.eclipse.cdt.core.ErrorParser"/>
+ </extensions>
+ </storageModule>
+ <storageModule moduleId="cdtBuildSystem" version="4.0.0">
+ <configuration buildProperties="" description="" id="0.1181601791" name="Default" parent="org.eclipse.cdt.build.core.prefbase.cfg">
+ <folderInfo id="0.1181601791." name="/" resourcePath="">
+ <toolChain id="org.eclipse.cdt.build.core.prefbase.toolchain.559138365" name="No ToolChain" resourceTypeBasedDiscovery="false" superClass="org.eclipse.cdt.build.core.prefbase.toolchain">
+ <targetPlatform id="org.eclipse.cdt.build.core.prefbase.toolchain.559138365.1014748283" name=""/>
+ <builder id="org.eclipse.cdt.build.core.settings.default.builder.918207305" keepEnvironmentInBuildfile="false" managedBuildOn="false" name="Gnu Make Builder" superClass="org.eclipse.cdt.build.core.settings.default.builder"/>
+ <tool id="org.eclipse.cdt.build.core.settings.holder.libs.151517921" name="holder for library settings" superClass="org.eclipse.cdt.build.core.settings.holder.libs"/>
+ <tool id="org.eclipse.cdt.build.core.settings.holder.1261947414" name="Assembly" superClass="org.eclipse.cdt.build.core.settings.holder">
+ <inputType id="org.eclipse.cdt.build.core.settings.holder.inType.689463615" languageId="org.eclipse.cdt.core.assembly" languageName="Assembly" sourceContentType="org.eclipse.cdt.core.asmSource" superClass="org.eclipse.cdt.build.core.settings.holder.inType"/>
+ </tool>
+ <tool id="org.eclipse.cdt.build.core.settings.holder.401435947" name="GNU C++" superClass="org.eclipse.cdt.build.core.settings.holder">
+ <inputType id="org.eclipse.cdt.build.core.settings.holder.inType.794607659" languageId="org.eclipse.cdt.core.g++" languageName="GNU C++" sourceContentType="org.eclipse.cdt.core.cxxSource,org.eclipse.cdt.core.cxxHeader" superClass="org.eclipse.cdt.build.core.settings.holder.inType"/>
+ </tool>
+ <tool id="org.eclipse.cdt.build.core.settings.holder.844749121" name="GNU C" superClass="org.eclipse.cdt.build.core.settings.holder">
+ <option id="org.eclipse.cdt.build.core.settings.holder.incpaths.874841573" name="Include Paths" superClass="org.eclipse.cdt.build.core.settings.holder.incpaths" valueType="includePath">
+ <listOptionValue builtIn="false" value=""${workspace_loc:/ops-class.org/kern/include}""/>
+ <listOptionValue builtIn="false" value=""${workspace_loc:/ops-class.org/kern/include/kern}""/>
+ <listOptionValue builtIn="false" value=""${workspace_loc:/ops-class.org/kern/arch/mips/include}""/>
+ <listOptionValue builtIn="false" value=""${workspace_loc:/ops-class.org/kern/arch/mips/include/kern}""/>
+ <listOptionValue builtIn="false" value=""${workspace_loc:/ops-class.org/kern/arch/sys161/include}""/>
+ <listOptionValue builtIn="false" value=""${workspace_loc:/ops-class.org/user/include}""/>
+ <listOptionValue builtIn="false" value=""${workspace_loc:/ops-class.org/user/include/sys}""/>
+ <listOptionValue builtIn="false" value=""${workspace_loc:/ops-class.org/user/include/types}""/>
+ </option>
+ <option id="org.eclipse.cdt.build.core.settings.holder.symbols.1913623526" name="Symbols" superClass="org.eclipse.cdt.build.core.settings.holder.symbols" valueType="definedSymbols">
+ <listOptionValue builtIn="false" value="__GNUC__=1"/>
+ <listOptionValue builtIn="false" value="_KERNEL=1"/>
+ </option>
+ <inputType id="org.eclipse.cdt.build.core.settings.holder.inType.1280244984" languageId="org.eclipse.cdt.core.gcc" languageName="GNU C" sourceContentType="org.eclipse.cdt.core.cSource,org.eclipse.cdt.core.cHeader" superClass="org.eclipse.cdt.build.core.settings.holder.inType"/>
+ </tool>
+ </toolChain>
+ </folderInfo>
+ </configuration>
+ </storageModule>
+ <storageModule moduleId="org.eclipse.cdt.core.externalSettings"/>
+ </cconfiguration>
+ </storageModule>
+ <storageModule moduleId="cdtBuildSystem" version="4.0.0">
+ <project id="ops-class.org.null.919176761" name="ops-class.org"/>
+ </storageModule>
+ <storageModule moduleId="scannerConfiguration">
+ <autodiscovery enabled="true" problemReportingEnabled="true" selectedProfileId=""/>
+ <scannerConfigBuildInfo instanceId="0.1181601791">
+ <autodiscovery enabled="true" problemReportingEnabled="true" selectedProfileId=""/>
+ </scannerConfigBuildInfo>
+ </storageModule>
+ <storageModule moduleId="org.eclipse.cdt.core.LanguageSettingsProviders"/>
+</cproject>
diff --git a/.gitignore b/.gitignore
index ccea0c4..6520458 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,9 +1,6 @@
-.depend
-.settings
-.project
-.cproject
-/kern/compile/
-defs.mk
build
-/user/testbin/randcall/calls.c
-*.swp
+.depend
+/defs.mk
+kern/compile/
+user/testbin/randcall/calls.c
+typescript
diff --git a/.project b/.project
new file mode 100644
index 0000000..8f6a1b4
--- /dev/null
+++ b/.project
@@ -0,0 +1,27 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<projectDescription>
+ <name>ops-class.org</name>
+ <comment></comment>
+ <projects>
+ </projects>
+ <buildSpec>
+ <buildCommand>
+ <name>org.eclipse.cdt.managedbuilder.core.genmakebuilder</name>
+ <triggers>clean,full,incremental,</triggers>
+ <arguments>
+ </arguments>
+ </buildCommand>
+ <buildCommand>
+ <name>org.eclipse.cdt.managedbuilder.core.ScannerConfigBuilder</name>
+ <triggers>full,incremental,</triggers>
+ <arguments>
+ </arguments>
+ </buildCommand>
+ </buildSpec>
+ <natures>
+ <nature>org.eclipse.cdt.core.cnature</nature>
+ <nature>org.eclipse.cdt.core.ccnature</nature>
+ <nature>org.eclipse.cdt.managedbuilder.core.managedBuildNature</nature>
+ <nature>org.eclipse.cdt.managedbuilder.core.ScannerConfigNature</nature>
+ </natures>
+</projectDescription>
diff --git a/confinstall.sh b/confinstall.sh
new file mode 100755
index 0000000..1ef2bc3
--- /dev/null
+++ b/confinstall.sh
@@ -0,0 +1,18 @@
+#!/bin/bash
+
+default=ASST2
+
+if [ $# -eq 0 ]
+then
+ asst=$default
+ echo $asst
+else
+ asst=$1
+fi
+
+cd /home/trinity/src/kern/conf
+./config $asst
+cd ../compile/$asst
+bmake depend
+bmake
+bmake install
\ No newline at end of file
diff --git a/kern/arch/mips/syscall/syscall.c b/kern/arch/mips/syscall/syscall.c
index 0f773bd..fdfe27f 100644
--- a/kern/arch/mips/syscall/syscall.c
+++ b/kern/arch/mips/syscall/syscall.c
@@ -35,6 +35,8 @@
#include <thread.h>
#include <current.h>
#include <syscall.h>
+#include <addrspace.h>
+#include <file_syscalls.h>
/*
@@ -81,6 +83,8 @@ syscall(struct trapframe *tf)
int callno;
int32_t retval;
int err;
+ int whence;
+ off_t pos, retval64;
KASSERT(curthread != NULL);
KASSERT(curthread->t_curspl == 0);
@@ -98,6 +102,9 @@ syscall(struct trapframe *tf)
*/
retval = 0;
+ whence = 0;
+ pos = 0;
+ retval64 = 0;
switch (callno) {
case SYS_reboot:
@@ -111,6 +118,78 @@ syscall(struct trapframe *tf)
/* Add stuff here */
+ /*
+ * Process calls
+ */
+ case SYS_getpid:
+ err = sys_getpid(&retval);
+ break;
+
+ case SYS_fork:
+ err = sys_fork(tf, &retval);
+ break;
+
+ case SYS_execv:
+
+ break;
+
+ case SYS_waitpid:
+
+ break;
+
+ case SYS__exit:
+ err = sys_exit(tf->tf_a0);
+ break;
+
+
+ /*
+ * File System calls
+ */
+ case SYS_open:
+ err = sys_open((char *)tf->tf_a0, tf->tf_a1, tf->tf_a2, &retval);
+ break;
+
+ case SYS_close:
+ err = sys_close(tf->tf_a0, &retval);
+ break;
+
+ case SYS_read:
+ err = sys_read(tf->tf_a0, (void *)tf->tf_a1, (size_t)tf->tf_a2, &retval);
+ break;
+
+ case SYS_write:
+ err = sys_write(tf->tf_a0, (void *)tf->tf_a1, (size_t)tf->tf_a2, &retval);
+ break;
+
+ case SYS_lseek:
+ pos = (off_t)((tf->tf_a2<<31) | (tf->tf_a3));
+/* err = copyin((const_userptr_t)(tf->tf_sp + 16), &whence, (size_t)sizeof(whence));
+ if (err != 0) {
+ retval = err;
+ break;
+ }*/
+ whence = (int)tf->tf_sp + 16;
+ err = sys_lseek(tf->tf_a0, pos, whence, &retval64);
+ if (!err) {
+ uint32_t err32_high = (uint32_t)(retval64 >> 32);
+ uint32_t err32_low = (uint32_t)retval64;
+ tf->tf_v1 = err32_low;
+ retval = err32_high;
+ }
+ break;
+
+ case SYS_chdir:
+ err = sys_chdir((const char *)tf->tf_a0, &retval);
+ break;
+
+ case SYS_dup2:
+ err = sys_dup2(tf->tf_a0, tf->tf_a1, &retval);
+ break;
+
+ case SYS___getcwd:
+ err = sys___getcwd((char *)tf->tf_a0, (size_t)tf->tf_a1, &retval);
+ break;
+
default:
kprintf("Unknown syscall %d\n", callno);
err = ENOSYS;
@@ -155,7 +234,22 @@ syscall(struct trapframe *tf)
* Thus, you can trash it and do things another way if you prefer.
*/
void
-enter_forked_process(struct trapframe *tf)
+enter_forked_process(void *data1, unsigned long data2)
{
- (void)tf;
+
+ (void)data2;
+ struct trapframe *tf = (struct trapframe *) data1;
+ struct addrspace *child_addrspace = (struct addrspace *) tf->tf_a0;
+ struct trapframe tf_copy;
+
+ curthread->t_addrspace = child_addrspace;
+ as_activate(curthread->t_addrspace);
+
+ tf->tf_v0 = 0;
+ tf->tf_a3 = 0;
+ tf->tf_epc += 4;
+
+ memcpy(&tf_copy, tf, sizeof(struct trapframe));
+
+ mips_usermode(&tf_copy);
}
diff --git a/kern/conf/conf.kern b/kern/conf/conf.kern
index d527f61..9b8ee14 100644
--- a/kern/conf/conf.kern
+++ b/kern/conf/conf.kern
@@ -361,12 +361,14 @@ file vfs/devnull.c
#
# System call layer
# (You will probably want to add stuff here while doing the basic system
-# calls assignment.)
+# calls assignment.)l
#
file syscall/loadelf.c
file syscall/runprogram.c
file syscall/time_syscalls.c
+file syscall/process_syscalls.c
+file syscall/file_syscalls.c
#
# Startup and initialization
diff --git a/kern/include/file_syscalls.h b/kern/include/file_syscalls.h
new file mode 100644
index 0000000..4d183b6
--- /dev/null
+++ b/kern/include/file_syscalls.h
@@ -0,0 +1,33 @@
+/*
+ * filedefs.h
+ *
+ * Created on: Feb 28, 2015
+ * Author: trinity
+ */
+
+#ifndef FILEDEFS_H_
+#define FILEDEFS_H_
+
+typedef struct file_desc {
+ struct vnode *vd;
+ off_t offset;
+ int flags;
+ int ref_count;
+ struct lock *fl_lock;
+}FD;
+
+typedef FD * PFD;
+
+int sys_open(char* filename, int flags, mode_t mode, int32_t *retval);
+int sys_close(int fd, int32_t *retval);
+int sys_read(int fd, void *buf, size_t buflen, int32_t *retval);
+int sys_write(int fd, const void *buf, size_t nbytes, int32_t *retval);
+off_t sys_lseek(int fd, off_t pos, int whence, off_t *retval);
+int sys_dup2(int oldfd, int newfd, int32_t *retval);
+int sys_chdir(const char *pathname, int32_t *retval);
+int sys___getcwd(char *buf, size_t buflen, int32_t *retval);
+int file_desc_console_fd_init(void);
+
+
+
+#endif /* FILEDEFS_H_ */
diff --git a/kern/include/synch.h b/kern/include/synch.h
index ac3714b..5d3281d 100644
--- a/kern/include/synch.h
+++ b/kern/include/synch.h
@@ -1,156 +1,172 @@
-/*
- * Copyright (c) 2000, 2001, 2002, 2003, 2004, 2005, 2008, 2009
- * The President and Fellows of Harvard College.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- * notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- * notice, this list of conditions and the following disclaimer in the
- * documentation and/or other materials provided with the distribution.
- * 3. Neither the name of the University nor the names of its contributors
- * may be used to endorse or promote products derived from this software
- * without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE UNIVERSITY AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED. IN NO EVENT SHALL THE UNIVERSITY OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- */
-
-#ifndef _SYNCH_H_
-#define _SYNCH_H_
-
-/*
- * Header file for synchronization primitives.
- */
-
-
-#include <spinlock.h>
-
-/*
- * Dijkstra-style semaphore.
- *
- * The name field is for easier debugging. A copy of the name is made
- * internally.
- */
-struct semaphore {
- char *sem_name;
- struct wchan *sem_wchan;
- struct spinlock sem_lock;
- volatile int sem_count;
-};
-
-struct semaphore *sem_create(const char *name, int initial_count);
-void sem_destroy(struct semaphore *);
-
-/*
- * Operations (both atomic):
- * P (proberen): decrement count. If the count is 0, block until
- * the count is 1 again before decrementing.
- * V (verhogen): increment count.
- */
-void P(struct semaphore *);
-void V(struct semaphore *);
-
-
-/*
- * Simple lock for mutual exclusion.
- *
- * When the lock is created, no thread should be holding it. Likewise,
- * when the lock is destroyed, no thread should be holding it.
- *
- * The name field is for easier debugging. A copy of the name is
- * (should be) made internally.
- */
-struct lock {
- char *lk_name;
- // add what you need here
- // (don't forget to mark things volatile as needed)
-};
-
-struct lock *lock_create(const char *name);
-void lock_acquire(struct lock *);
-
-/*
- * Operations:
- * lock_acquire - Get the lock. Only one thread can hold the lock at the
- * same time.
- * lock_release - Free the lock. Only the thread holding the lock may do
- * this.
- * lock_do_i_hold - Return true if the current thread holds the lock;
- * false otherwise.
- *
- * These operations must be atomic. You get to write them.
- */
-void lock_release(struct lock *);
-bool lock_do_i_hold(struct lock *);
-void lock_destroy(struct lock *);
-
-
-/*
- * Condition variable.
- *
- * Note that the "variable" is a bit of a misnomer: a CV is normally used
- * to wait until a variable meets a particular condition, but there's no
- * actual variable, as such, in the CV.
- *
- * These CVs are expected to support Mesa semantics, that is, no
- * guarantees are made about scheduling.
- *
- * The name field is for easier debugging. A copy of the name is
- * (should be) made internally.
- */
-
-struct cv {
- char *cv_name;
- // add what you need here
- // (don't forget to mark things volatile as needed)
-};
-
-struct cv *cv_create(const char *name);
-void cv_destroy(struct cv *);
-
-/*
- * Operations:
- * cv_wait - Release the supplied lock, go to sleep, and, after
- * waking up again, re-acquire the lock.
- * cv_signal - Wake up one thread that's sleeping on this CV.
- * cv_broadcast - Wake up all threads sleeping on this CV.
- *
- * For all three operations, the current thread must hold the lock passed
- * in. Note that under normal circumstances the same lock should be used
- * on all operations with any particular CV.
- *
- * These operations must be atomic. You get to write them.
- */
-void cv_wait(struct cv *cv, struct lock *lock);
-void cv_signal(struct cv *cv, struct lock *lock);
-void cv_broadcast(struct cv *cv, struct lock *lock);
-
-/*
- * 13 Feb 2012 : GWA : Reader-writer locks.
- */
-
-struct rwlock {
- char *rwlock_name;
-};
-
-struct rwlock * rwlock_create(const char *);
-void rwlock_destroy(struct rwlock *);
-
-void rwlock_acquire_read(struct rwlock *);
-void rwlock_release_read(struct rwlock *);
-void rwlock_acquire_write(struct rwlock *);
-void rwlock_release_write(struct rwlock *);
-
-#endif /* _SYNCH_H_ */
+/*
+ * Copyright (c) 2000, 2001, 2002, 2003, 2004, 2005, 2008, 2009
+ * The President and Fellows of Harvard College.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ * notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ * notice, this list of conditions and the following disclaimer in the
+ * documentation and/or other materials provided with the distribution.
+ * 3. Neither the name of the University nor the names of its contributors
+ * may be used to endorse or promote products derived from this software
+ * without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE UNIVERSITY AND CONTRIBUTORS ``AS IS'' AND
+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED. IN NO EVENT SHALL THE UNIVERSITY OR CONTRIBUTORS BE LIABLE
+ * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+ * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
+ * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+ * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
+ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+ * SUCH DAMAGE.
+ */
+
+#ifndef _SYNCH_H_
+#define _SYNCH_H_
+
+/*
+ * Header file for synchronization primitives.
+ */
+
+#include <types.h>
+#include <spinlock.h>
+
+/*
+ * Dijkstra-style semaphore.
+ *
+ * The name field is for easier debugging. A copy of the name is made
+ * internally.
+ */
+struct semaphore {
+ char *sem_name;
+ struct wchan *sem_wchan;
+ struct spinlock sem_lock;
+ volatile int sem_count;
+};
+
+struct semaphore *sem_create(const char *name, int initial_count);
+void sem_destroy(struct semaphore *);
+
+/*
+ * Operations (both atomic):
+ * P (proberen): decrement count. If the count is 0, block until
+ * the count is 1 again before decrementing.
+ * V (verhogen): increment count.
+ */
+void P(struct semaphore *);
+void V(struct semaphore *);
+
+
+/*
+ * Simple lock for mutual exclusion.
+ *
+ * When the lock is created, no thread should be holding it. Likewise,
+ * when the lock is destroyed, no thread should be holding it.
+ *
+ * The name field is for easier debugging. A copy of the name is
+ * (should be) made internally.
+ */
+struct lock {
+ char *lk_name;
+ struct thread *lk_holder;
+ struct wchan *lk_wchan;
+ struct spinlock lk_lock;
+};
+
+struct lock *lock_create(const char *name);
+void lock_acquire(struct lock *);
+
+/*
+ * Operations:
+ * lock_acquire - Get the lock. Only one thread can hold the lock at the
+ * same time.
+ * lock_release - Free the lock. Only the thread holding the lock may do
+ * this.
+ * lock_do_i_hold - Return true if the current thread holds the lock;
+ * false otherwise.
+ *
+ * These operations must be atomic. You get to write them.
+ */
+void lock_release(struct lock *);
+bool lock_do_i_hold(struct lock *);
+void lock_destroy(struct lock *);
+
+
+/*
+ * Condition variable.
+ *
+ * Note that the "variable" is a bit of a misnomer: a CV is normally used
+ * to wait until a variable meets a particular condition, but there's no
+ * actual variable, as such, in the CV.
+ *
+ * These CVs are expected to support Mesa semantics, that is, no
+ * guarantees are made about scheduling.
+ *
+ * The name field is for easier debugging. A copy of the name is
+ * (should be) made internally.
+ */
+
+struct cv {
+ char *cv_name;
+ struct wchan *cv_wchan;
+};
+
+struct cv *cv_create(const char *name);
+void cv_destroy(struct cv *);
+
+/*
+ * Operations:
+ * cv_wait - Release the supplied lock, go to sleep, and, after
+ * waking up again, re-acquire the lock.
+ * cv_signal - Wake up one thread that's sleeping on this CV.
+ * cv_broadcast - Wake up all threads sleeping on this CV.
+ *
+ * For all three operations, the current thread must hold the lock passed
+ * in. Note that under normal circumstances the same lock should be used
+ * on all operations with any particular CV.
+ *
+ * These operations must be atomic. You get to write them.
+ */
+void cv_wait(struct cv *cv, struct lock *lock);
+void cv_signal(struct cv *cv, struct lock *lock);
+void cv_broadcast(struct cv *cv, struct lock *lock);
+
+/*
+ * 13 Feb 2012 : GWA : Reader-writer locks.
+ */
+
+#define RW_MODE_READ 0
+#define RW_MODE_WRITES_WAITING 1
+#define RW_MODE_WRITE 2
+#define RW_MIN_READ_THREADS 4
+
+struct rwlock {
+ char *rwlock_name;
+
+ struct wchan *rwlock_rd_wchan;
+ struct wchan *rwlock_wr_wchan;
+
+ volatile int rwlock_rdlk_count;
+ volatile int rwlock_wrlk_count;
+
+ struct spinlock rwlock_lock;
+
+ uint8_t rwlock_mode;
+ uint8_t rwlock_rd_threads_serviced;
+};
+
+struct rwlock * rwlock_create(const char *);
+void rwlock_destroy(struct rwlock *);
+
+void rwlock_acquire_read(struct rwlock *);
+void rwlock_release_read(struct rwlock *);
+void rwlock_acquire_write(struct rwlock *);
+void rwlock_release_write(struct rwlock *);
+
+#endif /* _SYNCH_H_ */
diff --git a/kern/include/syscall.h b/kern/include/syscall.h
index befd3d8..8e46fa8 100644
--- a/kern/include/syscall.h
+++ b/kern/include/syscall.h
@@ -44,7 +44,7 @@ void syscall(struct trapframe *tf);
*/
/* Helper for fork(). You write this. */
-void enter_forked_process(struct trapframe *tf);
+void enter_forked_process(void *data1, unsigned long data2);
/* Enter user mode. Does not return. */
void enter_new_process(int argc, userptr_t argv, vaddr_t stackptr,
@@ -57,5 +57,8 @@ void enter_new_process(int argc, userptr_t argv, vaddr_t stackptr,
int sys_reboot(int code);
int sys___time(userptr_t user_seconds, userptr_t user_nanoseconds);
+int sys_fork(struct trapframe *tf, int32_t *retval);
+int sys_getpid(int32_t *retval);
+int sys_exit(int _exitcode);
#endif /* _SYSCALL_H_ */
diff --git a/kern/include/test.h b/kern/include/test.h
index 240d583..8a195ac 100644
--- a/kern/include/test.h
+++ b/kern/include/test.h
@@ -90,6 +90,7 @@ int semtest(int, char **);
int locktest(int, char **);
int cvtest(int, char **);
int cvtest2(int, char **);
+int rwlocktest(int, char **);
/* filesystem tests */
int fstest(int, char **);
diff --git a/kern/include/thread.h b/kern/include/thread.h
index 86706ca..526f42a 100644
--- a/kern/include/thread.h
+++ b/kern/include/thread.h
@@ -26,7 +26,7 @@
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
*/
-
+#include <limits.h>
#ifndef _THREAD_H_
#define _THREAD_H_
@@ -56,6 +56,12 @@ struct vnode;
/* Macro to test if two addresses are on the same kernel stack */
#define SAME_STACK(p1, p2) (((p1) & STACK_MASK) == ((p2) & STACK_MASK))
+/* Maximum number of threads/processes */
+#define MAX_PROCESSES 256
+
+/* Maximum number of open file handles */
+#define MAX_FILES 256
+
/* States a thread can be in. */
typedef enum {
@@ -112,8 +118,18 @@ struct thread {
struct vnode *t_cwd; /* current working directory */
/* add more here as needed */
+ pid_t t_pid; /* Process ID */
+ pid_t t_ppid; /* Parent's process ID */
+
+ bool t_exited; /* Exited or not? */
+ int t_exitcode; /* Exit code */
+
+ struct file_desc* fd_table[OPEN_MAX]; //need to replace by OPEN_MAX
};
+
+
+
/* Call once during system startup to allocate data structures. */
void thread_bootstrap(void);
@@ -165,4 +181,7 @@ void schedule(void);
void thread_consider_migration(void);
+int thread_assignpid(struct thread *thrd);
+void thread_reclaimpid(struct thread *thrd);
+
#endif /* _THREAD_H_ */
diff --git a/kern/startup/main.c b/kern/startup/main.c
index be4c4b8..4c4f3c8 100644
--- a/kern/startup/main.c
+++ b/kern/startup/main.c
@@ -1,3 +1,5 @@
+/* Comment added by arindamn@buffalo.edu */
+
/*
* Copyright (c) 2000, 2001, 2002, 2003, 2004, 2005, 2008, 2009
* The President and Fellows of Harvard College.
@@ -100,7 +102,7 @@ boot(void)
kprintf("%s", harvard_copyright);
kprintf("\n");
- kprintf("Put-your-group-name-here's system version %s (%s #%d)\n",
+ kprintf("Kernel Panic's system version %s (%s #%d)\n",
GROUP_VERSION, buildconfig, buildversion);
kprintf("\n");
diff --git a/kern/startup/menu.c b/kern/startup/menu.c
index 6c71551..28a045f 100644
--- a/kern/startup/menu.c
+++ b/kern/startup/menu.c
@@ -449,6 +449,7 @@ static const char *testmenu[] = {
"[sy1] Semaphore test ",
"[sy2] Lock test (1) ",
"[sy3] CV test (1) ",
+ "[sy4] RW Lock test ",
"[sy5] CV test 2 (1) ",
"[sp1] Whalematching Driver (1) ",
"[sp2] Stoplight Driver (1) ",
@@ -546,6 +547,7 @@ static struct {
/* synchronization assignment tests */
{ "sy2", locktest },
{ "sy3", cvtest },
+ { "sy4", rwlocktest },
{ "sy5", cvtest2 },
#if OPT_SYNCHPROBS
diff --git a/kern/synchprobs/problems.c b/kern/synchprobs/problems.c
index 81d2f0e..2f44ad1 100644
--- a/kern/synchprobs/problems.c
+++ b/kern/synchprobs/problems.c
@@ -35,6 +35,7 @@
#include <thread.h>
#include <test.h>
#include <synch.h>
+#include <wchan.h>
/*
* 08 Feb 2012 : GWA : Driver code is in kern/synchprobs/driver.c. We will
@@ -47,7 +48,14 @@
// functions will allow you to do local initialization. They are called at
// the top of the corresponding driver code.
+struct semaphore *whl_male;
+struct semaphore *whl_female;
+struct semaphore *whl_matchmkr;
+
void whalemating_init() {
+ whl_male = sem_create("male_whale", 0);
+ whl_female = sem_create("female_whale", 0);
+ whl_matchmkr = sem_create("matchmaker_whale", 0);
return;
}
@@ -55,6 +63,9 @@ void whalemating_init() {
// care if your problems leak memory, but if you do, use this to clean up.
void whalemating_cleanup() {
+ sem_destroy(whl_male);
+ sem_destroy(whl_female);
+ sem_destroy(whl_matchmkr);
return;
}
@@ -66,6 +77,7 @@ male(void *p, unsigned long which)
male_start();
// Implement this function
+ P(whl_male);
male_end();
// 08 Feb 2012 : GWA : Please do not change this code. This is so that your
@@ -82,6 +94,7 @@ female(void *p, unsigned long which)
female_start();
// Implement this function
+ P(whl_female);
female_end();
// 08 Feb 2012 : GWA : Please do not change this code. This is so that your
@@ -98,6 +111,10 @@ matchmaker(void *p, unsigned long which)
matchmaker_start();
// Implement this function
+ V(whl_male);
+ V(whl_female);
+ V(whl_matchmkr);
+ P(whl_matchmkr);
matchmaker_end();
// 08 Feb 2012 : GWA : Please do not change this code. This is so that your
@@ -137,49 +154,146 @@ matchmaker(void *p, unsigned long which)
// functions will allow you to do local initialization. They are called at
// the top of the corresponding driver code.
+struct lock *sp2_lk;
+struct wchan *sp2_wc;
+bool locked_quadrants[4] = {false, false, false, false};
+
void stoplight_init() {
- return;
+
+ sp2_lk = lock_create("stoplight lock");
+ sp2_wc = wchan_create("stoplight wait channel");
+ return;
}
// 20 Feb 2012 : GWA : Adding at the suggestion of Nikhil Londhe. We don't
// care if your problems leak memory, but if you do, use this to clean up.
void stoplight_cleanup() {
- return;
+
+ lock_destroy(sp2_lk);
+ return;
}
void
gostraight(void *p, unsigned long direction)
{
struct semaphore * stoplightMenuSemaphore = (struct semaphore *)p;
- (void)direction;
+
+ lock_acquire(sp2_lk);
+ while(locked_quadrants[direction]
+ || locked_quadrants[(direction + 3) % 4]) {
+ wchan_lock(sp2_wc);
+ lock_release(sp2_lk);
+ wchan_sleep(sp2_wc);
+
+ lock_acquire(sp2_lk);
+ }
+
+ locked_quadrants[direction] = true;
+ locked_quadrants[(direction + 3) % 4] = true;
+ lock_release(sp2_lk);
+
+ inQuadrant(direction);
+ inQuadrant((direction + 3) % 4);
+ leaveIntersection();
+
+ lock_acquire(sp2_lk);
+ locked_quadrants[direction] = false;
+ locked_quadrants[(direction + 3) % 4] = false;
+ lock_release(sp2_lk);
+
+ wchan_wakeall(sp2_wc);
- // 08 Feb 2012 : GWA : Please do not change this code. This is so that your
- // stoplight driver can return to the menu cleanly.
- V(stoplightMenuSemaphore);
- return;
+ // 08 Feb 2012 : GWA : Please do not change this code. This is so that your
+ // stoplight driver can return to the menu cleanly.
+ V(stoplightMenuSemaphore);
+ return;
}
void
turnleft(void *p, unsigned long direction)
{
struct semaphore * stoplightMenuSemaphore = (struct semaphore *)p;
- (void)direction;
+ int second_quadrant;
+
+ lock_acquire(sp2_lk);
+ while(locked_quadrants[direction]
+ || locked_quadrants[(direction + 2) % 4]
+ || (locked_quadrants[(direction + 1) % 4] && locked_quadrants[(direction + 3) % 4])) {
+ wchan_lock(sp2_wc);
+ lock_release(sp2_lk);
+ wchan_sleep(sp2_wc);
+
+ lock_acquire(sp2_lk);
+ }
+
+ if(locked_quadrants[(direction + 1) % 4]) {
+ second_quadrant = (direction + 3) % 4;
+ }
+ else {
+ second_quadrant = (direction + 1) % 4;
+ }
+
+ locked_quadrants[direction] = true;
+ locked_quadrants[second_quadrant] = true;
+ locked_quadrants[(direction + 2) % 4] = true;
+
+ lock_release(sp2_lk);
+
+
+
+ inQuadrant(direction);
+ inQuadrant(second_quadrant);
+ inQuadrant((direction + 2) % 4);
+
+ leaveIntersection();
+
+
+
+ lock_acquire(sp2_lk);
+
+ locked_quadrants[direction] = false;
+ locked_quadrants[second_quadrant] = false;
+ locked_quadrants[(direction + 2) % 4] = false;
+
+ lock_release(sp2_lk);
- // 08 Feb 2012 : GWA : Please do not change this code. This is so that your
- // stoplight driver can return to the menu cleanly.
- V(stoplightMenuSemaphore);
- return;
+ wchan_wakeall(sp2_wc);
+
+ // 08 Feb 2012 : GWA : Please do not change this code. This is so that your
+ // stoplight driver can return to the menu cleanly.
+ V(stoplightMenuSemaphore);
+ return;
}
void
turnright(void *p, unsigned long direction)
{
struct semaphore * stoplightMenuSemaphore = (struct semaphore *)p;
- (void)direction;
- // 08 Feb 2012 : GWA : Please do not change this code. This is so that your
- // stoplight driver can return to the menu cleanly.