From 8d1b4c4994c45688e4073fa2d5cce8fd139ce70f Mon Sep 17 00:00:00 2001 From: sBubshait Date: Fri, 6 Dec 2024 18:36:54 +0000 Subject: [PATCH] Refactor page to follow pintos styling for indentation and add spacing for readability --- src/vm/page.c | 17 ++++++++++------- 1 file changed, 10 insertions(+), 7 deletions(-) diff --git a/src/vm/page.c b/src/vm/page.c index 487103d..70fb3b8 100644 --- a/src/vm/page.c +++ b/src/vm/page.c @@ -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. */