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

Merge branch 'virtual-memory' into 'page-swap-helpers'

Browse Source 
# Conflicts:
#   src/vm/frame.c
#   src/vm/page.c
This commit is contained in:
Demetriades, Themis
2024-12-01 21:44:17 +00:00
parent 94adc11f03 7ce512305e
commit 9d35beb2e4
2 changed files with 13 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/userprog/Make.vars
View File

@@ -1,6 +1,6 @@
# -*- makefile -*-
kernel.bin: DEFINES = -DUSERPROG -DFILESYS -DVM
kernel.bin: DEFINES = -DUSERPROG -DFILESYS
KERNEL_SUBDIRS = threads devices lib lib/kernel userprog filesys vm
TEST_SUBDIRS = tests/userprog tests/userprog/no-vm tests/filesys/base
GRADING_FILE = $(SRCDIR)/tests/userprog/Grading

14
src/vm/frame.c
View File

@@ -118,14 +118,20 @@ frame_alloc (enum palloc_flags flags, void *upage, struct thread *owner)
frame_metadata->frame = frame;
/* Newly allocated frames are pushed to the back of the circular queue
represented by lru_list. */
represented by lru_list. Must explicitly handle the case where the
circular queue is empty (when next_victim == NULL). */
if (next_victim == NULL)
{
list_push_back (&lru_list, &frame_metadata->list_elem);
next_victim = &frame_metadata->list_elem;
}
else
{
struct list_elem *lru_tail = lru_prev (next_victim);
list_insert (lru_tail, &frame_metadata->list_elem);
}
hash_insert (&frame_table, &frame_metadata->hash_elem);
if (next_victim == NULL)
next_victim = &frame_metadata->list_elem;
}
frame_metadata->upage = upage;