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

Fix Bug in recalculating priority, uses 'elem' instead of 'donor_elem', w/ T

Browse Source
This commit is contained in:
sBubshait
2024-10-22 19:49:53 +01:00
parent a19d40bcca
commit d9b9572631
1 changed files with 16 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
src/threads/thread.c
View File

@@ -70,6 +70,8 @@ static void *alloc_frame (struct thread *, size_t size);
static void schedule (void); static void schedule (void);
void thread_schedule_tail (struct thread *prev); void thread_schedule_tail (struct thread *prev);
static tid_t allocate_tid (void); static tid_t allocate_tid (void);
static bool donor_priority_less (const struct list_elem *a_,
const struct list_elem *b_, void *aux UNUSED);
/* Initializes the threading system by transforming the code /* Initializes the threading system by transforming the code
that's currently running into a thread. This can't work in that's currently running into a thread. This can't work in
@@ -370,6 +372,19 @@ priority_more (const struct list_elem *a_, const struct list_elem *b_,
return a->priority > b->priority; return a->priority > b->priority;
} }
/* Function that compares the two threads associated with the provided
pointers to their 'donor_elem' member. Returns true if the thread associated
with a_ has a lower priority than that of b_. */
static bool
donor_priority_less (const struct list_elem *a_, const struct list_elem *b_,
void *aux UNUSED)
{
struct thread *a = list_entry (a_, struct thread, donor_elem);
struct thread *b = list_entry (b_, struct thread, donor_elem);
return a->priority < b->priority;
}
/* Sets the current thread's base priority to new_base_priority. /* Sets the current thread's base priority to new_base_priority.
Updates the current thread's effective priority if necessary. */ Updates the current thread's effective priority if necessary. */
void void
@@ -408,7 +423,7 @@ thread_recalculate_priority (void)
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, priority_more, NULL), list_entry (list_max (&t->donors_list, donor_priority_less, NULL),
struct thread, donor_elem)->priority; struct thread, donor_elem)->priority;
if (max_donated_priority > t->priority) if (max_donated_priority > t->priority)