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

Merge branch 'gleb/fix-non-busy-sleep-bug' into 'master'

Browse Source 
Remove unnecassary inter_disable from non-busy sleep

See merge request lab2425_autumn/pintos_22!19
This commit is contained in:
Demetriades, Themis
2024-10-25 14:19:36 +00:00
parent f8bdd30f09 869571108d
commit bbb62d2ee7
1 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/devices/timer.c
View File

@@ -119,9 +119,6 @@ timer_sleep (int64_t ticks)
NULL); NULL);
intr_set_level (old_level); intr_set_level (old_level);
sema_down (&st.semaphore); sema_down (&st.semaphore);
old_level = intr_disable ();
list_remove (&st.elem);
intr_set_level (old_level);
} }
/* Sleeps for approximately MS milliseconds. Interrupts must be /* Sleeps for approximately MS milliseconds. Interrupts must be
@@ -204,7 +201,10 @@ timer_interrupt (struct intr_frame *args UNUSED)
{ {
struct asleep_thread *st = list_entry (e, struct asleep_thread, elem); struct asleep_thread *st = list_entry (e, struct asleep_thread, elem);
if (ticks >= st->end_at) if (ticks >= st->end_at)
{
list_remove (&st->elem);
sema_up (&st->semaphore); sema_up (&st->semaphore);
}
else else
break; break;
} }