Merge branch 'vm/merged/pinning-synch' into 'master'

fix: re-enable shareable read only executable logic

See merge request lab2425_autumn/pintos_22!65
This commit is contained in:
Dias Alberto, Ethan
2024-12-06 17:13:02 +00:00

View File

@@ -183,7 +183,6 @@ page_load_file (struct page_entry *page)
panics as this should not happen if eviction is working correctly. */ panics as this should not happen if eviction is working correctly. */
struct thread *t = thread_current (); struct thread *t = thread_current ();
bool shareable = !page->writable && file_compare (page->file, t->exec_file); bool shareable = !page->writable && file_compare (page->file, t->exec_file);
shareable = false;
if (shareable) if (shareable)
{ {
lock_acquire (&shared_file_pages_lock); lock_acquire (&shared_file_pages_lock);