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

refactor thread_mlfqs checks in synch.c

Browse Source
This commit is contained in:
EDiasAlberto
2024-10-24 21:46:39 +01:00
parent a6a0c4ad25
commit 60acc2e58d
2 changed files with 55 additions and 54 deletions
Download Patch File Download Diff File Expand all files Collapse all files

77
src/threads/synch.c
View File

@@ -305,53 +305,50 @@ lock_release (struct lock *lock)
ASSERT (lock != NULL); ASSERT (lock != NULL);
ASSERT (lock_held_by_current_thread (lock)); ASSERT (lock_held_by_current_thread (lock));
if (!thread_mlfqs) struct thread *current_thread = thread_current ();
{ struct thread *max_donor = NULL;
struct thread *current_thread = thread_current ();
struct thread *max_donor = NULL;
struct list orphan_list; struct list orphan_list;
list_init (&orphan_list); list_init (&orphan_list);
enum intr_level old_level = intr_disable (); enum intr_level old_level = intr_disable ();
/* Loop through current thread's donors, removing the ones waiting for the /* Loop through current thread's donors, removing the ones waiting for the
lock being released and keeping track of them (within orphan_list). lock being released and keeping track of them (within orphan_list).
Also identifies the highest priority donor thread among them. */ Also identifies the highest priority donor thread among them. */
struct list_elem *tail = list_tail (&current_thread->donors_list); struct list_elem *tail = list_tail (&current_thread->donors_list);
struct list_elem *e = list_begin (&current_thread->donors_list); struct list_elem *e = list_begin (&current_thread->donors_list);
while (e != tail) while (e != tail)
{ {
struct thread *donor = list_entry (e, struct thread, donor_elem); struct thread *donor = list_entry (e, struct thread, donor_elem);
struct list_elem *next = list_next (e); struct list_elem *next = list_next (e);
/* Excludes donors that aren't waiting for the lock being released, /* Excludes donors that aren't waiting for the lock being released,
and tracks the rest. */ and tracks the rest. */
if (donor->waiting_lock == lock) if (donor->waiting_lock == lock)
{ {
list_remove (e); list_remove (e);
list_push_back (&orphan_list, e); list_push_back (&orphan_list, e);
/* Identify highest priority donor. */ /* Identify highest priority donor. */
if (max_donor == NULL || donor->priority > max_donor->priority) if (max_donor == NULL || donor->priority > max_donor->priority)
max_donor = donor; max_donor = donor;
} }
e = next; e = next;
} }
/* If there exists a maximum donor thread waiting for this lock to be /* If there exists a maximum donor thread waiting for this lock to be
released, transfer the remaining orphaned donors to its donor list. */ released, transfer the remaining orphaned donors to its donor list. */
if (max_donor != NULL) if (max_donor != NULL)
{ {
while (!list_empty (&orphan_list)) while (!list_empty (&orphan_list))
list_push_back (&max_donor->donors_list, list_pop_front (&orphan_list)); list_push_back (&max_donor->donors_list, list_pop_front (&orphan_list));
} }
intr_set_level (old_level); intr_set_level (old_level);
/* Removal of donors to this thread may change its effective priority, /* Removal of donors to this thread may change its effective priority,
so recalculate. */ so recalculate. */
thread_recalculate_priority (); thread_recalculate_priority ();
}
lock->holder = NULL; lock->holder = NULL;
sema_up (&lock->semaphore); sema_up (&lock->semaphore);

32
src/threads/thread.c
View File

@@ -157,23 +157,26 @@ thread_tick (void)
/* Update system load_avg and all threads recent_cpu every second. */ /* Update system load_avg and all threads recent_cpu every second. */
int64_t ticks = timer_ticks (); int64_t ticks = timer_ticks ();
if (thread_mlfqs && (ticks % TIMER_FREQ == 0)) if (thread_mlfqs)
{ {
size_t ready = threads_ready ();
if (t != idle_thread) if (t != idle_thread)
ready++; {
fp32_t old_coeff = fp_div_int (fp_mul_int(load_avg, 59), 60); t->recent_cpu = fp_add_int (t->recent_cpu, 1);
fp32_t new_coeff = fp_div_int (fp_from_int (ready), 60); }
load_avg = fp_add (old_coeff, new_coeff);
thread_foreach (thread_update_recent_cpu, NULL); if (ticks % TIMER_FREQ == 0)
} {
size_t ready = threads_ready ();
if (t != idle_thread)
ready++;
fp32_t old_coeff = fp_div_int (fp_mul_int(load_avg, 59), 60);
fp32_t new_coeff = fp_div_int (fp_from_int (ready), 60);
load_avg = fp_add (old_coeff, new_coeff);
/* Update current thread's recent_cpu. */ thread_foreach (thread_update_recent_cpu, NULL);
if (thread_mlfqs && (t != idle_thread)) }
{
t->recent_cpu = fp_add_int (t->recent_cpu, 1); if (ticks % TIME_SLICE == 0) // recent_cpu was updated, update priority.
if (ticks % 4 == 0) // recent_cpu was updated, update priority.
t->priority = calculate_bsd_priority (t->recent_cpu, t->nice); t->priority = calculate_bsd_priority (t->recent_cpu, t->nice);
} }
@@ -470,7 +473,8 @@ thread_recalculate_priority (void)
{ {
struct thread *t = thread_current (); struct thread *t = thread_current ();
ASSERT(!thread_mlfqs) if (thread_mlfqs)
return;
enum intr_level old_level = intr_disable (); enum intr_level old_level = intr_disable ();
t->priority = t->base_priority; t->priority = t->base_priority;