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

12
src/threads/synch.c
View File

@@ -68,8 +68,7 @@ sema_down (struct semaphore *sema)
old_level = intr_disable (); old_level = intr_disable ();
while (sema->value == 0) while (sema->value == 0)
{ {
list_insert_ordered(&sema->waiters, &thread_current ()->elem, list_push_back (&sema->waiters, &thread_current ()->elem);
priority_more, NULL);
thread_block (); thread_block ();
} }
sema->value--; sema->value--;
@@ -114,9 +113,12 @@ sema_up (struct semaphore *sema)
ASSERT (sema != NULL); ASSERT (sema != NULL);
old_level = intr_disable (); old_level = intr_disable ();
if (!list_empty (&sema->waiters)) if (!list_empty (&sema->waiters))
thread_unblock (list_entry (list_pop_front (&sema->waiters), {
struct thread, elem)); struct list_elem *e = list_min (&sema->waiters, priority_more, NULL);
list_remove (e);
thread_unblock (list_entry (e, struct thread, elem));
}
sema->value++; sema->value++;
intr_set_level (old_level); intr_set_level (old_level);