update codes for os course-YAO-class, fall, 2013

2013-09-17 10:34:45 +08:00
parent 54410feba2
commit 1851498df5
47 changed files with 50 additions and 34 deletions
--- a/code/lab8/kern/fs/devs/dev.c
+++ b/code/lab8/kern/fs/devs/dev.c
--- a/code/lab8/kern/fs/devs/dev.h
+++ b/code/lab8/kern/fs/devs/dev.h
--- a/code/lab8/kern/fs/devs/dev_disk0.c
+++ b/code/lab8/kern/fs/devs/dev_disk0.c
--- a/code/lab8/kern/fs/devs/dev_stdin.c
+++ b/code/lab8/kern/fs/devs/dev_stdin.c
--- a/code/lab8/kern/fs/devs/dev_stdout.c
+++ b/code/lab8/kern/fs/devs/dev_stdout.c
--- a/code/lab8/kern/fs/file.c
+++ b/code/lab8/kern/fs/file.c
--- a/code/lab8/kern/fs/file.h
+++ b/code/lab8/kern/fs/file.h
--- a/code/lab8/kern/fs/fs.c
+++ b/code/lab8/kern/fs/fs.c
--- a/code/lab8/kern/fs/fs.h
+++ b/code/lab8/kern/fs/fs.h
--- a/code/lab8/kern/fs/iobuf.c
+++ b/code/lab8/kern/fs/iobuf.c
--- a/code/lab8/kern/fs/iobuf.h
+++ b/code/lab8/kern/fs/iobuf.h
--- a/code/lab8/kern/fs/sfs/bitmap.c
+++ b/code/lab8/kern/fs/sfs/bitmap.c
--- a/code/lab8/kern/fs/sfs/bitmap.h
+++ b/code/lab8/kern/fs/sfs/bitmap.h
--- a/code/lab8/kern/fs/sfs/sfs.c
+++ b/code/lab8/kern/fs/sfs/sfs.c
--- a/code/lab8/kern/fs/sfs/sfs.h
+++ b/code/lab8/kern/fs/sfs/sfs.h
--- a/code/lab8/kern/fs/sfs/sfs_fs.c
+++ b/code/lab8/kern/fs/sfs/sfs_fs.c
--- a/code/lab8/kern/fs/sfs/sfs_inode.c
+++ b/code/lab8/kern/fs/sfs/sfs_inode.c
--- a/code/lab8/kern/fs/sfs/sfs_io.c
+++ b/code/lab8/kern/fs/sfs/sfs_io.c
--- a/code/lab8/kern/fs/sfs/sfs_lock.c
+++ b/code/lab8/kern/fs/sfs/sfs_lock.c
--- a/code/lab8/kern/fs/swap/swapfs.c
+++ b/code/lab8/kern/fs/swap/swapfs.c
--- a/code/lab8/kern/fs/swap/swapfs.h
+++ b/code/lab8/kern/fs/swap/swapfs.h
--- a/code/lab8/kern/fs/sysfile.c
+++ b/code/lab8/kern/fs/sysfile.c
--- a/code/lab8/kern/fs/sysfile.h
+++ b/code/lab8/kern/fs/sysfile.h
--- a/code/lab8/kern/fs/vfs/inode.c
+++ b/code/lab8/kern/fs/vfs/inode.c
--- a/code/lab8/kern/fs/vfs/inode.h
+++ b/code/lab8/kern/fs/vfs/inode.h
--- a/code/lab8/kern/fs/vfs/vfs.c
+++ b/code/lab8/kern/fs/vfs/vfs.c
--- a/code/lab8/kern/fs/vfs/vfs.h
+++ b/code/lab8/kern/fs/vfs/vfs.h
--- a/code/lab8/kern/fs/vfs/vfsdev.c
+++ b/code/lab8/kern/fs/vfs/vfsdev.c
--- a/code/lab8/kern/fs/vfs/vfsfile.c
+++ b/code/lab8/kern/fs/vfs/vfsfile.c
--- a/code/lab8/kern/fs/vfs/vfslookup.c
+++ b/code/lab8/kern/fs/vfs/vfslookup.c
--- a/code/lab8/kern/fs/vfs/vfspath.c
+++ b/code/lab8/kern/fs/vfs/vfspath.c
--- a/code/lab8/kern/mm/kmalloc.c
+++ b/code/lab8/kern/mm/kmalloc.c
@@ -186,14 +186,9 @@ static void slob_free(void *block, int size)



-void check_slob(void) {
-  cprintf("check_slob() success\n");
-}
-
 void
 slob_init(void) {
  cprintf("use SLOB allocator\n");
-  check_slob();
 }

 inline void 
--- a/code/lab8/libs/dirent.h
+++ b/code/lab8/libs/dirent.h
--- a/code/lab8/tools/grade.sh
+++ b/code/lab8/tools/grade.sh
@@ -314,11 +314,14 @@ quick_check() {
 ## kernel image
 osimg=$(make_print ucoreimg)

+## sfs image
+sfsimg=$(make_print sfsimg)
+
 ## swap image
 swapimg=$(make_print swapimg)

 ## set default qemu-options
-qemuopts="-hda $osimg -drive file=$swapimg,media=disk,cache=writeback"
+qemuopts="-hda $osimg -drive file=$swapimg,media=disk,cache=writeback -drive file=$sfsimg,media=disk,cache=writeback"

 ## set break-function, default is readline
 brkfun=readline
--- a/code/lab8/user/ls.c
+++ b/code/lab8/user/ls.c
--- a/code/lab8/user/sh.c
+++ b/code/lab8/user/sh.c