KAAAsS/ChCore-exercise
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

修正读文件时重复映射

Browse Source
This commit is contained in:
KAAAsS 2022-04-20 23:08:34 +08:00
parent b51087922a
commit a41bd3ef2e
Signed by: KAAAsS
GPG Key ID: D22F53AF662411FE
1 changed files with 14 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
lab5/user/lab5/apps/init.c
View File

@ -189,12 +189,22 @@ int fs_read(char *path, off_t offset, ssize_t count) {
*/ */
int fs_read_all(char *path, void **ret_buf) int fs_read_all(char *path, void **ret_buf)
{ {
int ret;
// 获得文件长度 // 获得文件长度
int size = fs_get_size(path); int size = fs_get_size(path);
if (size < 0) { if (size < 0) {
return size; return size;
} }
// 映射读文件区
ret = usys_map_pmo(SELF_CAP,
tmpfs_read_pmo_cap,
TMPFS_READ_BUF_VADDR, VM_READ | VM_WRITE);
if (ret < 0) {
return ret;
}
// 申请缓冲 // 申请缓冲
unsigned char *buf = malloc(size); unsigned char *buf = malloc(size);
if (!buf) { if (!buf) {
@ -206,7 +216,7 @@ int fs_read_all(char *path, void **ret_buf)
// FIXME: 读取 1 页以上会遇到 warning: vmr overlap // FIXME: 读取 1 页以上会遇到 warning: vmr overlap
int pos = 0; int pos = 0;
while (size - pos > 0) { while (size - pos > 0) {
int cur = fs_read(path, pos, PAGE_SIZE - 1); int cur = fs_read(path, pos, PAGE_SIZE);
if (cur < 0) { if (cur < 0) {
return cur; return cur;
} }
@ -215,6 +225,9 @@ int fs_read_all(char *path, void **ret_buf)
buf += cur; buf += cur;
} }
// 释放
usys_unmap_pmo(SELF_CAP, tmpfs_read_pmo_cap, TMPFS_READ_BUF_VADDR);
return size; return size;
} }
@ -446,10 +459,5 @@ void boot_fs(void)
fail_cond(tmpfs_read_pmo_cap < 0, "usys create_ret ret %d\n", fail_cond(tmpfs_read_pmo_cap < 0, "usys create_ret ret %d\n",
tmpfs_read_pmo_cap); tmpfs_read_pmo_cap);
ret = usys_map_pmo(SELF_CAP,
tmpfs_read_pmo_cap,
TMPFS_READ_BUF_VADDR, VM_READ | VM_WRITE);
fail_cond(ret < 0, "usys_map_pmo ret %d\n", ret);
printf("fs is UP.\n"); printf("fs is UP.\n");
} }