Imperial-MEng/pintos_22
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Refactor page to follow pintos styling for indentation and add spacing for readability #69

Merged
sb3923 merged 1 commits from vm/syscall-mmap/styling into master 2024-12-06 18:37:19 +00:00
Conversation 4 Commits 1 Files Changed 1 +10 -7
1 changed files with 10 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit 8d1b4c4994 - Show all commits

5
src/vm/page.c
View File

@@ -195,6 +195,7 @@ page_load_file (struct page_entry *page)
lock_acquire (&shared_file_pages_lock); lock_acquire (&shared_file_pages_lock);
struct shared_file_page *sfp struct shared_file_page *sfp
= shared_file_page_get (page->file, page->upage); = shared_file_page_get (page->file, page->upage);
if (sfp != NULL) if (sfp != NULL)
{ {
/* Frame exists, just install it. */ /* Frame exists, just install it. */
@@ -207,7 +208,8 @@ page_load_file (struct page_entry *page)
} }
frame_owner_insert (sfp->frame, t); frame_owner_insert (sfp->frame, t);
} }
/* Shared page is in swap. Load it. */
/* Otherwise, shared page is in swap. Load it. */
else else
{ {
void *frame = frame_alloc (PAL_USER, page->upage, t); void *frame = frame_alloc (PAL_USER, page->upage, t);
@@ -223,6 +225,7 @@ page_load_file (struct page_entry *page)
return false; return false;
} }
} }
page_flag_shared (t, page->upage, true); page_flag_shared (t, page->upage, true);
if (page->type != PAGE_SHARED) if (page->type != PAGE_SHARED)
{ {