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

Fix Bug: Initialise the mmap table for the newly created thread rather than the current thread

Browse Source
This commit is contained in:
sBubshait
2024-12-04 17:41:14 +00:00
parent 67f16cb2a6
commit 72fa0c1bbb
3 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/threads/thread.c
View File

@@ -278,7 +278,7 @@ thread_create (const char *name, int priority,
#endif #endif
#ifdef VM #ifdef VM
mmap_init (); mmap_init (t);
#endif #endif
/* Prepare thread for first run by initializing its stack. /* Prepare thread for first run by initializing its stack.

6
src/vm/mmap.c
View File

@@ -6,11 +6,11 @@ static bool mmap_less (const struct hash_elem *a_, const struct hash_elem *b_,
void *aux); void *aux);
static void mmap_cleanup(struct hash_elem *e, void *aux); static void mmap_cleanup(struct hash_elem *e, void *aux);
/* Initializes the mmap table for the current thread. Sets the counter to 0. */ /* Initializes the mmap table for the given thread, setting the mmap counter to
0 and initializing the hash table. */
bool bool
mmap_init (void) mmap_init (struct thread *t)
{ {
struct thread *t = thread_current ();
t->mmap_counter = 0; t->mmap_counter = 0;
return hash_init (&t->mmap_files, mmap_hash, mmap_less, NULL); return hash_init (&t->mmap_files, mmap_hash, mmap_less, NULL);
} }

2
src/vm/mmap.h
View File

@@ -17,7 +17,7 @@ struct mmap_entry {
struct hash_elem elem; /* An elem for the hash table. */ struct hash_elem elem; /* An elem for the hash table. */
}; };
bool mmap_init (void); bool mmap_init (struct thread *t);
struct mmap_entry *mmap_insert (struct file *file, void *upage); struct mmap_entry *mmap_insert (struct file *file, void *upage);
void mmap_destroy (void); void mmap_destroy (void);