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

feat: merged shared-read-only-executables with the rest of VM

Browse Source
This commit is contained in:
Themis Demetriades
2024-12-06 04:15:13 +00:00
parent 3897e83963 1da0c7d48c
commit 65da1659e5
8 changed files with 479 additions and 101 deletions
Download Patch File Download Diff File Expand all files Collapse all files

37
src/vm/page.h
View File

@@ -5,12 +5,16 @@
#include "threads/synch.h"
#include "filesys/off_t.h"
enum page_type {
enum page_type
{
PAGE_FILE,
PAGE_MMAP
PAGE_MMAP,
PAGE_EMPTY,
PAGE_SHARED
};
struct page_entry {
struct page_entry
{
enum page_type type; /* Type of Data that should go into the page */
void *upage; /* Start Address of the User Page (Key of hash table). */
@@ -29,19 +33,32 @@ struct page_entry {
struct hash_elem elem; /* An elem for the hash table. */
};
unsigned page_hash (const struct hash_elem *e, void *aux);
bool page_less (const struct hash_elem *a_, const struct hash_elem *b_,
void *aux);
struct page_entry *page_insert_swapped (void *upage, void* kpage,
struct thread *owner);
struct shared_file_page
{
struct file *file;
void *upage;
void *frame;
size_t swap_slot;
int ref_count;
struct hash_elem elem;
};
bool init_pages (struct hash *pages);
bool page_insert_swapped (void *upage, void *kpage, struct list *owners);
struct page_entry *page_insert_file (struct file *file, off_t ofs, void *upage,
uint32_t read_bytes, uint32_t zero_bytes,
bool writable, enum page_type);
struct page_entry *page_get (struct thread *thread, void *upage);
bool page_load_file (struct page_entry *page, bool writable);
bool page_load_file (struct page_entry *page);
void page_cleanup (struct hash_elem *e, void *aux);
bool page_in_swap (struct thread *, void *);
bool page_in_swap_pte (uint32_t *pte);
size_t page_get_swap (struct thread *owner, void *upage);
size_t page_get_swap_pte (uint32_t *pte);
#endif /* vm/frame.h */
bool page_is_shared_pte (uint32_t *pte);
void shared_file_pages_init (void);
#endif