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 +174 -10
4 changed files with 174 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit afcb12cef0 - Show all commits

3
src/threads/thread.c
View File

@@ -385,7 +385,6 @@ thread_set_priority (int new_base_priority)
if (new_base_priority == old_base_priority)
return;
t->base_priority = new_base_priority;
t->priority = new_base_priority;
@@ -413,7 +412,7 @@ thread_recalculate_priority (void)
list_entry (list_max (&t->donors_list, priority_more, NULL),
struct thread, donor_elem)->priority;
if(max_donated_priority > t->priority)
if (max_donated_priority > t->priority)
t->priority = max_donated_priority;
}
}