From 214cc0fafce09dbee6aedafa5e1148476cc6463f Mon Sep 17 00:00:00 2001 From: Steve Reinhardt Date: Fri, 7 Jan 2011 21:50:29 -0800 Subject: inorder: get rid of references to mainEventQueue. Events need to be scheduled on the queue assigned to the SimObject, not on the global queue (which should be going away). Also cleaned up a number of redundant expressions that made the code unnecessarily verbose. --- src/cpu/inorder/resource.hh | 8 +------- 1 file changed, 1 insertion(+), 7 deletions(-) (limited to 'src/cpu/inorder/resource.hh') diff --git a/src/cpu/inorder/resource.hh b/src/cpu/inorder/resource.hh index 2e0143f9f..5684dc166 100644 --- a/src/cpu/inorder/resource.hh +++ b/src/cpu/inorder/resource.hh @@ -277,13 +277,7 @@ class ResourceEvent : public Event void setSlot(int slot) { slotIdx = slot; } /** Schedule resource event, regardless of its current state. */ - void scheduleEvent(int delay) - { - if (squashed()) - mainEventQueue.reschedule(this, curTick + resource->ticks(delay)); - else if (!scheduled()) - mainEventQueue.schedule(this, curTick + resource->ticks(delay)); - } + void scheduleEvent(int delay); /** Unschedule resource event, regardless of its current state. */ void unscheduleEvent() -- cgit v1.2.3