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

3
src/threads/synch.c
View File

@@ -305,8 +305,6 @@ 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 *current_thread = thread_current ();
struct thread *max_donor = NULL; struct thread *max_donor = NULL;
@@ -351,7 +349,6 @@ lock_release (struct lock *lock)
/* 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);

18
src/threads/thread.c
View File

@@ -157,7 +157,14 @@ 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)
{
if (t != idle_thread)
{
t->recent_cpu = fp_add_int (t->recent_cpu, 1);
}
if (ticks % TIMER_FREQ == 0)
{ {
size_t ready = threads_ready (); size_t ready = threads_ready ();
if (t != idle_thread) if (t != idle_thread)
@@ -169,11 +176,7 @@ thread_tick (void)
thread_foreach (thread_update_recent_cpu, NULL); thread_foreach (thread_update_recent_cpu, NULL);
} }
/* Update current thread's recent_cpu. */ if (ticks % TIME_SLICE == 0) // recent_cpu was updated, update priority.
if (thread_mlfqs && (t != idle_thread))
{
t->recent_cpu = fp_add_int (t->recent_cpu, 1);
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;