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

fix: synchronise threads' SPTs with locks

Browse Source
This commit is contained in:
Gleb Koval
2024-12-06 17:31:33 +00:00
parent eba8c1ffa8
commit 77fedd6666
4 changed files with 13 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
src/vm/page.c
View File

@@ -90,6 +90,7 @@ page_insert_swapped (void *upage, void *kpage, struct list *owners)
/* 1. Initialize swapped page entry. */
struct page_entry *page = page_get (owner, upage);
lock_acquire (&owner->pages_lock);
if (page == NULL)
{
page = malloc (sizeof (struct page_entry));
@@ -113,6 +114,7 @@ page_insert_swapped (void *upage, void *kpage, struct list *owners)
page_set_swap (owner, pte, swap_slot);
lock_release (&page->lock);
lock_release (&owner->pages_lock);
}
if (exec_file != NULL)
{
@@ -155,7 +157,10 @@ page_insert_file (struct file *file, off_t ofs, void *upage,
page->writable = writable;
lock_init (&page->lock);
hash_insert (&thread_current ()->pages, &page->elem);
struct thread *t = thread_current ();
lock_acquire (&t->pages_lock);
hash_insert (&t->pages, &page->elem);
lock_release (&t->pages_lock);
return page;
}
@@ -167,8 +172,10 @@ page_get (struct thread *thread, void *upage)
struct page_entry fake_page_entry;
fake_page_entry.upage = upage;
lock_acquire (&thread->pages_lock);
struct hash_elem *e
= hash_find (&thread->pages, &fake_page_entry.elem);
lock_release (&thread->pages_lock);
if (e == NULL)
return NULL;