Merge branch 'vm/syscall-mmap/styling' into 'master'
Refactor page to follow pintos styling for indentation and add spacing for readability See merge request lab2425_autumn/pintos_22!69
This commit is contained in:
@@ -195,6 +195,7 @@ page_load_file (struct page_entry *page)
|
||||
lock_acquire (&shared_file_pages_lock);
|
||||
struct shared_file_page *sfp
|
||||
= shared_file_page_get (page->file, page->upage);
|
||||
|
||||
if (sfp != NULL)
|
||||
{
|
||||
/* Frame exists, just install it. */
|
||||
@@ -207,7 +208,8 @@ page_load_file (struct page_entry *page)
|
||||
}
|
||||
frame_owner_insert (sfp->frame, t);
|
||||
}
|
||||
/* Shared page is in swap. Load it. */
|
||||
|
||||
/* Otherwise, shared page is in swap. Load it. */
|
||||
else
|
||||
{
|
||||
void *frame = frame_alloc (PAL_USER, page->upage, t);
|
||||
@@ -223,6 +225,7 @@ page_load_file (struct page_entry *page)
|
||||
return false;
|
||||
}
|
||||
}
|
||||
|
||||
page_flag_shared (t, page->upage, true);
|
||||
if (page->type != PAGE_SHARED)
|
||||
{
|
||||
@@ -320,12 +323,12 @@ page_cleanup (struct hash_elem *e, void *aux UNUSED)
|
||||
/* Flags the provided page table entry as representing a swapped out page. */
|
||||
void
|
||||
page_flag_swap (uint32_t *pte, bool set)
|
||||
{
|
||||
if (set)
|
||||
*pte |= (1 << SWAP_FLAG_BIT);
|
||||
else
|
||||
*pte &= ~(1 << SWAP_FLAG_BIT);
|
||||
}
|
||||
{
|
||||
if (set)
|
||||
*pte |= (1 << SWAP_FLAG_BIT);
|
||||
else
|
||||
*pte &= ~(1 << SWAP_FLAG_BIT);
|
||||
}
|
||||
|
||||
/* Sets the address bits of the page table entry to the provided swap slot
|
||||
value. To be used for later retrieval of the swap slot when page faulting. */
|
||||
|
||||
Reference in New Issue
Block a user