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

Merge 'task1/priority-donation' into 'master' #14

Merged
sb3923 merged 66 commits from task1/priority-donation into master 2024-10-23 16:15:45 +00:00
Conversation 35 Commits 66 Files Changed 4 +238 -15
4 changed files with 238 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit 5549b9c0cb - Show all commits

4
src/threads/thread.c
View File

@@ -419,12 +419,16 @@ thread_recalculate_priority (void)
struct thread *t = thread_current (); struct thread *t = thread_current ();
t->priority = t->base_priority; t->priority = t->base_priority;
/* If there are no donors to the current thread, then the effective
priority is just the base priority. */
if (!list_empty (&t->donors_list)) if (!list_empty (&t->donors_list))
{ {
int max_donated_priority = int max_donated_priority =
list_entry (list_max (&t->donors_list, donor_priority_less, NULL), list_entry (list_max (&t->donors_list, donor_priority_less, NULL),
struct thread, donor_elem)->priority; struct thread, donor_elem)->priority;
/* The effective priority is the max donated priority if this is
higher than the base priority. */
if (max_donated_priority > t->priority) if (max_donated_priority > t->priority)
t->priority = max_donated_priority; t->priority = max_donated_priority;
} }