From bc7921dd32fd63601a33c915da0d8537ae290bd1 Mon Sep 17 00:00:00 2001 From: PE Hladik Date: Thu, 3 Mar 2016 13:06:10 -0500 Subject: [PATCH] debug LLF and MLLF schdulers --- simso/schedulers/LLF.py | 13 +++++-------- simso/schedulers/MLLF.py | 11 ++++------- 2 files changed, 9 insertions(+), 15 deletions(-) diff --git a/simso/schedulers/LLF.py b/simso/schedulers/LLF.py index 920189b..c47f693 100644 --- a/simso/schedulers/LLF.py +++ b/simso/schedulers/LLF.py @@ -6,25 +6,22 @@ class LLF(Scheduler): """Least Laxity First""" def init(self): self.ready_list = [] - self.timer = Timer(self.sim, LLF.compute_laxity, + self.timer = Timer(self.sim, LLF.update, (self, self.processors[0]), 1, one_shot=False, - cpu=self.processors[0], overhead=.01) + cpu=self.processors[0], overhead=.001) self.timer.start() - def compute_laxity(self, cpu): + def update(self, cpu): if self.ready_list: - for job in self.ready_list: - job.laxity = job.absolute_deadline - \ - (job.ret + self.sim.now_ms()) cpu.resched() def on_activate(self, job): self.ready_list.append(job) - self.compute_laxity(job.cpu) + job.cpu.resched() def on_terminated(self, job): self.ready_list.remove(job) - self.compute_laxity(job.cpu) + self.update(job.cpu) def schedule(self, cpu): decisions = [] diff --git a/simso/schedulers/MLLF.py b/simso/schedulers/MLLF.py index 3a615d7..fdef324 100644 --- a/simso/schedulers/MLLF.py +++ b/simso/schedulers/MLLF.py @@ -8,20 +8,17 @@ class MLLF(Scheduler): self.ready_list = [] self.timer = None - def compute_laxity(self, cpu): + def update(self, cpu): if self.ready_list: - for job in self.ready_list: - job.laxity = (job.absolute_deadline - job.ret) * \ - self.sim.cycles_per_ms - self.sim.now() cpu.resched() def on_activate(self, job): self.ready_list.append(job) - self.compute_laxity(job.cpu) + job.cpu.resched() def on_terminated(self, job): self.ready_list.remove(job) - self.compute_laxity(job.cpu) + self.update(job.cpu) def schedule(self, cpu): decisions = [] @@ -45,7 +42,7 @@ class MLLF(Scheduler): if self.timer: self.timer.stop() self.timer = Timer( - self.sim, MLLF.compute_laxity, + self.sim, MLLF.update, (self, self.processors[0]), dmin - ta.laxity, one_shot=True, cpu=self.processors[0]) -- libgit2 0.26.0