Merge 'task1/priority-donation' into 'master' #14
@@ -114,14 +114,19 @@ sema_up (struct semaphore *sema)
|
|||||||
|
|
||||||
old_level = intr_disable ();
|
old_level = intr_disable ();
|
||||||
if (!list_empty (&sema->waiters))
|
if (!list_empty (&sema->waiters))
|
||||||
{
|
{
|
||||||
struct list_elem *e = list_min (&sema->waiters, priority_more, NULL);
|
/* Enforces wake-up of the highest priority thread waiting for the
|
||||||
list_remove (e);
|
semaphore. */
|
||||||
thread_unblock (list_entry (e, 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);
|
||||||
|
|
||||||
|
/* Yields the CPU in case the thread that has been woken up has a higher
|
||||||
|
priority that the current running thread, including the case when called
|
||||||
|
within an interrupt handler. */
|
||||||
if (intr_context ())
|
if (intr_context ())
|
||||||
intr_yield_on_return ();
|
intr_yield_on_return ();
|
||||||
else
|
else
|
||||||
|
|||||||
Reference in New Issue
Block a user